From 8ecf59b151f949cb9e2bf8edb849c3a6df13d7b5 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 19 Jan 2009 23:30:25 +0000 Subject: Use C_() instead of Q_() with context for translatable strings. Note this bumps the GLib dependency to 2.18.0. (Helps: #558407) svn path=/trunk/; revision=8705 --- src/bookmarks/ephy-bookmarks.c | 22 +++++----------------- src/ephy-toolbar-editor.c | 14 ++++++-------- src/prefs-dialog.c | 16 +++++----------- 3 files changed, 16 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 354993baf..8f4733488 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -1219,32 +1219,20 @@ ephy_bookmarks_init (EphyBookmarks *eb) { EphyNodeDb *db; - /* Translators: The text before the "|" is context to help you - * decide on the correct translation. You MUST OMIT it in the - * translated string. */ /* Translators: this topic contains all bookmarks */ - const char *bk_all = Q_("bookmarks|All"); + const char *bk_all = C_("bookmarks", "All"); - /* Translators: The text before the "|" is context to help you - * decide on the correct translation. You MUST OMIT it in the - * translated string. */ /* Translators: this topic contains the most used bookmarks */ - const char *bk_most_visited = Q_("bookmarks|Most Visited"); + const char *bk_most_visited = C_("bookmarks", "Most Visited"); - /* Translators: The text before the "|" is context to help you - * decide on the correct translation. You MUST OMIT it in the - * translated string. */ /* Translators: this topic contains the not categorized bookmarks */ - const char *bk_not_categorized = Q_("bookmarks|Not Categorized"); + const char *bk_not_categorized = C_("bookmarks", "Not Categorized"); -#ifdef ENABLE_ZEROCONF - /* Translators: The text before the "|" is context to help you - * decide on the correct translation. You MUST OMIT it in the - * translated string. */ +#ifdef ENABLE_ZEROCONF /* Translators: this is an automatic topic containing local * websites bookmarks autodiscovered with zeroconf. */ - const char *bk_local_sites = Q_("bookmarks|Nearby Sites"); + const char *bk_local_sites = C_("bookmarks", "Nearby Sites"); #endif eb->priv = EPHY_BOOKMARKS_GET_PRIVATE (eb); diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c index dc2811d8f..f77ef9fc5 100644 --- a/src/ephy-toolbar-editor.c +++ b/src/ephy-toolbar-editor.c @@ -68,14 +68,12 @@ static const struct } toolbar_styles [] = { - { /* Translators: The text before the "|" is context to help you decide on - * the correct translation. You MUST OMIT it in the translated string. */ - N_("toolbar style|Default"), 0, FALSE }, + { NC_("toolbar style", "Default"), 0, FALSE }, { NULL /* separator row */, 0, FALSE }, - { N_("Text below icons"), EGG_TB_MODEL_BOTH, TRUE }, - { N_("Text beside icons"), EGG_TB_MODEL_BOTH_HORIZ, TRUE }, - { N_("Icons only"), EGG_TB_MODEL_ICONS, TRUE }, - { N_("Text only"), EGG_TB_MODEL_TEXT, TRUE } + { NC_("toolbar style", "Text below icons"), EGG_TB_MODEL_BOTH, TRUE }, + { NC_("toolbar style", "Text beside icons"), EGG_TB_MODEL_BOTH_HORIZ, TRUE }, + { NC_("toolbar style", "Icons only"), EGG_TB_MODEL_ICONS, TRUE }, + { NC_("toolbar style", "Text only"), EGG_TB_MODEL_TEXT, TRUE } }; enum @@ -216,7 +214,7 @@ ephy_toolbar_editor_constructor (GType type, if (text != NULL) { - tr_text= Q_(text); + tr_text = g_dpgettext2 (NULL, "toolbar style", text); } gtk_list_store_append (store, &iter); diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 239481747..f16ecd99e 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -624,32 +624,26 @@ get_name_for_lang_code (PrefsDialog *pd, if (localename != NULL) { - /* Translators: The text before the "|" is context to help you decide on - * the correct translation. You MUST OMIT it in the translated string. - * Translators: the first %s is the language name, and the + /* Translators: the first %s is the language name, and the * second %s is the locale name. Example: * "French (France)" */ - name = g_strdup_printf (Q_("language|%s (%s)"), + name = g_strdup_printf (C_("language", "%s (%s)"), dgettext (ISO_639_DOMAIN, langname), dgettext (ISO_3166_DOMAIN, localename)); } else { - /* Translators: The text before the "|" is context to help you decide on - * the correct translation. You MUST OMIT it in the translated string. */ - name = g_strdup_printf (Q_("language|%s (%s)"), + name = g_strdup_printf (C_("language", "%s (%s)"), dgettext (ISO_639_DOMAIN, langname), str[1]); } } else { - /* Translators: The text before the "|" is context to help you decide on - * the correct translation. You MUST OMIT it in the translated string. - * Translators: this refers to a user-define language code + /* Translators: this refers to a user-define language code * (one which isn't in our built-in list). */ - name = g_strdup_printf (Q_("language|User defined (%s)"), code); + name = g_strdup_printf (C_("language", "User defined (%s)"), code); } g_strfreev (str); -- cgit v1.2.3