more sanitizing of translatable strings
This commit is contained in:
parent
90e7c5fe54
commit
5a62dd7ed4
11 changed files with 94 additions and 89 deletions
|
@ -8148,7 +8148,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
|
|||
|
||||
if (ac == compose->account) def_menu = num;
|
||||
|
||||
name = g_markup_printf_escaped(_("<i>%s</i>"),
|
||||
name = g_markup_printf_escaped("<i>%s</i>",
|
||||
ac->account_name);
|
||||
|
||||
if (ac == compose->account) {
|
||||
|
|
|
@ -163,28 +163,28 @@ static GtkWidget *about_create_child_page_info(void)
|
|||
|
||||
#if HAVE_SYS_UTSNAME_H
|
||||
uname(&utsbuf);
|
||||
g_snprintf(buf, sizeof(buf),
|
||||
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
"Locale: %s (charset: %s)\n"
|
||||
"Operating System: %s %s (%s)"),
|
||||
g_snprintf(buf, sizeof(buf),g_strconcat(
|
||||
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
_("Locale: %s (charset: %s)\n"
|
||||
"Operating System: %s %s (%s)"), NULL),
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version,
|
||||
glib_major_version, glib_minor_version, glib_micro_version,
|
||||
conv_get_current_locale(), conv_get_locale_charset_str(),
|
||||
utsbuf.sysname, utsbuf.release, utsbuf.machine);
|
||||
#elif defined(G_OS_WIN32)
|
||||
g_snprintf(buf, sizeof(buf),
|
||||
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
"Locale: %s (charset: %s)\n"
|
||||
"Operating System: %s"),
|
||||
g_snprintf(buf, sizeof(buf),g_strconcat(
|
||||
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
_("Locale: %s (charset: %s)\n"
|
||||
"Operating System: %s"), NULL),
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version,
|
||||
glib_major_version, glib_minor_version, glib_micro_version,
|
||||
conv_get_current_locale(), conv_get_locale_charset_str(),
|
||||
"Win32");
|
||||
#else
|
||||
g_snprintf(buf, sizeof(buf),
|
||||
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
"Locale: %s (charset: %s)\n"
|
||||
"Operating System: unknown"),
|
||||
g_snprintf(buf, sizeof(buf),g_strconcat(
|
||||
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
|
||||
_("Locale: %s (charset: %s)\n"
|
||||
"Operating System: unknown"), NULL),
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version,
|
||||
glib_major_version, glib_minor_version, glib_micro_version,
|
||||
conv_get_current_locale(), conv_get_locale_charset_str());
|
||||
|
@ -563,13 +563,13 @@ static GtkWidget *about_create_child_page_license(void)
|
|||
"underline", PANGO_UNDERLINE_SINGLE,
|
||||
NULL);
|
||||
|
||||
gtk_text_buffer_insert(buffer, &iter,
|
||||
gtk_text_buffer_insert(buffer, &iter, g_strconcat(
|
||||
_("You should have received a copy of the GNU General Public License "
|
||||
"along with this program. If not, see <"), -1);
|
||||
"along with this program. If not, see "), "<", NULL), -1);
|
||||
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
|
||||
"http://www.gnu.org/licenses/", -1,
|
||||
"link", NULL);
|
||||
gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
|
||||
gtk_text_buffer_insert(buffer, &iter, ">. \n\n", -1);
|
||||
|
||||
g_signal_connect(G_OBJECT(tag), "event",
|
||||
G_CALLBACK(about_textview_uri_clicked), text);
|
||||
|
|
88
src/imap.c
88
src/imap.c
|
@ -618,134 +618,134 @@ static void imap_handle_error(Session *session, const gchar *server, int libetpa
|
|||
case MAILIMAP_NO_ERROR:
|
||||
return;
|
||||
case MAILIMAP_NO_ERROR_AUTHENTICATED:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: authenticated\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" authenticated\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_NO_ERROR_NON_AUTHENTICATED:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: not authenticated\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" not authenticated\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_BAD_STATE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: bad state\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" bad state\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_STREAM:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: stream error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" stream error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_PARSE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: parse error "
|
||||
"(very probably non-RFC compliance from the server)\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" parse error "
|
||||
"(very probably non-RFC compliance from the server)\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_CONNECTION_REFUSED:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection refused\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" connection refused\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_MEMORY:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: memory error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" memory error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_FATAL:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: fatal error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" fatal error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_PROTOCOL:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: protocol error"
|
||||
"(very probably non-RFC compliance from the server)\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" protocol error "
|
||||
"(very probably non-RFC compliance from the server)\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_DONT_ACCEPT_CONNECTION:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection not accepted\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" connection not accepted\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_APPEND:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: APPEND error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" APPEND error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_NOOP:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: NOOP error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" NOOP error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_LOGOUT:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGOUT error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LOGOUT error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_CAPABILITY:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: CAPABILITY error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CAPABILITY error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_CHECK:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: CHECK error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CHECK error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_CLOSE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: CLOSE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CLOSE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_EXPUNGE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXPUNGE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXPUNGE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_COPY:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: COPY error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" COPY error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_UID_COPY:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID COPY error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID COPY error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_CREATE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: CREATE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" CREATE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_DELETE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: DELETE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" DELETE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_EXAMINE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXAMINE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXAMINE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_FETCH:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: FETCH error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" FETCH error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_UID_FETCH:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID FETCH error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID FETCH error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_LIST:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: LIST error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LIST error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_LOGIN:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGIN error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LOGIN error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_LSUB:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: LSUB error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" LSUB error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_RENAME:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: RENAME error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" RENAME error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_SEARCH:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: SEARCH error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SEARCH error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_UID_SEARCH:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID SEARCH error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID SEARCH error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_SELECT:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: SELECT error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SELECT error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_STATUS:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: STATUS error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STATUS error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_STORE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: STORE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STORE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_UID_STORE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID STORE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UID STORE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_SUBSCRIBE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: SUBSCRIBE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SUBSCRIBE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_UNSUBSCRIBE:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: UNSUBSCRIBE error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" UNSUBSCRIBE error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_STARTTLS:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: STARTTLS error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" STARTTLS error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_INVAL:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: INVAL error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" INVAL error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_EXTENSION:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXTENSION error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" EXTENSION error\n"), NULL), session_server);
|
||||
break;
|
||||
case MAILIMAP_ERROR_SASL:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: SASL error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SASL error\n"), NULL), session_server);
|
||||
break;
|
||||
#ifdef USE_GNUTLS
|
||||
case MAILIMAP_ERROR_SSL:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: SSL error\n"), session_server);
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" SSL error\n"), NULL), session_server);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
log_warning(LOG_PROTOCOL, _("IMAP error on %s: Unknown error [%d]\n"),
|
||||
log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" Unknown error [%d]\n"), NULL),
|
||||
session_server, libetpan_errcode);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -1133,13 +1133,16 @@ int main(int argc, char *argv[])
|
|||
* and migration succeeded, and FALSE otherwise.
|
||||
*/
|
||||
if (is_dir_exist(OLD_GTK2_RC_DIR)) {
|
||||
r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0 (or older)"));
|
||||
r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR,
|
||||
g_strconcat("Sylpheed-Claws 2.6.0 ", _("(or older)"), NULL));
|
||||
asked_for_migration = TRUE;
|
||||
} else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
|
||||
r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15 (or older)"));
|
||||
r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR,
|
||||
g_strconcat("Sylpheed-Claws 1.9.15 ",_("(or older)"), NULL));
|
||||
asked_for_migration = TRUE;
|
||||
} else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
|
||||
r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5 (or older)"));
|
||||
r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR,
|
||||
g_strconcat("Sylpheed-Claws 1.0.5 ",_("(or older)"), NULL));
|
||||
asked_for_migration = TRUE;
|
||||
} else if (is_dir_exist(SYLPHEED_RC_DIR)) {
|
||||
r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
|
||||
|
|
|
@ -296,9 +296,9 @@ static void fill_attachment_store(GtkTreeView *list_view, MimeInfo *partinfo)
|
|||
if (!name)
|
||||
name = _("unknown");
|
||||
|
||||
label = g_strconcat(_("<b>Type: </b>"), content_type, " ",
|
||||
_("<b>Size: </b>"), to_human_readable((goffset)partinfo->length),
|
||||
"\n", _("<b>Filename: </b>"), name, NULL);
|
||||
label = g_strconcat("<b>",_("Type:"), "</b> ", content_type, " <b>",
|
||||
_("Size:"), "</b> ", to_human_readable((goffset)partinfo->length),
|
||||
"\n", "<b>", _("Filename:"), "</b> ", name, NULL);
|
||||
|
||||
gtk_list_store_append(list_store, &iter);
|
||||
gtk_list_store_set(list_store, &iter,
|
||||
|
|
|
@ -607,7 +607,7 @@ use_untrusted (gpgme_key_t key, gpgme_user_id_t uid, gpgme_protocol_t proto)
|
|||
buf = g_strdup_printf(_("This encryption key is not fully trusted.\n"
|
||||
"If you choose to encrypt the message with this key, you don't\n"
|
||||
"know for sure that it will go to the person you mean it to.\n\n"
|
||||
"Key details: ID %s, primary identity %s <%s>\n\n"
|
||||
"Key details: ID %s, primary identity %s <%s>\n\n"
|
||||
"Do you trust this key enough to use it anyway?"),
|
||||
key->subkeys->keyid, key->uids->name, key->uids->email);
|
||||
aval = alertpanel
|
||||
|
|
|
@ -356,7 +356,8 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
|
|||
key->uids = key->uids ? key->uids->next : NULL;
|
||||
while (key->uids != NULL) {
|
||||
g_string_append_printf(siginfo,
|
||||
_(" uid \"%s\" (Validity: %s)\n"),
|
||||
g_strconcat(" ",
|
||||
_("uid \"%s\" (Validity: %s)\n"), NULL),
|
||||
key->uids->uid,
|
||||
key->uids->revoked==TRUE?_("Revoked"):get_validity_str(key->uids->validity));
|
||||
j++;
|
||||
|
|
|
@ -385,7 +385,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
|
|||
gtk_box_pack_start(GTK_BOX(vbox), urlframe, FALSE, FALSE, 0);
|
||||
|
||||
/* Label for URL frame */
|
||||
urllabel = gtk_label_new(_("<b>Source URL:</b>"));
|
||||
urllabel = gtk_label_new(g_strconcat("<b>",_("Source URL:"),"</b>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(urllabel), TRUE);
|
||||
gtk_misc_set_padding(GTK_MISC(urllabel), 5, 0);
|
||||
gtk_frame_set_label_widget(GTK_FRAME(urlframe), urllabel);
|
||||
|
@ -430,8 +430,9 @@ void rssyl_gtk_prop(RFolderItem *ritem)
|
|||
|
||||
row++;
|
||||
/* Fetch comments max age - label */
|
||||
label = gtk_label_new(_("<b>Fetch comments on posts aged less than:</b>\n"
|
||||
"<small>(In days; set to -1 to fetch all comments)</small>"));
|
||||
label = gtk_label_new(g_strconcat("<b>",_("Fetch comments on posts aged less than:"),"</b>\n"
|
||||
"<small>",_("(In days; set to -1 to fetch all comments)"), "</small>",
|
||||
NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1,
|
||||
|
@ -488,9 +489,9 @@ void rssyl_gtk_prop(RFolderItem *ritem)
|
|||
|
||||
row++;
|
||||
/* Refresh interval - label */
|
||||
label = gtk_label_new(_("<b>Refresh interval in minutes:</b>\n"
|
||||
"<small>(Set to 0 to disable automatic refreshing for this feed)"
|
||||
"</small>"));
|
||||
label = gtk_label_new(g_strconcat("<b>",_("Refresh interval in minutes:"),"</b>\n"
|
||||
"<small>",_("(Set to 0 to disable automatic refreshing for this feed)"),
|
||||
"</small>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1,
|
||||
|
@ -514,7 +515,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
|
|||
row++;
|
||||
/* Silent update - label */
|
||||
silent_update_label =
|
||||
gtk_label_new(_("<b>If an item changes, do not mark it as new:</b>"));
|
||||
gtk_label_new(g_strconcat("<b>",_("If an item changes, do not mark it as new:"),"</b>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(silent_update_label), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(silent_update_label), 0, 0.5);
|
||||
gtk_table_attach(GTK_TABLE(table), silent_update_label, 0, 1, row, row+1,
|
||||
|
|
|
@ -61,7 +61,7 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
|
|||
gtk_frame_set_shadow_type(GTK_FRAME(titleframe), GTK_SHADOW_ETCHED_OUT);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), titleframe, FALSE, FALSE, 0);
|
||||
|
||||
titlelabel = gtk_label_new(_("<b>Feed folder:</b>"));
|
||||
titlelabel = gtk_label_new(g_strconcat("<b>",_("Feed folder:"),"</b>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(titlelabel), TRUE);
|
||||
gtk_misc_set_padding(GTK_MISC(titlelabel), 5, 0);
|
||||
gtk_frame_set_label_widget(GTK_FRAME(titleframe), titlelabel);
|
||||
|
|
|
@ -1595,13 +1595,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
|
|||
date_hbox = gtk_hbox_new(FALSE, 6);
|
||||
date_vbox = gtk_vbox_new(FALSE, 6);
|
||||
hbox = gtk_hbox_new(FALSE, 6);
|
||||
label = gtk_label_new(_("<b>Starts at:</b> "));
|
||||
label = gtk_label_new(g_strconcat("<b>",_("Starts at:"),"</b> ",NULL));
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), meet->start_time, FALSE, FALSE, 0);
|
||||
label = gtk_label_new(_("<b> on:</b>"));
|
||||
label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
||||
|
@ -1619,13 +1619,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
|
|||
|
||||
date_vbox = gtk_vbox_new(FALSE, 6);
|
||||
hbox = gtk_hbox_new(FALSE, 6);
|
||||
label = gtk_label_new(_("<b>Ends at:</b> "));
|
||||
label = gtk_label_new(g_strconcat("<b>",_("Ends at:"),"</b> ", NULL));
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), meet->end_time, FALSE, FALSE, 0);
|
||||
label = gtk_label_new(_("<b> on:</b>"));
|
||||
label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
|
||||
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
||||
|
|
|
@ -264,10 +264,10 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
|
|||
rowcount = 0;
|
||||
|
||||
if (!can_save) {
|
||||
no_save_warning = gtk_label_new(
|
||||
_("<i>These preferences will not be saved as this folder "
|
||||
no_save_warning = gtk_label_new(g_strconcat("<i>",
|
||||
_("These preferences will not be saved as this folder "
|
||||
"is a top-level folder. However, you can set them for the "
|
||||
"whole mailbox tree by using \"Apply to subfolders\".</i>"));
|
||||
"whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
|
||||
|
@ -872,10 +872,10 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
|
|||
rowcount = 0;
|
||||
|
||||
if (!can_save) {
|
||||
no_save_warning = gtk_label_new(
|
||||
_("<i>These preferences will not be saved as this folder "
|
||||
no_save_warning = gtk_label_new(g_strconcat("<i>",
|
||||
_("These preferences will not be saved as this folder "
|
||||
"is a top-level folder. However, you can set them for the "
|
||||
"whole mailbox tree by using \"Apply to subfolders\".</i>"));
|
||||
"whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
|
||||
|
@ -1398,10 +1398,10 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
|
|||
gtk_widget_show (page_vbox);
|
||||
|
||||
if (!can_save) {
|
||||
no_save_warning = gtk_label_new(
|
||||
_("<i>These preferences will not be saved as this folder "
|
||||
no_save_warning = gtk_label_new(g_strconcat("<i>",
|
||||
_("These preferences will not be saved as this folder "
|
||||
"is a top-level folder. However, you can set them for the "
|
||||
"whole mailbox tree by using \"Apply to subfolders\".</i>"));
|
||||
"whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL));
|
||||
gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
|
||||
gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
|
||||
|
|
Loading…
Reference in a new issue