# HG changeset patch
# User Maur���cio Collares <mauricioc@gmail.com>
# Date 1181837575 0
# Node ID 3d0d28438a5923a4036f44e8a410a7a1629d3138
# Parent  be0a6f43adfb9eeea11795b30bdec63872d0fa90
refers #1670

committer: Luke Schierer <lschiere@pidgin.im>

diff -r be0a6f43adfb -r 3d0d28438a59 po/ChangeLog
--- a/po/ChangeLog	Thu Jun 14 16:09:01 2007 +0000
+++ b/po/ChangeLog	Thu Jun 14 16:12:55 2007 +0000
@@ -4,6 +4,8 @@
 	* English (British) translation updated (Luke Ross)
 	* Finnish translation updated (Timo Jyrinki)
 	* Lithuanian translation updated (Laurynas Biveinis)
+	* Portuguese (Brazilian) translation updated (Mauricio de
+	  L R Collares Neto)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Slovenian win32 installer updated (Martin Srebotnjak)
diff -r be0a6f43adfb -r 3d0d28438a59 po/pt_BR.po
--- a/po/pt_BR.po	Thu Jun 14 16:09:01 2007 +0000
+++ b/po/pt_BR.po	Thu Jun 14 16:12:55 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 20:35-0300\n"
-"PO-Revision-Date: 2007-05-24 20:31-0300\n"
+"POT-Creation-Date: 2007-06-13 22:50-0300\n"
+"PO-Revision-Date: 2007-06-13 22:36-0300\n"
 "Last-Translator: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -50,7 +50,7 @@
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -67,9 +67,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/jabber/jabber.c:1235
 #: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
@@ -81,16 +82,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:599
+#: ../finch/gntaccount.c:423
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:528
+#: ../finch/gntaccount.c:433
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3996
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -98,31 +99,29 @@
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:429 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:437
-#: ../pidgin/gtkblist.c:5389
+#: ../finch/gntaccount.c:508
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:521
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:531
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
 #: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2157 ../finch/gntplugin.c:360
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -134,13 +133,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:1788
 #: ../libpurple/protocols/jabber/buddy.c:1824
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6007
+#: ../libpurple/protocols/oscar/oscar.c:6046
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -159,24 +159,32 @@
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3244 ../pidgin/gtkaccount.c:1911
-#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
-#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
-#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -194,7 +202,7 @@
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1903
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -207,14 +215,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1910 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2062 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
@@ -223,15 +231,16 @@
 msgstr "Você pode ativar/desativar as contas a partir da lista abaixo."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:333
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
 #: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Adicionar"
@@ -241,32 +250,32 @@
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2448
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2500
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
 msgid "Deny"
 msgstr "Negar"
 
@@ -290,18 +299,19 @@
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2846
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
 #: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
 #: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
-#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apelido"
@@ -313,17 +323,21 @@
 #: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "Conta"
 
 #: ../finch/gntblist.c:331 ../finch/gntblist.c:819
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3146 ../pidgin/gtkblist.c:5343
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5394
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
@@ -337,9 +351,9 @@
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1537 ../libpurple/protocols/msn/msn.c:1602
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -347,7 +361,7 @@
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
@@ -371,7 +385,7 @@
 
 #: ../finch/gntblist.c:436 ../finch/gntblist.c:823
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
 msgid "Add Group"
 msgstr "Criar grupo"
 
@@ -399,18 +413,19 @@
 msgid "Edit Settings"
 msgstr "Modificar configurações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Information"
 msgstr "Informações"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
+#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
 #: ../finch/gntblist.c:866 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
 
@@ -420,8 +435,9 @@
 
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1635
 msgid "Send File"
 msgstr "Enviar arquivo"
 
@@ -465,14 +481,14 @@
 msgstr "Confirmar remoção"
 
 #: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2234 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
@@ -493,28 +509,32 @@
 #: ../libpurple/protocols/jabber/buddy.c:818
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2999
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/bonjour/bonjour.c:314
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2900
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1810
+#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3419 ../pidgin/gtkprefs.c:1848
 msgid "Idle"
 msgstr "Inativo"
 
@@ -551,134 +571,135 @@
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2030 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2143 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2153 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa para quem você deseja mandar "
 "mensagens instantâneas."
 
-#: ../finch/gntblist.c:2156 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6006
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3995
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2176 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2182
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2186
+#: ../finch/gntblist.c:2189
 msgid "Show offline buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntblist.c:2192
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Ordenar por status"
 
-#: ../finch/gntblist.c:2196
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2200
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Ordenar por tamanho do log"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s foi desconectado devido ao seguinte erro:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Erro de conexão"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Conectar"
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"O Finch não tentará reconectar esta conta até que você corrija o erro e "
+"reative a mesma."
 
 #: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
@@ -738,15 +759,15 @@
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -754,7 +775,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7079
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -762,12 +783,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7082
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -775,11 +796,11 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
@@ -863,24 +884,24 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/jabber.c:1220
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:803
 #: ../libpurple/protocols/oscar/oscar.c:808
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2659
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3768
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3051 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Status"
@@ -900,8 +921,9 @@
 #. Close button
 #: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
 #: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2475 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Fechar"
 
@@ -927,7 +949,7 @@
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -939,7 +961,7 @@
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
 msgid "From"
 msgstr "De"
 
@@ -972,11 +994,11 @@
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
 msgid "IM"
 msgstr "MI"
 
@@ -1038,7 +1060,7 @@
 msgstr "Configurar plugin"
 
 #: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1954
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1059,9 +1081,7 @@
 msgstr "Quem terá a ação"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1214,12 +1234,12 @@
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1815
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
 #: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1814 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
@@ -1253,12 +1273,12 @@
 msgstr "Gravar mudanças de status no log do sistema"
 
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1918
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1929
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
 msgid "Logging"
 msgstr "Logs"
 
@@ -1266,13 +1286,13 @@
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
@@ -1302,37 +1322,38 @@
 msgstr "Tipo"
 
 #: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5467
-#: ../libpurple/protocols/oscar/oscar.c:5685
-#: ../libpurple/protocols/oscar/oscar.c:5699
-#: ../libpurple/protocols/oscar/oscar.c:5715
-#: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5729
+#: ../libpurple/protocols/oscar/oscar.c:5506
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5738
+#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5768
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3479
-#: ../libpurple/protocols/yahoo/yahoo.c:3485
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
@@ -1545,8 +1566,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3992
+msgid "Connection Error"
+msgstr "Erro de conexão"
+
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1342
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
@@ -1595,7 +1621,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Amigos"
@@ -1621,7 +1647,7 @@
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -1638,7 +1664,8 @@
 msgid "The message is too large."
 msgstr "A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
@@ -1650,32 +1677,32 @@
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
@@ -2198,12 +2225,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2234
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5799
-#: ../libpurple/protocols/oscar/oscar.c:5854
-#: ../libpurple/protocols/oscar/oscar.c:6080
-#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2248,8 +2275,8 @@
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1613
-#: ../libpurple/protocols/msn/msn.c:1643
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Anotações"
 
@@ -2257,7 +2284,7 @@
 msgid "Enter your notes below..."
 msgstr "Digite suas anotações abaixo..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Alterar anotações..."
 
@@ -2269,18 +2296,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "Anotações em amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Guarda anotações em amigos específicos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Adiciona a opção de guardar anotações em amigos na sua lista de amigos."
@@ -2480,30 +2507,30 @@
 msgid "(UTC)"
 msgstr "(Greenwich)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "O usuário está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Auto-resposta enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectou."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Uma ou mais mensagens pode(m) não ter sido enviada(s)."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Você foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2511,70 +2538,70 @@
 "Atualmente, você está desconectado. Nenhuma mensagem será recebida até que "
 "você conecte-se."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "A mensagem não pôde ser enviada porque o limite de tamanho foi excedido."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "A mensagem não pôde ser enviada."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
 msgid "General Log Reading Configuration"
 msgstr "Configuração geral da leitura de logs"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
 msgid "Fast size calculations"
 msgstr "Cálculos rápidos de tamanho"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
 msgid "Use name heuristics"
 msgstr "Utilizar heurística de nome"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Log Directory"
 msgstr "Diretório de logs"
 
@@ -2584,20 +2611,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
 msgid "Log Reader"
 msgstr "Leitor de logs"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclui o log de outros clientes de mensagem instantânea no leitor de logs."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2688,9 +2715,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Sim"
 
@@ -2698,9 +2727,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Não"
 
@@ -2827,7 +2858,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2835,8 +2866,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornece suporte a SSL através do GNUTLS."
 
@@ -2846,7 +2877,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2854,8 +2885,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
@@ -2931,7 +2962,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plugins Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2940,11 +2971,11 @@
 "plugins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -2954,18 +2985,19 @@
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4500
-#: ../libpurple/protocols/oscar/oscar.c:5545
+#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:5584
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3382
-#: ../libpurple/protocols/yahoo/yahoo.c:3455 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1824
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Ausente"
@@ -2980,86 +3012,91 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome do host"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Sobrenome"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+msgid "AIM Account"
+msgstr "Conta do AIM"
+
 #: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "Conta do AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "Conta do XMPP"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
 msgid "Error setting socket options"
 msgstr "Erro ao definir as opções do socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3130,8 +3167,8 @@
 msgstr "O registro foi concluído com sucesso!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
 msgid "Password"
 msgstr "Senha"
 
@@ -3157,9 +3194,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
@@ -3168,8 +3205,8 @@
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1542
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3182,14 +3219,14 @@
 msgstr "Homem ou mulher"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Masculino"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3252,10 +3289,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5556
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3398
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Desconectado"
@@ -3265,22 +3302,23 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Disponível"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2658
-#: ../libpurple/protocols/oscar/oscar.c:3689
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3687
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
 #: ../libpurple/protocols/jabber/buddy.c:1585
 #: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
@@ -3289,7 +3327,7 @@
 msgstr "Ano de nascimento"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3901
+#: ../libpurple/protocols/oscar/oscar.c:3899
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
@@ -3418,21 +3456,24 @@
 msgstr "Usuário do Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico atual é: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
@@ -3476,11 +3517,12 @@
 msgstr "Ver mensagem do dia (MOTD)"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -3490,21 +3532,21 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2747
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
@@ -3515,18 +3557,17 @@
 msgstr "Não foi possível criar socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
 #: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Falha na negociação SSL"
 
@@ -3535,15 +3576,18 @@
 msgstr "Erro de leitura"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuários"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tópico"
@@ -3567,23 +3611,26 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6623
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2140
-#: ../libpurple/protocols/oscar/oscar.c:6587
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6626
 #: ../libpurple/protocols/qq/qq.c:759
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
@@ -3593,18 +3640,25 @@
 msgstr "Codificações"
 
 #: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Nome do usuário"
 
 #: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nome real"
 
@@ -3643,13 +3697,15 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3690
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apelido"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Atualmente em"
 
@@ -3669,98 +3725,99 @@
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s apagou o tópico."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico do %s é: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "O servidor IRC recebeu uma mensagem que não foi entendida."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuários em %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Resposta do comando Time"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "O horário local do servidor IRC é:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "O usuário está desconectado"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Você foi expulso por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3768,7 +3825,7 @@
 "O apelido selecionado foi rejeitado pelo servidor. Provavelmente, ele contém "
 "caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3776,43 +3833,44 @@
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Você saiu do canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1107
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Não foi possível entrar em %s: Registro requerido"
 
-#: ../libpurple/protocols/irc/msgs.c:1108
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Não foi possível entrar no canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1142
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Este usuário ou canal está temporariamente indisponível."
 
-#: ../libpurple/protocols/irc/msgs.c:1154
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -3922,7 +3980,7 @@
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -4032,21 +4090,21 @@
 "whowas &lt;apelido&gt;:  Exibe informações de um usuário que está "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4119,13 +4177,15 @@
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
 #: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
@@ -4135,7 +4195,7 @@
 msgstr "Nome"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
@@ -4166,7 +4226,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:281
 #: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
@@ -4180,8 +4241,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
 #: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Email"
@@ -4203,14 +4266,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1611
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "Birthday"
 msgstr "Data de nascimento"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Descrição"
@@ -4240,29 +4303,32 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:665
 #: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
 msgid "Priority"
 msgstr "Prioridade"
 
 #: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do meio"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
@@ -4303,7 +4369,7 @@
 msgstr "Parar de monitorar a presença"
 
 #: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1260
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
@@ -4312,9 +4378,9 @@
 msgstr "Ausente (estendido)"
 
 #: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1290
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5721
+#: ../libpurple/protocols/oscar/oscar.c:5760
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
@@ -4325,7 +4391,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1587
 #: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "Last Name"
 msgstr "Sobrenome"
 
@@ -4365,8 +4431,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3704
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
@@ -4405,7 +4471,7 @@
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5227
+#: ../libpurple/protocols/oscar/oscar.c:5246
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -4475,7 +4541,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erro ao obter lista de salas"
 
@@ -4510,425 +4577,443 @@
 msgid "Read Error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Não foi possível estabelecer conexão com o servidor:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Registrar nova conta do XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1066
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5515
+#: ../libpurple/protocols/oscar/oscar.c:5554
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1176
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1183
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1187
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1190
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1321
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1388
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6301
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6312
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1410
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
-msgid "Remote Server Timeout"
-msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
-
-#: ../libpurple/protocols/jabber/jabber.c:1516
-msgid "Server Overloaded"
-msgstr "Servidor sobrecarregado"
-
-#: ../libpurple/protocols/jabber/jabber.c:1518
-msgid "Service Unavailable"
-msgstr "Serviço indisponível"
-
 #: ../libpurple/protocols/jabber/jabber.c:1520
-msgid "Subscription Required"
-msgstr "Inscrição requerida"
+msgid "Remote Server Timeout"
+msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
 #: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Server Overloaded"
+msgstr "Servidor sobrecarregado"
+
+#: ../libpurple/protocols/jabber/jabber.c:1524
+msgid "Service Unavailable"
+msgstr "Serviço indisponível"
+
+#: ../libpurple/protocols/jabber/jabber.c:1526
+msgid "Subscription Required"
+msgstr "Inscrição requerida"
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1535
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1546
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1551
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
-msgid "Invalid ID"
-msgstr "ID inválido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Invalid Namespace"
-msgstr "Namespace inválido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1575
-msgid "Invalid XML"
-msgstr "XML inválido"
-
 #: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Non-matching Hosts"
-msgstr "Hosts não compatíveis"
+msgid "Invalid ID"
+msgstr "ID inválido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1579
+msgid "Invalid Namespace"
+msgstr "Namespace inválido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1581
+msgid "Invalid XML"
+msgstr "XML inválido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
+msgid "Non-matching Hosts"
+msgstr "Hosts não compatíveis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1605
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1607
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1609
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1720
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1780
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1815
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1824
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4936,7 +5021,7 @@
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4944,19 +5029,19 @@
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [sala]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4979,7 +5064,7 @@
 msgstr "Plugin do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:501
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
 msgid "Domain"
 msgstr "Domínio"
 
@@ -4998,7 +5083,8 @@
 
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866 ../pidgin/gtkaccount.c:830
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
@@ -5031,7 +5117,7 @@
 msgid "XMPP Message Error"
 msgstr "Erro de mensagem do XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
@@ -5040,16 +5126,16 @@
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:352
 #: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5057,11 +5143,11 @@
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
@@ -5075,18 +5161,48 @@
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não suporta "
 "transferência de arquivos."
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Falha no envio de arquivo"
 
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Não foi possível enviar o arquivo para %s, ID do Jabber inválido"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+"Não foi possível enviar arquivo para %s, pois o usuário não está conectado"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Não foi possível enviar arquivo para %s, pois você não está recebendo "
+"informações de presença deste usuário"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+"Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
+"arquivo"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Selecione um recurso"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5304,8 +5420,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
@@ -5404,8 +5521,8 @@
 msgstr "Tem você"
 
 #: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Volto já"
 
@@ -5413,21 +5530,23 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Ocupado"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Ao telefone"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
@@ -5478,31 +5597,31 @@
 msgid "Failed to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1463 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1534 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1541
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1543
+#: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1544
+#: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5510,186 +5629,188 @@
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1747 ../libpurple/protocols/msn/msn.c:1754
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1555 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1681 ../libpurple/protocols/msn/msn.c:1688
-#: ../libpurple/protocols/msn/msn.c:1696 ../libpurple/protocols/msn/msn.c:1703
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1582 ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3781
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "E-Mail pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1630
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1648
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1636
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "E-Mail de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1641
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1642
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1718
-#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1829
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5699,7 +5820,7 @@
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5707,7 +5828,7 @@
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL do Perfil"
@@ -5722,19 +5843,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2108 ../libpurple/protocols/msn/msn.c:2110
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2149
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2157
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
@@ -5765,7 +5886,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -5803,15 +5924,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Serviço temporariamente indisponível."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Não foi possível renomear grupo"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1323
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5866,7 +5987,7 @@
 msgstr "Erro ao processar HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/oscar/oscar.c:3455
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
@@ -5881,36 +6002,36 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Não foi possível autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sua lista de amigos do MSN está temporariamente indisponível. Favor aguardar "
 "e tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Negociando"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Iniciando autenticação"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Recebendo o cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Enviando o cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
@@ -5950,14 +6071,23 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"A mensagem não pôde ser enviada porque não podemos estabelecer uma sessão "
+"com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
+"em alguns minutos:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s está chamando sua atenção!"
@@ -6341,18 +6471,18 @@
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
 #: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2451
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "O servidor encerrou a conexão."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
 #: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2445 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6362,21 +6492,12 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Não foi possível estabelecer conexão com o servidor:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6408,7 +6529,7 @@
 msgstr "Plugin do protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificação"
@@ -6561,8 +6682,8 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
+#: ../pidgin/gtkutils.c:2340
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
@@ -6576,13 +6697,15 @@
 msgstr "Mensagem instantânea direta do AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Bate-papo"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "Receber arquivo"
 
@@ -6655,17 +6778,17 @@
 msgstr "Câmera"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5693
+#: ../libpurple/protocols/oscar/oscar.c:5732
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "Não disponível"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5714
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -6674,7 +6797,7 @@
 msgstr "Permitir que outros vejam seu status pela Web"
 
 #: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:156
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Invisível"
@@ -6684,13 +6807,13 @@
 msgstr "Conectado"
 
 #: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
 msgid "IP Address"
 msgstr "Endereço IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2849
+#: ../libpurple/protocols/oscar/oscar.c:2847
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
@@ -6802,10 +6925,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:5798
-#: ../libpurple/protocols/oscar/oscar.c:6079 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -6824,51 +6947,51 @@
 msgid "Unable to get a valid AIM login hash."
 msgstr "Não foi possível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
 msgid "Unable to get a valid login hash."
 msgstr "Não foi possível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1642
+#: ../libpurple/protocols/oscar/oscar.c:1641
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1698
+#: ../libpurple/protocols/oscar/oscar.c:1697
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2201
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:2406
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:2270
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:2276
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6879,18 +7002,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6903,7 +7026,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6916,7 +7039,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2438
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6929,38 +7052,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2459
+#: ../libpurple/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2465
+#: ../libpurple/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2553
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2562
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6971,21 +7094,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2580
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2600
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6993,61 +7116,61 @@
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#: ../libpurple/protocols/oscar/oscar.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2824
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2756
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2820
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2823
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informação do usuário %s indisponível:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:2852
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2862
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/oscar/oscar.c:2892
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:2920
+#: ../libpurple/protocols/oscar/oscar.c:2918
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2997
+#: ../libpurple/protocols/oscar/oscar.c:2995
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3184
+#: ../libpurple/protocols/oscar/oscar.c:3182
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7055,7 +7178,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3387
+#: ../libpurple/protocols/oscar/oscar.c:3385
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7063,85 +7186,86 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3459
+#: ../libpurple/protocols/oscar/oscar.c:3457
 msgid "You have been signed off for an unknown reason."
 msgstr "Você foi desconectado por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3472
+#: ../libpurple/protocols/oscar/oscar.c:3470
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3719
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/oscar/oscar.c:3747
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3781
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3867
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nomes de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3912
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3938
+#: ../libpurple/protocols/oscar/oscar.c:3936
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3959
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3959
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3990
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7150,13 +7274,13 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:3996
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7165,7 +7289,7 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7174,7 +7298,7 @@
 "Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7183,7 +7307,7 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7192,32 +7316,32 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O endereço de e-mail de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4023
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4197
+#: ../libpurple/protocols/oscar/oscar.c:4195
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4461
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4443
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7227,7 +7351,7 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4457
+#: ../libpurple/protocols/oscar/oscar.c:4476
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7242,11 +7366,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4481
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4526
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7261,11 +7385,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4512
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4581
+#: ../libpurple/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7276,17 +7400,17 @@
 "Nomes de usuário têm que começar com uma letra e conter apenas letras, "
 "números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4583
-#: ../libpurple/protocols/oscar/oscar.c:5006
-#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:4602
+#: ../libpurple/protocols/oscar/oscar.c:5025
+#: ../libpurple/protocols/oscar/oscar.c:5039
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4687
+#: ../libpurple/protocols/oscar/oscar.c:4706
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4688
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7295,16 +7419,16 @@
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4892
-#: ../libpurple/protocols/oscar/oscar.c:4893
-#: ../libpurple/protocols/oscar/oscar.c:4898
-#: ../libpurple/protocols/oscar/oscar.c:5074
-#: ../libpurple/protocols/oscar/oscar.c:5075
-#: ../libpurple/protocols/oscar/oscar.c:5080
+#: ../libpurple/protocols/oscar/oscar.c:4911
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5093
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5099
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
+#: ../libpurple/protocols/oscar/oscar.c:5023
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7313,12 +7437,12 @@
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7329,7 +7453,7 @@
 "mais comum para isso é que você tem o número máximo de amigos permitido na "
 "sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5111
+#: ../libpurple/protocols/oscar/oscar.c:5130
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7338,23 +7462,23 @@
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5119
+#: ../libpurple/protocols/oscar/oscar.c:5138
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:5215
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7365,53 +7489,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5216
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5233
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/oscar/oscar.c:5292
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5343
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5482
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5526
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5847
+#: ../libpurple/protocols/oscar/oscar.c:5886
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7419,65 +7543,65 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5853
+#: ../libpurple/protocols/oscar/oscar.c:5892
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/oscar.c:5927
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5894
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5902
+#: ../libpurple/protocols/oscar/oscar.c:5941
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:5999
+#: ../libpurple/protocols/oscar/oscar.c:6038
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6023
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a capitalização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6162
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6126
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7485,73 +7609,73 @@
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endereço de e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6185
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/oscar.c:6188
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6307
+#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6322
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6332
+#: ../libpurple/protocols/oscar/oscar.c:6371
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6386
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6354
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6399
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/oscar/oscar.c:6404
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6475
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6591
+#: ../libpurple/protocols/oscar/oscar.c:6630
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8055,13 +8179,7 @@
 msgstr "Não foi possível conectar, verifique o log de depuração"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2380
-#: ../libpurple/protocols/yahoo/yahoo.c:2408
-#: ../libpurple/protocols/yahoo/yahoo.c:2515
-#: ../libpurple/protocols/yahoo/yahoo.c:2536
-#: ../libpurple/protocols/yahoo/yahoo.c:2620
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8470,7 +8588,7 @@
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
 msgid "Topic:"
 msgstr "Tópico:"
 
@@ -8495,6 +8613,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+msgid "Connect"
+msgstr "Conectar"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8731,60 +8853,85 @@
 msgstr "Esconder identidade do cliente"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "O usuário %s não está presente na rede"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Não foi possível fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erro ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falha ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo esgotado ao fazer o acordo de chaves"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "O acordo de chaves foi abortado"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "O acordo de chaves foi abortado"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "O acordo de chaves já começou"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "O acordo de chaves não pode ser iniciado com você mesmo"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "O usuário remoto não está mais presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8793,7 +8940,8 @@
 "Um pedido de acordo de chaves foi recebido de %s. Você gostaria de fazer o "
 "acordo de chaves?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8804,69 +8952,99 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Pedido de acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Não foi possível definir chave da mensagem instantânea"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Definir senha de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Não foi possível obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Exibir chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Não foi possível carregar chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Não foi possível obter informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "O amigo %s não é certificado"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8875,16 +9053,19 @@
 "deste. Você pode usar o comando Obter Chave Pública para fazê-lo."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8892,15 +9073,18 @@
 "Para adicionar um amigo você precisa importar a chave pública desde. "
 "Pressione importar para importar uma chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Selecione o usuário correto"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8908,7 +9092,8 @@
 "Mais de um usuário foi encontrado com a mesma chave pública. Selecione o "
 "usuário correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8917,237 +9102,318 @@
 "correto da lista para adicioná-lo à sua lista de amigos."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robô"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Enciumado"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Envergonhado"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencível"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Apaixonado"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sonolento"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Chateado"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Empolgado"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos do usuário"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localização geográfica"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Mensagem instantânea com troca de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Expulsar usuário do servidor"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenhar no quadro de atividades"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Frase-senha:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "O canal %s não existe na rede"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informações do canal"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Não foi possível obter informações do canal"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome do canal:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuários:</b> %d<br>"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador do canal:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra do canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tópico do canal:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impressão digital da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Impressão digital legível da chave do fundador:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adicionar chave pública do canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas do canal"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9162,333 +9428,446 @@
 "apenas usuários cujas chaves públicas estiverem listadas podem entrar no "
 "canal."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticação do canal"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Lista de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usuários do canal. Defina para zero para redefinir o "
 "limite de usuários."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Definir limite de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Definir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Redefinir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Você é o fundador do canal em <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Você tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Não foi possível entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Não foi possível chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferência de arquivo segura"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erro durante a transferência do arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "O outro lado desconectou"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falha no acordo de chaves"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Tempo limite de conexão esgotado"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Falha ao criar a conexão"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "A sessão de transferência de arquivo não existe"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nenhuma sessão de transferência de arquivo ativa"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transferência de arquivo já começou"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Não foi possível fazer o acordo de chaves para a transferência"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Não foi possível iniciar a transferência de arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Não foi possível enviar o arquivo"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Ocorreu um erro"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o tópico de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos do canal <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Você foi expulso de <I>%s</I> por <I>%s</I>: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Você foi 'killado' por %s: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "'Killado' por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconexão do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informação pessoal"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Data de nascimento"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Função de trabalho"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organização"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Você é o fundador do canal em <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Impressão digital da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Impressão digital legível da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mais..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Não foi possível desconectar sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Não foi possível definir tópico"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Não foi possível obter lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "A rede está vazia"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nenhuma chave pública foi recebida"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Não foi possível obter informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Não foi possível obter estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Estatísticas do servidor indisponíveis"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9523,105 +9902,66 @@
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Não foi possível 'killar' usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Erro ao conectar no servidor SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Falha na troca de chaves"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
-"Reconectar para criar uma nova sessão."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Desconectado pelo servidor"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "MONITORAR"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Não é possível monitorar o usuário"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Recuperando sessão"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando conexão"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Falha: Versões incompatíveis, atualize seu cliente"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Falha: O usuário remoto não suporta a cifra proposta"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Falha: Assinatura incorreta"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Falha: Cookie inválido"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Falha: Autenticação mal sucedida"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9630,12 +9970,12 @@
 "A chave pública de %s foi recebida. Sua cópia local não confere com esta "
 "chave. Você ainda deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "A chave pública de %s foi recebida. Deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9648,73 +9988,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar chave pública"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de chave pública não suportada"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Desconectado pelo servidor"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Erro ao conectar no servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Falha na troca de chaves"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
+"Reconectar para criar uma nova sessão."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Falha na conexão"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Não foi possível iniciar conexão do cliente SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Conectando ao servidor SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Não foi possível carregar par de chaves SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Não foi possível criar conexão."
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "João sem nome"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Não foi possível encontrar/acessar diretório ~/.silc"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Conectando ao servidor SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Não foi possível carregar par de chaves SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Não foi possível criar conexão."
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Erro ao carregar par de chaves do SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9722,46 +10089,63 @@
 "\n"
 "Seu método preferido de contatos"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Seu status atual"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Serviços online"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que os outros vejam os serviços que você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que os outros vejam qual computador você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Seu arquivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Fuso horário (GMT)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos de status online do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9771,173 +10155,217 @@
 "e suas informações pessoais. Por favor preencha as informações que você "
 "deseja que seja vista por outros usuários vejam sobre você."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Não há mensagem do dia disponível"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há mensagem do dia associada com esta conexão."
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Criar novo par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "As frases-senha não conferem"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Falha ao gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Tamanho da chave"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Frase-senha (redigitar)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Status online"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Criar par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuário <I>%s</I> não está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Tópico muito extenso"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Você precisa especificar um apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s não encontrado"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal está definido em %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Vê ou altera o tópico"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usuário&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usuário&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usuário do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9945,7 +10373,8 @@
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9953,16 +10382,19 @@
 "cumode &lt;usuário|canal&gt; +|-&lt;modos&gt; &lt;usuário&gt;: Muda os modos "
 "do usuário no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuário&gt;: Define seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usuário&gt; [-pubkey]: Obtém privilégios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9970,38 +10402,46 @@
 "invite &lt;canal&gt; [-|+]&lt;usuário&gt;:  convida um usuário ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusuário&gt; [comentário]:  Expulsa o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usuário&gt;]:  Bane o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usuário|servidor&gt;:  Obtém a chave pública do servidor ou do "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usuários no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10018,118 +10458,143 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de conferência segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1921
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr "Usar \"Perfect Forward Secrecy\""
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Rejeitar ser monitorado por outros usuários"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Bloquear convites"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Rejeitar pedidos de atributos de status online"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Não foi possível criar par de chaves do SILC\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome do usuário: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organização: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Tamanho da chave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versão: %s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10140,7 +10605,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10149,37 +10615,44 @@
 "Impressão digital legível da chave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informações da chave pública"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computador"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s mandou uma mensagem para o quadro de atividades. Deseja abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10188,10 +10661,71 @@
 "%s mandou uma mensagem para o quadro de atividades no canal %s. Você deseja "
 "abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Quadro de atividades"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Estatísticas do servidor indisponíveis"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Falha: Versões incompatíveis, atualize seu cliente"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Falha: O usuário remoto não suporta a cifra proposta"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Falha: Assinatura incorreta"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Falha: Cookie inválido"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Falha: Autenticação mal sucedida"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Não foi possível iniciar conexão do cliente SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "João sem nome"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Não foi possível encontrar/acessar diretório ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Não foi possível carregar par de chaves SILC: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
@@ -10424,7 +10958,8 @@
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
+#: ../pidgin/gtkblist.c:5847
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -10580,123 +11115,141 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2490
-#: ../libpurple/protocols/yahoo/yahoo.c:2669
-#: ../libpurple/protocols/yahoo/yahoo.c:2772
-#: ../libpurple/protocols/yahoo/yahoo.c:2782
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"A conexão com %s foi perdida:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Não foi possível estabelecer conexão com %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2989
-#: ../libpurple/protocols/yahoo/yahoo.c:3019
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3036
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3039
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3157
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3163
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3191
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3241
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3257
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "You have just sent a Buzz!"
 msgstr "Você acabou de chamar a atenção do usuário!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3828
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -10710,56 +11263,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4072
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4075
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4078
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4081
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4101
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4104
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4107
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
@@ -10849,7 +11402,7 @@
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Erro ao enviar"
 
@@ -11130,7 +11683,7 @@
 msgstr "Exposição"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11161,7 +11714,7 @@
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver host"
 
@@ -11254,27 +11807,27 @@
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tornou-se inativo"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2586
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2587
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11283,62 +11836,67 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3060
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3063
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3089
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3101
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3109
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3115
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3123
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3129
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3365 ../libpurple/util.c:3663
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3491
+#: ../libpurple/util.c:3549
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11347,17 +11905,17 @@
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3526
+#: ../libpurple/util.c:3584
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3557
+#: ../libpurple/util.c:3615
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3582
+#: ../libpurple/util.c:3640
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
@@ -11383,55 +11941,71 @@
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:408
+#: ../pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:524
-msgid "Local alias:"
-msgstr "Apelido local:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tocolo:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Nome de usuário:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "Apelido _local:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:586
+#: ../pidgin/gtkaccount.c:590
 msgid "User Options"
 msgstr "Opções do usuário"
 
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Notificar ao receber novos e_mails"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:604
-msgid "Use this buddy icon for this account:"
-msgstr "Usar este ícone de exibição para esta conta:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Usar este _ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:724
+#: ../pidgin/gtkaccount.c:728
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:929
+#: ../pidgin/gtkaccount.c:934
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:930
+#: ../pidgin/gtkaccount.c:935
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:941
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:942
+#: ../pidgin/gtkaccount.c:947
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:948
+#: ../pidgin/gtkaccount.c:953
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:959
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:960 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -11440,60 +12014,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:999
+#: ../pidgin/gtkaccount.c:1004
 msgid "If you look real closely"
 msgstr "Se você olhar bem de perto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1002
+#: ../pidgin/gtkaccount.c:1007
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:1023
+#: ../pidgin/gtkaccount.c:1028
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1058
+#: ../pidgin/gtkaccount.c:1063
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1065 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1471
+#: ../pidgin/gtkaccount.c:1476
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1495
+#: ../pidgin/gtkaccount.c:1500
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1506
+#: ../pidgin/gtkaccount.c:1511
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:2011
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2200
+#: ../pidgin/gtkaccount.c:2212
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11517,11 +12091,11 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:727
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:748
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11529,95 +12103,93 @@
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:759 ../pidgin/gtkblist.c:5441
+#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1048
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1099
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1108
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1115
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar ação de _usuário"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "_Apelidar..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1198
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1201
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1203
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1223
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1289
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
+#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4529
+#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11625,126 +12197,117 @@
 "Você não está conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2846
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2849
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usuário..."
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Exibir amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Exibir grupos _vazios"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Exibir _detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Exibir _tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2862
+msgid "/Buddies/_About Pidgin"
+msgstr "/Amigos/_Sobre o Pidgin"
+
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Adicionar\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2879
+msgid "/Tools/_Debug Window"
+msgstr "/Ferramentas/Janela de _depuração"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#. Help
-#: ../pidgin/gtkblist.c:2868
-msgid "/_Help"
-msgstr "/_Ajuda"
-
-#: ../pidgin/gtkblist.c:2869
-msgid "/Help/Online _Help"
-msgstr "/Ajuda/_Ajuda online"
-
-#: ../pidgin/gtkblist.c:2870
-msgid "/Help/_Debug Window"
-msgstr "/Ajuda/Janela de _depuração"
-
-#: ../pidgin/gtkblist.c:2871
-msgid "/Help/_About"
-msgstr "/Ajuda/_Sobre"
-
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2909
 #, c-format
 msgid ""
 "\n"
@@ -11753,127 +12316,127 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2987
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3414
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3416
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3561
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3563
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3564
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3566
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3601
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3604
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3781
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3783
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3784
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3785
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:3997
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4021
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4173
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4180
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4191
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4276
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4290
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11892,23 +12455,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
+#: ../pidgin/gtkblist.c:4537
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Exibir amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4540
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Exibir grupos vazios"
 
-#: ../pidgin/gtkblist.c:4514
+#: ../pidgin/gtkblist.c:4546
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Exibir detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:4517
+#: ../pidgin/gtkblist.c:4549
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Exibir tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5418
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11919,17 +12482,20 @@
 "amigo. O apelido será exibido no lugar do nome do usuário sempre que "
 "possível.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupo:"
-
-#: ../pidgin/gtkblist.c:5686
+#. End of account box
+#: ../pidgin/gtkblist.c:5453
+msgid "_Screen name:"
+msgstr "Nome de _usuário:"
+
+#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+msgid "A_lias:"
+msgstr "Ape_lido:"
+
+#: ../pidgin/gtkblist.c:5741
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5757
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11937,7 +12503,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5798
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11945,39 +12511,39 @@
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5886
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6526
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6571
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6583
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6589
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6638
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6708
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -11994,21 +12560,21 @@
 "O %s não tentará reconectar esta conta até que você corrija o erro e reative "
 "a mesma."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:813
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:866
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:896
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12016,189 +12582,197 @@
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:917
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Não foi possível abrir arquivo."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:1000
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:1036
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1394
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1402
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
 "gravadas."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1650
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1653
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1673
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1696
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2556
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2607
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2659
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2664
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2667
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2671
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2684
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2826
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2833
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2835
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2845
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2849
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2853
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2855
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2857
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2859
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2861
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2866
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversa/Inserir lin_k..."
+
+#: ../pidgin/gtkconv.c:2868
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversa/Inserir imag_em..."
+
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2878
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2879
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _log"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2880
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2881
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2883
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2884
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
@@ -12207,165 +12781,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3088
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3094
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3098
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3104
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3114
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3122
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3130
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3136
+msgid "/Conversation/Insert Link..."
+msgstr "/Conversa/Inserir link..."
+
+#: ../pidgin/gtkconv.c:3140
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversa/Inserir imagem..."
+
+#: ../pidgin/gtkconv.c:3146
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3149
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3165
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3168
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Mostrar ícones de amigos"
 
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3297
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3479
 msgid "_Send To"
 msgstr "_Enviar para"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4193
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4226
+#: ../pidgin/gtkconv.c:4344
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5415 ../pidgin/gtkconv.c:5536
+#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:6102 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6108
+#: ../pidgin/gtkconv.c:6237
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6113
+#: ../pidgin/gtkconv.c:6242
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6118 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6123
+#: ../pidgin/gtkconv.c:6252
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7252
+#: ../pidgin/gtkconv.c:7384
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7284
+#: ../pidgin/gtkconv.c:7416
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:7806
+#: ../pidgin/gtkconv.c:7938
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:7812
+#: ../pidgin/gtkconv.c:7944
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:7820
+#: ../pidgin/gtkconv.c:7952
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:7826
+#: ../pidgin/gtkconv.c:7958
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8344
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:8867
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:8869
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:8873
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:8875
 msgid "By account"
 msgstr "Por conta"
 
@@ -12812,11 +13394,11 @@
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:865
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:858
+#: ../pidgin/gtkdialogs.c:867
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12824,43 +13406,43 @@
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:957
 msgid "View User Log"
 msgstr "Ver log do usuário"
 
-#: ../pidgin/gtkdialogs.c:950
+#: ../pidgin/gtkdialogs.c:959
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:979
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:980
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1002
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1025
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1065
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12875,15 +13457,15 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1076
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12892,15 +13474,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12909,30 +13491,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1206
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1209
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1212
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1224
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12941,11 +13523,11 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
@@ -13063,44 +13645,44 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
-#: ../pidgin/gtkimhtml.c:1284
+#: ../pidgin/gtkimhtml.c:1309
 msgid "Hyperlink color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/gtkimhtml.c:1285
+#: ../pidgin/gtkimhtml.c:1310
 msgid "Color to draw hyperlinks."
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1288
+#: ../pidgin/gtkimhtml.c:1313
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
 
-#: ../pidgin/gtkimhtml.c:1289
+#: ../pidgin/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando o mouse está sobre eles."
 
-#: ../pidgin/gtkimhtml.c:1505
+#: ../pidgin/gtkimhtml.c:1530
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar endereço de e-mail"
 
-#: ../pidgin/gtkimhtml.c:1517
+#: ../pidgin/gtkimhtml.c:1542
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: ../pidgin/gtkimhtml.c:1527
+#: ../pidgin/gtkimhtml.c:1552
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3200
+#: ../pidgin/gtkimhtml.c:3227
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13110,7 +13692,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3203
+#: ../pidgin/gtkimhtml.c:3230
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13120,7 +13702,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3216
+#: ../pidgin/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13131,7 +13713,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3219
+#: ../pidgin/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13142,35 +13724,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3299 ../pidgin/gtkimhtml.c:3311
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3339
+#: ../pidgin/gtkimhtml.c:3380
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13178,83 +13760,83 @@
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:925 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../pidgin/gtkimhtmltoolbar.c:936 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../pidgin/gtkimhtmltoolbar.c:947 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:963
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "Maior tamanho de fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:975
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "Menor tamanho de fonte"
 
 #: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font"
+msgid "Font face"
 msgstr "Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1008
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1020
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Cor do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1039
-msgid "Reset font"
-msgstr "Redefinir fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1059
+#: ../pidgin/gtkimhtmltoolbar.c:1033
+msgid "Reset formatting"
+msgstr "Limpar formatação"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1083
-msgid "Insert"
-msgstr "Inserir"
+#: ../pidgin/gtkimhtmltoolbar.c:1069
+msgid "Insert smiley"
+msgstr "Inserir emoticon"
 
 #: ../pidgin/gtklog.c:267
 #, c-format
@@ -13347,12 +13929,12 @@
 msgid "System Log"
 msgstr "Log do sistema"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:368
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Tente `%s -h' para mais informações.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:370
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13378,7 +13960,7 @@
 "                      vírgula)\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:490
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13594,8 +14176,8 @@
 msgstr "Pré-_visualizar"
 
 #: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "_Executar apenas quando meu status for indisponível"
+msgid "P_ounce only when my status is not Available"
+msgstr "_Executar apenas quando meu status não for Disponível"
 
 #: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
@@ -13629,7 +14211,7 @@
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13648,7 +14230,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
 msgid "When away"
 msgstr "Quando ausente"
 
@@ -13697,39 +14279,55 @@
 msgid "N_ew conversations:"
 msgstr "Novas conv_ersas:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formatação nas mensagens recebidas"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
 msgid "Show buddy _icons"
 msgstr "Mostrar í_cones de amigos"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar animação nos íc_ones de amigos"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que você está digitando para eles"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
 msgid "Highlight _misspelled words"
 msgstr "Realçar palavras _mal grafadas"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
 msgid "Use smooth-scrolling"
 msgstr "Usar rolagem suave"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Fonte"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Usar a fonte de documento do _tema"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Usar a fonte do _tema"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "_Fonte para as conversas:"
+
+#: ../pidgin/gtkprefs.c:962
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -13737,119 +14335,119 @@
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
 "suportem formatação. :)"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13858,80 +14456,80 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
 msgid "Log _format:"
 msgstr "_Formato do log:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
 msgid "Log all _status changes to system log"
 msgstr "Gravar todos as mudanças de _status no log do sistema"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1550
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1644
 msgid "Command"
 msgstr "Comando"
 
-#: ../pidgin/gtkprefs.c:1608
+#: ../pidgin/gtkprefs.c:1645
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1616
+#: ../pidgin/gtkprefs.c:1653
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13940,117 +14538,117 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1679
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1680
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1682
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1684
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:1685
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../pidgin/gtkprefs.c:1656
+#: ../pidgin/gtkprefs.c:1693
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1721
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1773
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1742
+#: ../pidgin/gtkprefs.c:1780
 msgid "Event"
 msgstr "Evento"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1799
 msgid "Test"
 msgstr "Testar"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1803
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../pidgin/gtkprefs.c:1769
+#: ../pidgin/gtkprefs.c:1807
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: ../pidgin/gtkprefs.c:1812
+#: ../pidgin/gtkprefs.c:1850
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1817
+#: ../pidgin/gtkprefs.c:1855
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1868
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1836
+#: ../pidgin/gtkprefs.c:1874
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:1838
+#: ../pidgin/gtkprefs.c:1876
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:1842
+#: ../pidgin/gtkprefs.c:1880
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de alterar o status:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1888
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1871
+#: ../pidgin/gtkprefs.c:1909
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1873
+#: ../pidgin/gtkprefs.c:1911
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1879
+#: ../pidgin/gtkprefs.c:1917
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1955
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1957
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1958
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:1964
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:1930
+#: ../pidgin/gtkprefs.c:1968
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -14141,23 +14739,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
@@ -14180,7 +14778,7 @@
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Usar"
 
@@ -14194,25 +14792,25 @@
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Use um status _diferente para algumas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -14269,25 +14867,25 @@
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:593
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1409
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14296,12 +14894,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1505
+#: ../pidgin/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14309,31 +14907,31 @@
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1454
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Você pode enviar esta imagem como uma transferência de arquivos ou incluí-la "
-"nesta mensagem, ou usá-la como o ícone de amigo deste usuário."
-
-#: ../pidgin/gtkutils.c:1526
+#: ../pidgin/gtkutils.c:1461
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
+"ícone de amigo para este usuário."
+
+#: ../pidgin/gtkutils.c:1462
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14346,11 +14944,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1520
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14358,7 +14956,7 @@
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2268
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14369,25 +14967,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2564
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2566
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2567
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2667
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14433,6 +15031,26 @@
 msgid "_Open Mail"
 msgstr "_Abrir e-mail"
 
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Padrão"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Emoticons do Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Ao selecionar este tema, os emoticons gráficos serão desativados."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "nenhum"
+
 #: ../pidgin/plugins/cap/cap.c:449
 msgid "Display Statistics"
 msgstr "Mostrar estatísticas"
@@ -14722,6 +15340,11 @@
 "Selecione uma pessoa do seu catálogo de endereços abaixo, ou adicione uma "
 "nova pessoa."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupo:"
+
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14753,34 +15376,34 @@
 msgid "_Associate Buddy"
 msgstr "_Associar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
 msgid "Unable to send e-mail"
 msgstr "Não foi possível enviar e-mail."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
 msgid "The evolution executable was not found in the PATH."
 msgstr "O executável do evolution não foi encontrado no PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
 msgid "An e-mail address was not found for this buddy."
 msgstr "Não foi encontrado um endereço de E-Mail para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
 msgid "Add to Address Book"
 msgstr "Adicionar ao catálogo de endereços"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
 msgid "Send E-Mail"
 msgstr "Enviar e-mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
 msgid "Evolution Integration Configuration"
 msgstr "Configuração da integração com o Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecionar todas as contas onde amigos devem ser adicionados automaticamente."
@@ -14791,7 +15414,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -14799,8 +15422,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
 msgid "Provides integration with Evolution."
 msgstr "Fornece integração com o Evolution."
 
@@ -15223,28 +15846,19 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "Você está usando o %s, versão %s. A versão atual é a %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Log de alterações:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Você pode obter a versão %s em:<br><a href=\"http://pidgin.sourceforge.net/"
-"\">http://pidgin.sourceforge.net</a>."
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\""
+msgstr ""
+"Você está usando o %s, versão %s. A versão atual é a %s. Você pode obtê-la "
+"em <a href=\""
+
+#: ../pidgin/plugins/relnot.c:78
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Log de alterações:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
 msgid "New Version Available"
 msgstr "Nova versão disponível"
 
@@ -15254,19 +15868,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
 msgid "Release Notification"
 msgstr "Notificação de nova versão"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
 msgid "Checks periodically for new releases."
 msgstr "Verifica periodicamente por novas versões."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15561,7 +16175,7 @@
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
 
@@ -15571,39 +16185,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
 msgid "Account: "
 msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir um comando (stanza) <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir um comando (stanza) <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
 msgid "Insert a <message/> stanza."
 msgstr "Inserir um comando (stanza) <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plugin é útil para depurar servidores ou clientes XMPP."