/pidgin/main: 327db5f3a5c5: Fix some strings

[Tomasz Wasilczyk]

Changeset: 327db5f3a5c550642a5f9f816452f03a8de29667
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-25 23:35 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/327db5f3a5c5

Description:

Fix some strings

diffstat:

 libpurple/ciphers/aescipher.c                |  2 +-
 libpurple/ciphers/pbkdf2cipher.c             |  2 +-
 libpurple/plugins/keyrings/gnomekeyring.c    |  2 +-
 libpurple/plugins/keyrings/internalkeyring.c |  2 +-
 libpurple/plugins/keyrings/wincred.c         |  2 +-
 pidgin/gtkblist.c                            |  2 +-
 pidgin/gtkdialogs.c                          |  6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diffs (95 lines):

diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  *
- * Written by Tomek Wasilczyk <tomkiewicz at cpw.pidgin.im>
+ * Written by Tomek Wasilczyk <twasilczyk at pidgin.im>
  */
 
 #include "internal.h"
diff --git a/libpurple/ciphers/pbkdf2cipher.c b/libpurple/ciphers/pbkdf2cipher.c
--- a/libpurple/ciphers/pbkdf2cipher.c
+++ b/libpurple/ciphers/pbkdf2cipher.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  *
- * Written by Tomek Wasilczyk <tomkiewicz at cpw.pidgin.im>
+ * Written by Tomek Wasilczyk <twasilczyk at pidgin.im>
  */
 #include "internal.h"
 #include "glibcompat.h"
diff --git a/libpurple/plugins/keyrings/gnomekeyring.c b/libpurple/plugins/keyrings/gnomekeyring.c
--- a/libpurple/plugins/keyrings/gnomekeyring.c
+++ b/libpurple/plugins/keyrings/gnomekeyring.c
@@ -38,7 +38,7 @@
 #define GNOMEKEYRING_NAME        N_("GNOME Keyring")
 #define GNOMEKEYRING_DESCRIPTION N_("This plugin will store passwords in " \
 	"GNOME Keyring.")
-#define GNOMEKEYRING_AUTHOR      "Tomek Wasilczyk (tomkiewicz at cpw.pidgin.im)"
+#define GNOMEKEYRING_AUTHOR      "Tomek Wasilczyk <twasilczyk at pidgin.im>"
 #define GNOMEKEYRING_ID          "keyring-gnomekeyring"
 
 static PurpleKeyring *keyring_handler = NULL;
diff --git a/libpurple/plugins/keyrings/internalkeyring.c b/libpurple/plugins/keyrings/internalkeyring.c
--- a/libpurple/plugins/keyrings/internalkeyring.c
+++ b/libpurple/plugins/keyrings/internalkeyring.c
@@ -38,7 +38,7 @@
 #define INTKEYRING_NAME N_("Internal keyring")
 #define INTKEYRING_DESCRIPTION N_("This plugin provides the default password " \
 	"storage behaviour for libpurple.")
-#define INTKEYRING_AUTHOR "Tomek Wasilczyk (tomkiewicz at cpw.pidgin.im)"
+#define INTKEYRING_AUTHOR "Tomek Wasilczyk <twasilczyk at pidgin.im>"
 #define INTKEYRING_ID PURPLE_DEFAULT_KEYRING
 
 #define INTKEYRING_VERIFY_STR "[verification-string]"
diff --git a/libpurple/plugins/keyrings/wincred.c b/libpurple/plugins/keyrings/wincred.c
--- a/libpurple/plugins/keyrings/wincred.c
+++ b/libpurple/plugins/keyrings/wincred.c
@@ -36,7 +36,7 @@
 #define WINCRED_SUMMARY     N_("Store passwords using Windows credentials")
 #define WINCRED_DESCRIPTION N_("This plugin stores passwords using Windows " \
 	"credentials.")
-#define WINCRED_AUTHOR      "Tomek Wasilczyk (tomkiewicz at cpw.pidgin.im)"
+#define WINCRED_AUTHOR      "Tomek Wasilczyk <twasilczyk at pidgin.im>"
 #define WINCRED_ID          "keyring-wincred"
 
 #define WINCRED_MAX_TARGET_NAME 256
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -8457,7 +8457,7 @@ pidgin_blist_update_plugin_actions(void)
 			continue;
 
 		name = g_strdup_printf("plugin%d", count);
-		action = gtk_action_new(name, plugin->info->name, NULL, NULL);
+		action = gtk_action_new(name, _(plugin->info->name), NULL, NULL);
 		gtk_action_group_add_action(plugins_action_group, action);
 		g_string_append_printf(plugins_ui, "<menu action='%s'>", name);
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -859,16 +859,16 @@ void pidgin_dialogs_plugins_info(void)
 		punloadable = purple_plugin_is_unloadable(plugin);
 		ploaded = purple_plugin_is_loaded(plugin);
 
+		g_string_append_printf(str, "<dt>%s</dt><dd>", pname);
+		if (pauthor)
+			g_string_append_printf(str, "<b>Author:</b> %s<br/>", pauthor);
 		g_string_append_printf(str,
-				"<dt>%s</dt><dd>"
-				"<b>Author:</b> %s<br/>"
 				"<b>Version:</b> %s<br/>"
 				"<b>Website:</b> %s<br/>"
 				"<b>ID String:</b> %s<br/>"
 				"<b>Loadable:</b> %s<br/>"
 				"<b>Loaded:</b> %s"
 				"</dd><br/>",
-				pname, pauthor ? pauthor : "(null)",
 				pver, pwebsite, pid,
 				punloadable ? "<span style=\"color: #FF0000;\"><b>No</b></span>" : "Yes",
 				ploaded ? "Yes" : "No");