Mercurial > pidgin.yaz
changeset 17161:b40f3d7da1fc
merge of '49922af0141ac5ca1baaa557377a5343ae781fb9'
and 'db33dae23c4751158ddcd578ea0fc89ae1090fdd'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 19 May 2007 02:46:34 +0000 |
| parents | a924c94ce5da (diff) 2e9150f55ff0 (current diff) |
| children | 8978ac3ea0b5 9fd39a035729 e15aaa2db6a4 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntplugin.c Sat May 19 02:42:57 2007 +0000 +++ b/finch/gntplugin.c Sat May 19 02:46:34 2007 +0000 @@ -67,11 +67,10 @@ static void plugin_toggled_cb(GntWidget *tree, PurplePlugin *plugin, gpointer null) { - /* TODO: Mark these strings for translation after the freeze */ if (gnt_tree_get_choice(GNT_TREE(tree), plugin)) { if (!purple_plugin_load(plugin)) { - purple_notify_error(NULL, "ERROR", "loading plugin failed", NULL); + purple_notify_error(NULL, _("ERROR"), _("loading plugin failed"), NULL); gnt_tree_set_choice(GNT_TREE(tree), plugin, FALSE); } } @@ -80,7 +79,7 @@ GntWidget *win; if (!purple_plugin_unload(plugin)) { - purple_notify_error(NULL, "ERROR", "unloading plugin failed", NULL); + purple_notify_error(NULL, _("ERROR"), _("unloading plugin failed"), NULL); gnt_tree_set_choice(GNT_TREE(tree), plugin, TRUE); }
--- a/finch/gntprefs.c Sat May 19 02:42:57 2007 +0000 +++ b/finch/gntprefs.c Sat May 19 02:46:34 2007 +0000 @@ -76,7 +76,7 @@ get_idle_options() { GList *list = NULL; - list = g_list_append(list, "Based on keyboard use"); /* XXX: string freeze */ + list = g_list_append(list, _("Based on keyboard use")); list = g_list_append(list, "system"); list = g_list_append(list, (char*)_("From last sent message")); list = g_list_append(list, "purple");