From 3fa03d64274f3fa8b939991e3e61d9cdeeffb5ff Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 31 Dec 2009 17:56:30 +0000 Subject: Punctuation fixes in translatable strings Fix punctuation in the IRC command help messages. Use proper Unicode ellipses throughout Empathy, and proper em-dashes where appropriate. Signed-off-by: Jonny Lamb --- libempathy-gtk/empathy-chat.c | 24 ++++++++++++------------ libempathy-gtk/empathy-contact-menu.c | 2 +- libempathy-gtk/empathy-contact-widget.ui | 4 ++-- libempathy-gtk/empathy-presence-chooser.c | 10 +++++----- src/empathy-accounts-dialog.c | 12 ++++++------ src/empathy-accounts-dialog.ui | 4 ++-- src/empathy-call-window.c | 2 +- src/empathy-chat-window.ui | 2 +- src/empathy-main-window.ui | 8 ++++---- src/empathy-status-icon.ui | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index dec4757db..c01b12519 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -799,36 +799,36 @@ typedef struct { static ChatCommandItem commands[] = { {"clear", 1, 1, chat_command_clear, - N_("/clear, clear all messages from the current conversation")}, + N_("/clear: clear all messages from the current conversation")}, {"topic", 2, 2, chat_command_topic, - N_("/topic , set the topic of the current conversation")}, + N_("/topic : set the topic of the current conversation")}, {"join", 2, 2, chat_command_join, - N_("/join , join a new chatroom")}, + N_("/join : join a new chat room")}, {"j", 2, 2, chat_command_join, - N_("/j , join a new chatroom")}, + N_("/j : join a new chat room")}, {"query", 2, 3, chat_command_query, - N_("/query [], open a private chat")}, + N_("/query []: open a private chat")}, {"msg", 3, 3, chat_command_msg, - N_("/msg , open a private chat")}, + N_("/msg : open a private chat")}, {"nick", 2, 2, chat_command_nick, - N_("/nick , change your nickname on current server")}, + N_("/nick : change your nickname on the current server")}, {"me", 2, 2, chat_command_me, - N_("/me , send an ACTION message to the current conversation")}, + N_("/me : send an ACTION message to the current conversation")}, {"say", 2, 2, chat_command_say, - N_("/say , send to the current conversation. " + N_("/say : send to the current conversation. " "This is used to send a message starting with a '/'. For example: " - "\"/say /join is used to join a new chatroom\"")}, + "\"/say /join is used to join a new chat room\"")}, {"help", 1, 2, chat_command_help, - N_("/help [], show all supported commands. " + N_("/help []: show all supported commands. " "If is defined, show its usage.")}, }; @@ -988,7 +988,7 @@ chat_send (EmpathyChat *chat, if (!second_slash) { empathy_chat_view_append_event (chat->view, - _("Unknown command, see /help for the available" + _("Unknown command; see /help for the available" " commands")); return; } diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 3d022a8b0..578f8756a 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -192,7 +192,7 @@ empathy_contact_add_menu_item_new (EmpathyContact *contact) return NULL; } - item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact...")); + item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact…")); image = gtk_image_new_from_icon_name (GTK_STOCK_ADD, 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 b051e8265..2e2ec3969 100644 --- a/libempathy-gtk/empathy-contact-widget.ui +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -437,7 +437,7 @@ True 0 - Information requested... + Information requested… True True @@ -606,7 +606,7 @@ True 0 - Information requested... + Information requested… True True diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index e5826ff76..f8c4212dd 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -164,7 +164,7 @@ presence_chooser_create_model (EmpathyPresenceChooser *self) G_TYPE_BOOLEAN, /* COL_STATUS_CUSTOMISABLE */ G_TYPE_INT); /* COL_TYPE */ - custom_message = g_strdup_printf ("%s", _("Custom Message...")); + custom_message = g_strdup_printf ("%s", _("Custom Message…")); for (i = 0; states[i].state != TP_CONNECTION_PRESENCE_TYPE_UNSET; i++) { GList *list, *l; @@ -200,7 +200,7 @@ presence_chooser_create_model (EmpathyPresenceChooser *self) g_list_free (list); gtk_list_store_insert_with_values (store, NULL, -1, - COL_STATUS_TEXT, _("Custom Message..."), + COL_STATUS_TEXT, _("Custom Message…"), COL_STATE_ICON_NAME, icon_name, COL_STATE, states[i].state, COL_DISPLAY_MARKUP, custom_message, @@ -217,9 +217,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self) -1); gtk_list_store_insert_with_values (store, NULL, -1, - COL_STATUS_TEXT, _("Edit Custom Messages..."), + COL_STATUS_TEXT, _("Edit Custom Messages…"), COL_STATE_ICON_NAME, GTK_STOCK_EDIT, - COL_DISPLAY_MARKUP, _("Edit Custom Messages..."), + COL_DISPLAY_MARKUP, _("Edit Custom Messages…"), COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM, -1); @@ -1080,7 +1080,7 @@ empathy_presence_chooser_create_menu (void) gtk_widget_show (item); /* Custom messages */ - item = gtk_image_menu_item_new_with_label (_("Custom messages...")); + item = gtk_image_menu_item_new_with_label (_("Custom messages…")); image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 2c6ab617a..8a466b442 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -229,7 +229,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, switch (status) { case TP_CONNECTION_STATUS_CONNECTING: - message = _("Connecting..."); + message = _("Connecting…"); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_INFO); @@ -245,7 +245,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, } else { - message = g_strdup_printf ("%s - %s", + message = g_strdup_printf ("%s — %s", empathy_presence_get_default_message (presence), status_message); } @@ -256,12 +256,12 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, gtk_widget_hide (priv->throbber); break; case TP_CONNECTION_STATUS_DISCONNECTED: - message = g_strdup_printf (_("Disconnected - %s"), + message = g_strdup_printf (_("Disconnected — %s"), empathy_status_reason_get_default_message (reason)); if (reason == TP_CONNECTION_STATUS_REASON_REQUESTED) { - message = g_strdup_printf (_("Offline - %s"), + message = g_strdup_printf (_("Offline — %s"), empathy_status_reason_get_default_message (reason)); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); @@ -274,7 +274,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, connectivity = empathy_connectivity_dup_singleton (); if (!empathy_connectivity_is_online (connectivity)) - message = _("Offline - No Network Connection"); + message = _("Offline — No Network Connection"); g_object_unref (connectivity); ephy_spinner_stop (EPHY_SPINNER (priv->throbber)); @@ -293,7 +293,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, } else { - message = _("Offline - Account disabled"); + message = _("Offline — Account Disabled"); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui index 55bfa79f4..1f60bd6fa 100644 --- a/src/empathy-accounts-dialog.ui +++ b/src/empathy-accounts-dialog.ui @@ -50,7 +50,7 @@ True - _Add... + _Add… True True True @@ -63,7 +63,7 @@ - _Import... + _Import… True True True diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index da708d156..de19b69a4 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -726,7 +726,7 @@ empathy_call_window_set_state_connecting (EmpathyCallWindow *window) { EmpathyCallWindowPriv *priv = GET_PRIV (window); - empathy_call_window_status_message (window, _("Connecting...")); + empathy_call_window_status_message (window, _("Connecting…")); priv->call_state = CONNECTING; if (priv->outgoing) diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui index 88d099c16..13b812572 100644 --- a/src/empathy-chat-window.ui +++ b/src/empathy-chat-window.ui @@ -41,7 +41,7 @@ menu_conv_invite_participant - Invite _Participant... + Invite _Participant… diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index 1e6ecce17..934e5122d 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -14,7 +14,7 @@ im-message-new chat_new_message - _New Conversation... + _New Conversation… @@ -22,7 +22,7 @@ audio-input-microphone chat_new_call - New _Call... + New _Call… @@ -38,7 +38,7 @@ gtk-add chat_add_contact - _Add Contact... + _Add Contact… @@ -171,7 +171,7 @@ room_join_new - _Join... + _Join… diff --git a/src/empathy-status-icon.ui b/src/empathy-status-icon.ui index 6d0f3672d..155193e46 100644 --- a/src/empathy-status-icon.ui +++ b/src/empathy-status-icon.ui @@ -14,14 +14,14 @@ im-message-new new_message - _New Conversation... + _New Conversation… audio-input-microphone new_call - New _Call... + New _Call… -- cgit v1.2.3