[empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Sat, 12 Nov 2011 11:10:48 +0000 (UTC)
commit 54ff7731cdcdcad0e824c3b71fc8d1b427f26f72
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date: Sat Nov 12 19:10:31 2011 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1279 ++++++++++++++++++++++++++++++++---------------------------
po/zh_TW.po | 1279 ++++++++++++++++++++++++++++++++---------------------------
2 files changed, 1398 insertions(+), 1160 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 88cd526..0bb97f1 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 3.1.92\n"
+"Project-Id-Version: empathy 3.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 14:31+0800\n"
-"PO-Revision-Date: 2011-09-25 14:32+0800\n"
+"POT-Creation-Date: 2011-11-12 19:09+0800\n"
+"PO-Revision-Date: 2011-11-12 19:10+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
"Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
"Language: zh_TW\n"
@@ -87,59 +87,59 @@ msgid "Contact list sort criterion"
msgstr "èçäæåæåæå"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr "èçæèåéèçéèæåæèçïäï/dev/video0ã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Default directory to select an avatar image from"
msgstr "çäéæåéèåççéèçé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Disable popup notifications when away"
msgstr "ççæçééæåçåååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Disable sounds when away"
msgstr "ççæçééæåçéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Display incoming events in the status area"
msgstr "åçæååéçæåää"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Echo cancellation support"
msgstr "åéæéææ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can publish the user's location"
msgstr "Empathy åäçåäçèçäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy åäåç GPS äææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy åäåçæåéèççååèäææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy can use the network to guess the location"
msgstr "Empathy åäåçççäææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy default download folder"
msgstr "Empathy éèäèèæå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy åèç butterfly æè"
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-away when idle"
msgstr "Empathy çéçææèèåèçéé"
@@ -177,150 +177,150 @@ msgid "Hide the main window."
msgstr "éèäèçã"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "äæåãååèååãåèçéåçåè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Nick completed character"
msgstr "çåèéåç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Open new chats in separate windows"
msgstr "åååèçéåæçèå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Path of the Adium theme to use"
msgstr "èäçç Adium äæäéèå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "åæèååäççäéæ Adium æèäçç Adium äæäéèåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for incoming messages"
msgstr "æåèææææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound for new conversations"
msgstr "çéåæçèèæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound for outgoing messages"
msgstr "éåèææææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when a contact logs in"
msgstr "çèçäçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when a contact logs out"
msgstr "çæèçäçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Play a sound when we log in"
msgstr "çæåçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Play a sound when we log out"
msgstr "çæåçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications if the chat isn't focused"
msgstr "åæèåèçååçéåååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Pop up notifications when a contact logs in"
msgstr "çèçäçåæååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Pop up notifications when a contact logs out"
msgstr "çèçäçåæååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Position the camera preview should be during a call."
msgstr "éèææåæéèæèææçäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show Balance in contact list"
msgstr "æèçäæååéçéé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show avatars"
msgstr "éçåéè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show contact list in rooms"
msgstr "åèååéçèçäæå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Show hint about closing the main window"
msgstr "ééäèçæéçæç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Show offline contacts"
msgstr "éçéçèçä"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Show protocols"
msgstr "éçåå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Spell checking languages"
msgstr "æåææçèè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The default folder to save file transfers in."
msgstr "çäååææåèææææçéèèæåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The last directory that an avatar image was chosen from."
msgstr "äæéæåéèåçççéã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "The position for the chat window side pane"
msgstr "èåèçåçæçäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "èåèçåçæçååäç (åäçåç)ã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "The theme that is used to display the conversation in chat windows."
msgstr "çäéçåèåèçäèèçäæäéã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "çäåèåèçéçèèçäæäéæåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Use graphical smileys"
msgstr "äçåçåèæçè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Use notification sounds"
msgstr "äçéçéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Use theme for chat rooms"
msgstr "åèååäçäæäé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy æåèåäçèçäççåçäçèçäã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy æåäç GPS äææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy æåäçæåéèççäææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy æåäçççäææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy æåæèç butterfly æèã"
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy æåæåååæèåçåäçåèã"
@@ -471,23 +471,23 @@ msgstr "ççèæè VoIP åè"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
+#: ../src/empathy-accounts-dialog.c:2312
msgid "Messaging and VoIP Accounts"
msgstr "èæè VoIP åè"
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
msgid "File transfer completed, but the file was corrupted"
msgstr "ææåèåçïäæææåææ"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
msgid "File transfer not supported by remote contact"
msgstr "éçèçääææææåè"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
msgid "The selected file is not a regular file"
msgstr "éåçææäææèçææ"
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
msgid "The selected file is empty"
msgstr "éåçæææççç"
@@ -507,35 +507,35 @@ msgstr "åææ %s"
msgid "Call from %s"
msgstr "%s çäé"
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
msgid "Socket type not supported"
msgstr "Socket éåäææ"
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
msgid "No reason was specified"
msgstr "æææååå"
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
msgid "The change in state was requested"
msgstr "åèæææçæ"
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
msgid "You canceled the file transfer"
msgstr "äååæææåè"
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
msgid "The other participant canceled the file transfer"
msgstr "åäçåèèåæäææåè"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
msgid "Error while trying to transfer the file"
msgstr "åèåèæææççéè"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
msgid "The other participant is unable to transfer the file"
msgstr "åäçåèèçæåèèææ"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
msgid "Unknown reason"
msgstr "äæåå"
@@ -575,6 +575,7 @@ msgstr "çæèçéç"
#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
msgid "Network error"
msgstr "ççéè"
@@ -674,20 +675,23 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "äæåèæçéåïææäæåèæéçæåèéåçåååæèèçççå"
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:372
+msgid "Your software is too old"
+msgstr "äçèäéè"
+
+#: ../libempathy/empathy-utils.c:531
msgid "People Nearby"
msgstr "éèçä"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:536
msgid "Yahoo! Japan"
msgstr "Yahoo! ææ"
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:565
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:566
msgid "Facebook Chat"
msgstr "Facebook èå"
@@ -731,7 +735,7 @@ msgstr[0] "%d åæäå"
msgid "in the future"
msgstr "æä"
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:688
msgid "All accounts"
msgstr "ææåè"
@@ -754,58 +758,58 @@ msgstr "äæå"
msgid "Port"
msgstr "éæå"
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:776
+#: ../libempathy-gtk/empathy-account-widget.c:828
#, c-format
msgid "%s:"
msgstr "%sï"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1182
msgid "My Web Accounts"
msgstr "æçççåè"
-#: ../libempathy-gtk/empathy-account-widget.c:1208
+#: ../libempathy-gtk/empathy-account-widget.c:1199
#, c-format
msgid "The account %s is edited via %s."
msgstr "%s åèåéé %s äæã"
-#: ../libempathy-gtk/empathy-account-widget.c:1214
+#: ../libempathy-gtk/empathy-account-widget.c:1205
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s åèçææ Empathy åäæã"
-#: ../libempathy-gtk/empathy-account-widget.c:1233
+#: ../libempathy-gtk/empathy-account-widget.c:1224
msgid "Launch My Web Accounts"
msgstr "ååæçççåè"
#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
+#: ../libempathy-gtk/empathy-account-widget.c:1232
#, c-format
msgid "Edit %s"
msgstr "çè %s"
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1582
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "äçèåçï"
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1900
msgid "A_pply"
msgstr "åç(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1930
msgid "L_og in"
msgstr "çå(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "This account already exists on the server"
msgstr "æåèåçååéåäæåä"
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:2007
msgid "Create a new account on the server"
msgstr "åéåäæåäåçæçåè"
-#: ../libempathy-gtk/empathy-account-widget.c:2208
+#: ../libempathy-gtk/empathy-account-widget.c:2199
msgid "Ca_ncel"
msgstr "åæ(_N)"
@@ -814,19 +818,19 @@ msgstr "åæ(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2477
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s äç %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2503
#, c-format
msgid "%s Account"
msgstr "%s åè"
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2507
msgid "New account"
msgstr "æååè"
@@ -1196,7 +1200,7 @@ msgid "STUN Server:"
msgstr "STUN äæåï"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
msgid "Server:"
msgstr "äæåï"
@@ -1278,7 +1282,7 @@ msgid "Click to enlarge"
msgstr "èæéèæå"
#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
msgid "There was an error starting the call"
msgstr "ååéèæççéè"
@@ -1298,185 +1302,196 @@ msgstr "æåçèçäçæ"
msgid "Emergency calls are not supported on this protocol"
msgstr "æååäææçæéèåè"
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "äçåéäèäèäèéèã"
+
+#: ../libempathy-gtk/empathy-chat.c:706
msgid "Failed to open private chat"
msgstr "éåçäèååæ"
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "Topic not supported on this conversation"
msgstr "æèèçäéäèææ"
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:770
msgid "You are not allowed to change the topic"
msgstr "ääèåèææéåäé"
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:971
#, c-format
msgid "â%sâ is not a valid contact ID"
msgstr "ã%sãäæææçèçä ID"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
msgid "/clear: clear all messages from the current conversation"
msgstr "/clearïæéçåèèçææèæ"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <äé>ïèççåèèçäé"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1072
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <èåå ID>ïååæçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1075
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <èåå ID>ïååæçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1079
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1089
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <çå>ïææåçåäæåäçäççå"
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1092
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1095
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr "/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèääèïã/say /join æçäååæçèååã"
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1100
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <èçä ID>ïéçèçäççéèè"
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1103
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåççæã"
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1122
#, c-format
msgid "Usage: %s"
msgstr "çæï%s"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1167
msgid "Unknown command"
msgstr "æççåä"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1293
msgid "Unknown command; see /help for the available commands"
msgstr "æççæäïèåè /help äåååççæä"
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1457
msgid "insufficient balance to send message"
msgstr "ééäèäåéèæ"
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1538
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "åéèæã%sãæççéèï%s"
+
+#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1542
+#, c-format
+msgid "Error sending message: %s"
+msgstr "åéèææççéèï%s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1469
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
+
+#: ../libempathy-gtk/empathy-chat.c:1509
msgid "not capable"
msgstr "çæ"
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1516
msgid "offline"
msgstr "éç"
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1519
msgid "invalid contact"
msgstr "çæçèçä"
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "permission denied"
msgstr "æéèæç"
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1525
msgid "too long message"
msgstr "åéçèæ"
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1528
msgid "not implemented"
msgstr "æåä"
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1532
msgid "unknown"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "åéèæã%sãæççéèï%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "åéèææççéèï%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
msgid "Topic:"
msgstr "äéï"
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1611
#, c-format
msgid "Topic set to: %s"
msgstr "äéèåç: %s"
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1613
msgid "No topic defined"
msgstr "åæåçäé"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2126
msgid "(No Suggestions)"
msgstr "(ææåè)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2194
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "ååã%sãèåå"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2231
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "ååã%sãè %s åå"
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2301
msgid "Insert Smiley"
msgstr "æåèæçè"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
msgid "_Send"
msgstr "åé(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2376
msgid "_Spelling Suggestions"
msgstr "æååè(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2465
msgid "Failed to retrieve recent logs"
msgstr "çæååæèçæè"
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2602
#, c-format
msgid "%s has disconnected"
msgstr "%s åæç"
@@ -1484,12 +1499,12 @@ msgstr "%s åæç"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2609
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s è %2$s èåå"
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2612
#, c-format
msgid "%s was kicked"
msgstr "%s èèå"
@@ -1497,17 +1512,17 @@ msgstr "%s èèå"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2620
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s è %2$s èçéåå"
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2623
#, c-format
msgid "%s was banned"
msgstr "%s èèçéåå"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2627
#, c-format
msgid "%s has left the room"
msgstr "%s åçééæèåå"
@@ -1517,17 +1532,17 @@ msgstr "%s åçééæèåå"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2636
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2661
#, c-format
msgid "%s has joined the room"
msgstr "%s åçååæèåå"
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2686
#, c-format
msgid "%s is now known as %s"
msgstr "%s çåèçç %s"
@@ -1535,88 +1550,87 @@ msgstr "%s çåèçç %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2839
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
+#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
msgid "Disconnected"
msgstr "åæç"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3485
msgid "Would you like to store this password?"
msgstr "äæèååæåçï"
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3491
msgid "Remember"
msgstr "èä"
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3501
msgid "Not now"
msgstr "çåäè"
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3545
msgid "Retry"
msgstr "éè"
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3549
msgid "Wrong password; please try again:"
msgstr "åçéèïèåèäæï"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3679
msgid "This room is protected by a password:"
msgstr "æèåååèåçäèï"
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3706
msgid "Join"
msgstr "åå"
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
msgid "Connected"
msgstr "æåéç"
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:3949
msgid "Conversation"
msgstr "èè"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:3954
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
msgid "Unknown or invalid identifier"
msgstr "æçæçæçèåèå"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
msgid "Contact blocking temporarily unavailable"
msgstr "èçäåéææçæäç"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
msgid "Contact blocking unavailable"
msgstr "èçäåéçæäç"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
msgid "Permission Denied"
msgstr "åæçææ"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
msgid "Could not block contact"
msgstr "çæåéèçä"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
msgid "Edit Blocked Contacts"
msgstr "çèåéçèçä"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1441
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
@@ -1634,56 +1648,56 @@ msgid "Remove"
msgstr "çé"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
#: ../libempathy-gtk/empathy-webkit-utils.c:277
msgid "_Copy Link Address"
msgstr "èèéçäå(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Open Link"
msgstr "éåéç(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "çèèçäèè"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
+#: ../libempathy-gtk/empathy-contact-dialogs.c:338
msgid "Personal Information"
msgstr "åäèæ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-contact-dialogs.c:439
#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "æåèçä"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:508
+#: ../libempathy-gtk/empathy-individual-dialogs.c:198
#, c-format
msgid "Block %s?"
msgstr "åé %sï"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:513
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "äçåæèåéã%sãèäçæåèäèçåï"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:518
+#: ../libempathy-gtk/empathy-individual-dialogs.c:275
msgid "_Block"
msgstr "åé(_B)"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:536
+#: ../libempathy-gtk/empathy-individual-dialogs.c:284
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "ååéäèçäæçåè(_R)"
@@ -1700,349 +1714,359 @@ msgstr "èéèæ"
msgid "_Block User"
msgstr "åéäçè(_B)"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "æçç"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ååçä"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-contact-list-view.c:1935
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "æåæèçéççã%sãï"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
+#: ../libempathy-gtk/empathy-contact-list-view.c:1937
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "æåçéçç"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-contact-list-view.c:2059
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "çé(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2015
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "æåæèçéèçäã%sãï"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
+#: ../libempathy-gtk/empathy-contact-list-view.c:2017
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "æåçéèçä"
-#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../libempathy-gtk/empathy-contact-menu.c:212
#: ../src/empathy-main-window-menubar.ui.h:14
msgid "_Add Contactâ"
msgstr "ååèçä(_A)â"
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:287
msgid "_Block Contact"
msgstr "åéèçä(_B)"
-#: ../libempathy-gtk/empathy-contact-menu.c:329
+#. add chat button
+#: ../libempathy-gtk/empathy-contact-menu.c:316
#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../libempathy-gtk/empathy-new-message-dialog.c:320
#: ../src/empathy-main-window-menubar.ui.h:16
msgid "_Chat"
msgstr "èå(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
+#: ../libempathy-gtk/empathy-contact-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:850
msgctxt "menu item"
msgid "_Audio Call"
msgstr "èééè(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
+#: ../libempathy-gtk/empathy-contact-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:895
msgctxt "menu item"
msgid "_Video Call"
msgstr "èåéè(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../libempathy-gtk/empathy-contact-menu.c:427
+#: ../libempathy-gtk/empathy-individual-menu.c:948
#: ../src/empathy-main-window-menubar.ui.h:27
msgid "_Previous Conversations"
msgstr "éåèè(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
+#: ../libempathy-gtk/empathy-contact-menu.c:449
+#: ../libempathy-gtk/empathy-individual-menu.c:989
msgid "Send File"
msgstr "åéææ"
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
+#: ../libempathy-gtk/empathy-contact-menu.c:472
+#: ../libempathy-gtk/empathy-individual-menu.c:1031
msgid "Share My Desktop"
msgstr "åäæçæé"
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+#: ../libempathy-gtk/empathy-individual-menu.c:1094
msgid "Infor_mation"
msgstr "èè(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:600
+#: ../libempathy-gtk/empathy-contact-menu.c:547
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "çè(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../libempathy-gtk/empathy-contact-menu.c:601
+#: ../libempathy-gtk/empathy-individual-menu.c:1285
#: ../src/empathy-chat-window.c:1011
msgid "Inviting you to this room"
msgstr "éèäåéåèåå"
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
+#: ../libempathy-gtk/empathy-contact-menu.c:632
+#: ../libempathy-gtk/empathy-individual-menu.c:1331
msgid "_Invite to Chat Room"
msgstr "éèåèåå(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
msgid "Search contacts"
msgstr "æåèçä"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
msgid "Search: "
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
msgid "_Add Contact"
msgstr "ååèçä(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
msgid "No contacts found"
msgstr "æäåèçä"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
msgid "Your message introducing yourself:"
msgstr "äçèæ"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
msgid "Please let me see when you're online. Thanks!"
msgstr "çääçæèèæçéãæèï"
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "éæèçä"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ååï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "éèèçï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "éåäçäåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "çæï"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "äæçèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "åéæåï"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "ééèæï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Channels:"
msgstr "ééï"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:799
+#: ../libempathy-gtk/empathy-individual-widget.c:421
msgid "Country ISO Code:"
msgstr "åå ISO çï"
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:801
+#: ../libempathy-gtk/empathy-individual-widget.c:423
msgid "Country:"
msgstr "ååï"
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:803
+#: ../libempathy-gtk/empathy-individual-widget.c:425
msgid "State:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:805
+#: ../libempathy-gtk/empathy-individual-widget.c:427
msgid "City:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:807
+#: ../libempathy-gtk/empathy-individual-widget.c:429
msgid "Area:"
msgstr "ååï"
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:809
+#: ../libempathy-gtk/empathy-individual-widget.c:431
msgid "Postal Code:"
msgstr "ééåèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:811
+#: ../libempathy-gtk/empathy-individual-widget.c:433
msgid "Street:"
msgstr "èï"
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:813
+#: ../libempathy-gtk/empathy-individual-widget.c:435
msgid "Building:"
msgstr "åçï"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:815
+#: ../libempathy-gtk/empathy-individual-widget.c:437
msgid "Floor:"
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:817
+#: ../libempathy-gtk/empathy-individual-widget.c:439
msgid "Room:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:819
+#: ../libempathy-gtk/empathy-individual-widget.c:441
msgid "Text:"
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:821
+#: ../libempathy-gtk/empathy-individual-widget.c:443
msgid "Description:"
msgstr "æèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:823
+#: ../libempathy-gtk/empathy-individual-widget.c:445
msgid "URI:"
msgstr "URIï"
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:825
+#: ../libempathy-gtk/empathy-individual-widget.c:447
msgid "Accuracy Level:"
msgstr "æçåççï"
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:827
+#: ../libempathy-gtk/empathy-individual-widget.c:449
msgid "Error:"
msgstr "éèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:829
+#: ../libempathy-gtk/empathy-individual-widget.c:451
msgid "Vertical Error (meters):"
msgstr "åçèå (ç)ï"
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:831
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Horizontal Error (meters):"
msgstr "æåèå (ç)ï"
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:833
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Speed:"
msgstr "éåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:835
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Bearing:"
msgstr "æäï"
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:837
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "Climb Speed:"
msgstr "çåéåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:839
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Last Updated on:"
msgstr "äææææï"
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Longitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Latitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Altitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:574
#: ../src/empathy-preferences.ui.h:17
msgid "Location"
msgstr "äç"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:576
#, c-format
msgid "%s, %s"
msgstr "%sï%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:967
+#: ../libempathy-gtk/empathy-individual-widget.c:625
msgid "%B %e, %Y at %R UTC"
msgstr "%Y %B %e æ %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:1049
+#: ../libempathy-gtk/empathy-individual-widget.c:867
msgid "Save Avatar"
msgstr "åååéè"
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1105
+#: ../libempathy-gtk/empathy-individual-widget.c:925
msgid "Unable to save avatar"
msgstr "çæåååéè"
+#: ../libempathy-gtk/empathy-contact-widget.c:1793
+#: ../libempathy-gtk/empathy-individual-menu.c:1066
+#: ../libempathy-gtk/empathy-individual-widget.c:1324
+msgid "Favorite"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "éèèç"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "éåäçäå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "çç"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "çæ"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+msgid "Last seen:"
+msgstr "äæçèï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "åéæåï"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "ééèæï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "åä"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "äå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "èé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "åè"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>äç</b> æ (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1260
msgid "Alias:"
msgstr "ååï"
@@ -2062,7 +2086,7 @@ msgstr "èçäèçèæ"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1469
msgid "Identifier:"
msgstr "èåèåï"
@@ -2099,16 +2123,16 @@ msgid "Select"
msgstr "éå"
#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1953
msgid "Group"
msgstr "çç"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:258
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "äåèåèååèåéï"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:265
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "äåèåèåçæèåéï"
@@ -2146,7 +2170,7 @@ msgstr "éåèçäæçéèçåè"
#. * title
#: ../libempathy-gtk/empathy-individual-menu.c:313
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1285
#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "éè"
@@ -2163,36 +2187,36 @@ msgstr "åä"
msgid "HOME"
msgstr "äå"
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:805
+#: ../libempathy-gtk/empathy-new-message-dialog.c:314
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1143
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "çè(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
+#: ../libempathy-gtk/empathy-individual-menu.c:1169
msgctxt "Link individual (contextual menu)"
msgid "_Link Contactsâ"
msgstr "éçèçä(_L)â"
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "åéäåé(_B)"
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
msgstr "äççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèçäã"
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-widget.c:1608
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2272,133 +2296,133 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "åæéç(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
msgid "History"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
msgid "Show"
msgstr "éç"
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
msgid "Search"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1145
#, c-format
msgid "Chat in %s"
msgstr "æ %s åèå"
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1147
#, c-format
msgid "Chat with %s"
msgstr "è %s èåä"
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1344
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%Y %B %d %A"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1286
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%sï</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1368
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s ç"
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s åé"
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1383
#, c-format
msgid "Call took %s, ended at %s"
msgstr "éèæé %sïçææ %s"
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1715
msgid "Today"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1719
msgid "Yesterday"
msgstr "ææ"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1734
msgid "%e %B %Y"
msgstr "%Yå%B%eæ"
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1815
+#: ../libempathy-gtk/empathy-log-window.c:3430
msgid "Anytime"
msgstr "ääæé"
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1902
+#: ../libempathy-gtk/empathy-log-window.c:2358
msgid "Anyone"
msgstr "ääå"
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2671
msgid "Who"
msgstr "è"
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2875
msgid "When"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:2991
msgid "Anything"
msgstr "äää"
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:2993
msgid "Text chats"
msgstr "æåèå"
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:2995
#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "éè"
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3000
msgid "Incoming calls"
msgstr "äé"
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3001
msgid "Outgoing calls"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3002
msgid "Missed calls"
msgstr "ææäé"
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3024
msgid "What"
msgstr "äé"
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3719
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "äçåèåééåèèçææçéåï"
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3723
msgid "Clear All"
msgstr "æéåé"
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3730
msgid "Delete from:"
msgstr "åéåï"
@@ -2439,32 +2463,72 @@ msgstr "ææ(_F)"
msgid "page 2"
msgstr "éé 2"
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "èçä IDï"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+msgid "The contact is offline"
+msgstr "èçäåçéç"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "èå(_C)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+msgid "The specified contact is either invalid or unknown"
+msgstr "æåçèçäçæææç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+msgid "The contact does not support this kind of conversation"
+msgstr "èèçääææééèè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "èæçåèåæåæååäåä"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+msgid "Could not start a conversation with the given contact"
+msgstr "çæååèçåèçäçèè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+msgid "You are banned from this channel"
+msgstr "äèæééçå"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+msgid "This channel is full"
+msgstr "æééåæ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+msgid "You must be invited to join this channel"
+msgstr "äåéèéèæèååæéé"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+msgid "Can't proceed while disconnected"
+msgstr "æçæçæèç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+msgid "Permission denied"
+msgstr "èåèæç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+msgid "There was an error starting the conversation"
+msgstr "ååèèæççéè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:291
+#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+msgid "Enter a contact identifier or phone number:"
+msgstr "èèåèçäèèèäæéèèçï"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:334
msgid "New Conversation"
msgstr "æåèè"
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "åéèå(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+msgid "_Video Call"
+msgstr "èåéè(_V)"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "éè(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+msgid "_Audio Call"
+msgstr "èééè(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:246
msgid "New Call"
msgstr "æåéè"
@@ -2505,12 +2569,8 @@ msgstr "æéèåéåçæèçåå"
msgid "Set status"
msgstr "èåçæ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "èåäçäçèçåççæ"
-
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
msgid "Custom messagesâ"
msgstr "èéèæâ"
@@ -2587,12 +2647,12 @@ msgstr "èééèçæ"
msgid "Edit Custom Messages"
msgstr "çèèéèæ"
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1047
#, c-format
msgid "Message edited at %s"
msgstr "èæçèæ %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1752
msgid "Normal"
msgstr "äè"
@@ -2683,26 +2743,26 @@ msgstr "èèäæéæääæäéçäç"
msgid "Certificate Details"
msgstr "èæèçèæ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
msgid "Unable to open URI"
msgstr "çæéå URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
msgid "Select a file"
msgstr "éæäåææ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
msgid "Insufficient free space to save file"
msgstr "çéäèäååææ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
#, c-format
msgid "Incoming file from %s"
msgstr "æåäè %s çææ"
@@ -2874,39 +2934,31 @@ msgstr "èæèç"
msgid "Vietnamese"
msgstr "èåæ"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "æéçèçäçæææææã"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "æéçèçäåçéçã"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
msgid "No error message"
msgstr "ææéèèæ"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
msgid "Instant Message (Empathy)"
msgstr "åæéè (Empathy)"
-#: ../src/empathy.c:431
+#: ../src/empathy.c:433
msgid "Don't connect on startup"
msgstr "ååæäèèåéç"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:437
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "ååæäéçèçäæåæääåäåèç"
-#: ../src/empathy.c:450
+#: ../src/empathy.c:452
msgid "- Empathy IM Client"
msgstr "- Empathy åæéçæç"
-#: ../src/empathy.c:637
+#: ../src/empathy.c:639
msgid "Error contacting the Account Manager"
msgstr "èçåèçççåæççéè"
-#: ../src/empathy.c:639
+#: ../src/empathy.c:641
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3046,8 +3098,8 @@ msgid "Select the accounts you want to import:"
msgstr "éæèååçåèï"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "Yes"
msgstr "æ"
@@ -3114,8 +3166,8 @@ msgid "Your new account has not been saved yet."
msgstr "åæååäçæåèã"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-streamed-media-window.c:755
+#: ../src/empathy-call-window.c:1326
msgid "Connectingâ"
msgstr "éçäâ"
@@ -3209,11 +3261,11 @@ msgstr "èååæçåèïäåéååèæåæçåçéèåå
msgid "_Importâ"
msgstr "åå(_I)â"
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:251
msgid " - Empathy authentication client"
msgstr "- Empathy èèçæç"
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:267
msgid "Empathy authentication client"
msgstr "Empathy èèçæç"
@@ -3221,157 +3273,145 @@ msgstr "Empathy èèçæç"
msgid "People nearby"
msgstr "éèçä"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy éèèåçæç"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
msgid "Empathy Audio/Video Client"
msgstr "Empathy éèèåçæç"
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:432
msgid "Contrast"
msgstr "åæ"
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:435
msgid "Brightness"
msgstr "äå"
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:438
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:543
msgid "Volume"
msgstr "éé"
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1094
msgid "_Sidebar"
msgstr "åéæ(_S)"
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1114
msgid "Audio input"
msgstr "éæèå"
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1118
msgid "Video input"
msgstr "èåèå"
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1126
msgid "Dialpad"
msgstr "æèç"
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1137
msgid "Details"
msgstr "èçèæ"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1206
+#: ../src/empathy-call-window.c:1932
#, c-format
msgid "Call with %s"
msgstr "è %s éèä"
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1439
+#: ../src/empathy-call-window.c:2176
msgid "The IP address as seen by the machine"
msgstr "æåçèç IP äå"
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1441
+#: ../src/empathy-call-window.c:2178
msgid "The IP address as seen by a server on the Internet"
msgstr "äèçäçäæåçèç IP äå"
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1443
+#: ../src/empathy-call-window.c:2180
msgid "The IP address of the peer as seen by the other side"
msgstr "åäççèçéç IP äå"
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1445
+#: ../src/empathy-call-window.c:2182
msgid "The IP address of a relay server"
msgstr "äçäæåç IP äå"
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1447
+#: ../src/empathy-call-window.c:2184
msgid "The IP address of the multicast group"
msgstr "åéåæççç IP äå"
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+msgctxt "codec"
msgid "Unknown"
msgstr "æç"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
#, c-format
msgid "Connected â %d:%02dm"
msgstr "åéç â %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:3045
msgid "Technical Details"
msgstr "æèçç"
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3084
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s çèääçèäääéèäæææçéèæå"
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3089
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s çèääçèäääéèäæææçèåæå"
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3095
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "çæå %s åçéçãäååäääåèåäåäåèçæéççççääã"
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3101
msgid "There was a failure on the network"
msgstr "éåççäæéèçç"
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3105
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "æéèæåèçéèæååæåäçéèäåè"
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3108
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "æéèæåèçèåæååæåäçéèäåè"
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3120
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3379,23 +3419,23 @@ msgid ""
"the Help menu."
msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3129
msgid "There was a failure in the call engine"
msgstr "éèåæåæéèçç"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3132
msgid "The end of the stream was reached"
msgstr "åéäææç"
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3172
msgid "Can't establish audio stream"
msgstr "çæåçéèäæ"
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3182
msgid "Can't establish video stream"
msgstr "çæåçèåäæ"
@@ -3486,8 +3526,8 @@ msgstr "åæèååæ"
#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
+#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
msgid "Unknown"
msgstr "äæ"
@@ -3651,7 +3691,7 @@ msgstr "ççååçèåå"
msgid "Incoming video call"
msgstr "ååçèåéè"
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
msgid "Incoming call"
msgstr "äé"
@@ -3666,7 +3706,7 @@ msgid "%s is calling you. Do you want to answer?"
msgstr "%s èèäéèéèãäæåèæèï"
#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
#, c-format
msgid "Incoming call from %s"
msgstr "%s çäé"
@@ -3684,7 +3724,7 @@ msgid "_Answer with video"
msgstr "äèåæè(_A)"
#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-call-window.c:1562
#, c-format
msgid "Incoming video call from %s"
msgstr "äè %s çèåéè"
@@ -3727,16 +3767,16 @@ msgstr "äèéèåå %s"
msgid "Incoming file transfer from %s"
msgstr "æåäè %s çææåè"
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
msgid "Password required"
msgstr "éèåç"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s æèååæçäæåäççèå"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
#, c-format
msgid ""
"\n"
@@ -3879,51 +3919,60 @@ msgstr "éèåå"
msgid "Source"
msgstr "äæ"
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
msgid "Provide Password"
msgstr "æäåç"
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
msgid "Disconnect"
msgstr "æç"
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:638
msgid "No match found"
msgstr "æäåçåéç"
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:746
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "åææï%s åèçæäçïééäç %s èäåææã"
+
+#: ../src/empathy-main-window.c:814
+msgid "Update software..."
+msgstr "ææèä..."
+
+#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+msgid "Close"
+msgstr "éé"
+
+#: ../src/empathy-main-window.c:929
msgid "Reconnect"
msgstr "éæéæ"
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:935
msgid "Edit Account"
msgstr "çèåè"
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "éé"
-
#. Translators: this string will be something like:
#. * Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:1074
#, c-format
msgid "Top up %s (%s)..."
msgstr "åå %s (%s)..."
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1121
msgid "Top up account credit"
-msgstr "åååèéå"
+msgstr "åååèåé"
#. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1192
msgid "Top Up..."
msgstr "åå..."
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1935
msgid "Contact"
msgstr "èçä"
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-main-window.c:2310
msgid "Contact List"
msgstr "èçäæå"
@@ -4016,17 +4065,17 @@ msgstr "èåå(_R)"
msgid "_Search for Contactsâ"
msgstr "æåèçä(_S)â"
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
msgid "Chat Room"
msgstr "èåå"
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
msgid "Members"
msgstr "æå"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
#, c-format
msgid ""
"%s\n"
@@ -4039,16 +4088,16 @@ msgstr ""
"éèåçï%s\n"
"æåï%s"
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "No"
msgstr "å"
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
msgid "Could not start room listing"
msgstr "çæéåååèååæå"
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
msgid "Could not stop room listing"
msgstr "çæåæååèååæå"
@@ -4151,7 +4200,7 @@ msgstr "åäæåççèïçåäçäçéã"
msgid "Juliet has disconnected"
msgstr "çèååæç"
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1175
msgid "Preferences"
msgstr "ååèå"
@@ -4269,43 +4318,47 @@ msgid "Themes"
msgstr "äæäé"
#: ../src/empathy-preferences.ui.h:30
+msgid "Use _echo cancellation to improve call quality"
+msgstr "äçåéæéäæåéèåè(_E)"
+
+#: ../src/empathy-preferences.ui.h:31
msgid "Variant:"
msgstr "æåï"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Automatically connect on startup"
msgstr "ååæèåéç(_A)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Cellphone"
msgstr "ææ(_C)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
msgid "_Enable bubble notifications"
msgstr "åçææåéç(_E)"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Enable sound notifications"
msgstr "åçéæéç(_E)"
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
msgid "_Network (IP, Wi-Fi)"
msgstr "çç (IP, Wi-Fi)(_N)"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
msgid "_Open new chats in separate windows"
msgstr "åååèçéåæçèå(_O)"
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:39
msgid "_Publish location to my contacts"
msgstr "åæçèçäåéäç(_P)"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:41
msgid "_Reduce location accuracy"
msgstr "éääçæçå(_R)"
@@ -4431,16 +4484,16 @@ msgid ""
"extension."
msgstr "éåçéççççåäææéçåéæååèã"
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:197
+#: ../src/empathy-invite-participant-dialog.c:225
msgid "Invite Participant"
msgstr "éèåè"
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:198
msgid "Choose a contact to invite into the conversation:"
msgstr "éææèéèéåèèçèçäï"
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:221
msgid "Invite"
msgstr "éè"
@@ -4461,23 +4514,27 @@ msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "éçåèåç"
+
+#: ../src/empathy-accounts.c:202
msgid "- Empathy Accounts"
msgstr "- Empathy åè"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
msgid "Empathy Accounts"
msgstr "Empathy åè"
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
msgstr "éççåæå"
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
msgid "- Empathy Debugger"
msgstr "- Empathy ééå"
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
msgid "Empathy Debugger"
msgstr "Empathy ééçå"
@@ -4485,39 +4542,39 @@ msgstr "Empathy ééçå"
msgid "- Empathy Chat Client"
msgstr "- Empathy èåçæç"
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
msgid "Respond"
msgstr "åæ"
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1566
msgid "Reject"
msgstr "æç"
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1567
msgid "Answer"
msgstr "æè"
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
msgid "Answer with video"
msgstr "äèåæè"
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
msgid "Decline"
msgstr "æç"
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
msgid "Accept"
msgstr "æå"
#. translators: the 'Provide' button is displayed in a notification
#. * bubble when Empathy is asking for an account password; clicking on it
#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
msgid "Provide"
msgstr "æä"
@@ -4528,32 +4585,97 @@ msgstr "%s ååææçäïääæèääéèã"
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
msgid "i"
msgstr "è"
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2941
msgid "On hold"
msgstr "äç"
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2944
msgid "Mute"
msgstr "éé"
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2946
msgid "Duration"
msgstr "æé"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2949
#, c-format
msgid "%s â %d:%02dm"
msgstr "%s â %d:%02dm"
+#: ../src/empathy-call-window.c:3219
+#, c-format
+msgid "Your current balance is %s."
+msgstr "äçåçééç %sã"
+
+#: ../src/empathy-call-window.c:3223
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "åææïäçåéäèäéèèéèã"
+
+#: ../src/empathy-call-window.c:3225
+msgid "Top Up"
+msgstr "åå"
+
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "æåååå(_M)"
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy åèç butterfly æè"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy æåæèç butterfly æèã"
+
+#~ msgid "Ungrouped"
+#~ msgstr "æçç"
+
+#~ msgid "Favorite People"
+#~ msgstr "ååçä"
+
+#~ msgid "Select a contact"
+#~ msgstr "éæéçä"
+
+#~ msgid "Contact ID:"
+#~ msgstr "éçä IDï"
+
+#~ msgid "C_hat"
+#~ msgstr "èå(_C)"
+
+#~ msgid "Send _Video"
+#~ msgstr "åéèè(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "éè(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "èåæçäçèçåççæ"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "æéçèçäçæææææã"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "æéçèçäåçéçã"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
#~ msgid "Find Next"
#~ msgstr "åæääå"
@@ -4715,9 +4837,6 @@ msgstr "æåååå(_M)"
#~ "fails"
#~ msgstr "åèååääèèçåèïèåææåéçåå"
-#~ msgid "Show the accounts dialog"
-#~ msgstr "éçåèåèç"
-
#~ msgid "The error message was: <span style=\"italic\">%s</span>"
#~ msgstr "éèèæçï <span style=\"italic\">%s</span>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fad653e..26d7e05 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 3.1.92\n"
+"Project-Id-Version: empathy 3.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 14:31+0800\n"
-"PO-Revision-Date: 2011-09-23 19:23+0800\n"
+"POT-Creation-Date: 2011-11-12 19:09+0800\n"
+"PO-Revision-Date: 2011-11-12 13:49+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
"Language: zh_TW\n"
@@ -87,59 +87,59 @@ msgid "Contact list sort criterion"
msgstr "éçäæåæåæå"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr "èçæèèéèçéèæåæèçïäï/dev/video0ã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Default directory to select an avatar image from"
msgstr "çäéæåéèåççéèçé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Disable popup notifications when away"
msgstr "ççæçééæåçåååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Disable sounds when away"
msgstr "ççæçééæåçéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Display incoming events in the status area"
msgstr "åçæååéçæåää"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Echo cancellation support"
msgstr "åéæéææ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can publish the user's location"
msgstr "Empathy åäçåäçèçäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy åäåç GPS äææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy åäåçèåéèçèååèäææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy can use the network to guess the location"
msgstr "Empathy åäåççèäææäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy default download folder"
msgstr "Empathy éèäèèæå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy åèç butterfly æè"
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-away when idle"
msgstr "Empathy çéçææèèåèçéé"
@@ -177,150 +177,150 @@ msgid "Hide the main window."
msgstr "éèäèçã"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "äæåãååèååãåèçéåçåè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Nick completed character"
msgstr "æçèéåå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Open new chats in separate windows"
msgstr "åååèçéåæçèå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Path of the Adium theme to use"
msgstr "èäçç Adium äæäéèå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "åæèååäççäéæ Adium æèäçç Adium äæäéèåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for incoming messages"
msgstr "æåèææææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound for new conversations"
msgstr "çéåæçèèæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound for outgoing messages"
msgstr "éåèææææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when a contact logs in"
msgstr "çéçäçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when a contact logs out"
msgstr "çæéçäçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Play a sound when we log in"
msgstr "çæåçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Play a sound when we log out"
msgstr "çæåçåæææéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications if the chat isn't focused"
msgstr "åæèåèçååçéåååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Pop up notifications when a contact logs in"
msgstr "çéçäçåæååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Pop up notifications when a contact logs out"
msgstr "çéçäçåæååéç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Position the camera preview should be during a call."
msgstr "éèææåæéèæèææçäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show Balance in contact list"
msgstr "æèçäæååéçéé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show avatars"
msgstr "éçåéè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show contact list in rooms"
msgstr "åèååéçéçäæå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Show hint about closing the main window"
msgstr "ééäèçæéçæç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Show offline contacts"
msgstr "éçéçéçä"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Show protocols"
msgstr "éçåå"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Spell checking languages"
msgstr "æåææçèè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The default folder to save file transfers in."
msgstr "çäååææåèææææçéèèæåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The last directory that an avatar image was chosen from."
msgstr "äæéæåéèåçççéã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "The position for the chat window side pane"
msgstr "èåèçåçæçäç"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "èåèçåçæçååäç (åäçåç)ã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "The theme that is used to display the conversation in chat windows."
msgstr "çäéçåèåèçäèèçäæäéã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "çäåèåèçéçèèçäæäéæåã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Use graphical smileys"
msgstr "äçåçåèæçè"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Use notification sounds"
msgstr "äçéçéæ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Use theme for chat rooms"
msgstr "åèååäçäæäé"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy æåèåäçèçäççåçäçéçäã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy æåäç GPS äææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy æåäçèåéèçèäææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy æåäççèäææäçã"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy æåæèç butterfly æèã"
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy æåæåååæèåçåæçåèã"
@@ -473,23 +473,23 @@ msgstr "ççèæè VoIP åè"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
+#: ../src/empathy-accounts-dialog.c:2312
msgid "Messaging and VoIP Accounts"
msgstr "èæè VoIP åè"
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
msgid "File transfer completed, but the file was corrupted"
msgstr "ææåèåçïäæææåææ"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
msgid "File transfer not supported by remote contact"
msgstr "éçéçääææææåè"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
msgid "The selected file is not a regular file"
msgstr "éåçææäææèçææ"
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
msgid "The selected file is empty"
msgstr "éåçæææççç"
@@ -509,35 +509,35 @@ msgstr "åææ %s"
msgid "Call from %s"
msgstr "%s çäé"
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
msgid "Socket type not supported"
msgstr "Socket éåäææ"
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
msgid "No reason was specified"
msgstr "æææååå"
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
msgid "The change in state was requested"
msgstr "åèæèæçæ"
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
msgid "You canceled the file transfer"
msgstr "æååæææåè"
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
msgid "The other participant canceled the file transfer"
msgstr "åäçåèèåæäææåè"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
msgid "Error while trying to transfer the file"
msgstr "åèåèæææççéè"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
msgid "The other participant is unable to transfer the file"
msgstr "åäçåèèçæåèèææ"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
msgid "Unknown reason"
msgstr "äæåå"
@@ -577,6 +577,7 @@ msgstr "çæèçéç"
#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
msgid "Network error"
msgstr "çèéè"
@@ -676,20 +677,23 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "äæåæèçéåïææäæåæèéçæåèéåçåååæèèçççå"
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:372
+msgid "Your software is too old"
+msgstr "æçèééè"
+
+#: ../libempathy/empathy-utils.c:531
msgid "People Nearby"
msgstr "éèçä"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:536
msgid "Yahoo! Japan"
msgstr "Yahoo! ææ"
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:565
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:566
msgid "Facebook Chat"
msgstr "Facebook èå"
@@ -733,7 +737,7 @@ msgstr[0] "%d åæäå"
msgid "in the future"
msgstr "æä"
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:688
msgid "All accounts"
msgstr "ææåè"
@@ -756,58 +760,58 @@ msgstr "äæå"
msgid "Port"
msgstr "éæå"
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:776
+#: ../libempathy-gtk/empathy-account-widget.c:828
#, c-format
msgid "%s:"
msgstr "%sï"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1182
msgid "My Web Accounts"
msgstr "æççèåè"
-#: ../libempathy-gtk/empathy-account-widget.c:1208
+#: ../libempathy-gtk/empathy-account-widget.c:1199
#, c-format
msgid "The account %s is edited via %s."
msgstr "%s åèåéé %s äæã"
-#: ../libempathy-gtk/empathy-account-widget.c:1214
+#: ../libempathy-gtk/empathy-account-widget.c:1205
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s åèçææ Empathy åäæã"
-#: ../libempathy-gtk/empathy-account-widget.c:1233
+#: ../libempathy-gtk/empathy-account-widget.c:1224
msgid "Launch My Web Accounts"
msgstr "ååæççèåè"
#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
+#: ../libempathy-gtk/empathy-account-widget.c:1232
#, c-format
msgid "Edit %s"
msgstr "çè %s"
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1582
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "äçèåçï"
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1900
msgid "A_pply"
msgstr "åç(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1930
msgid "L_og in"
msgstr "çå(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "This account already exists on the server"
msgstr "æåèåçååéåäæåä"
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:2007
msgid "Create a new account on the server"
msgstr "åéåäæåäåçæçåè"
-#: ../libempathy-gtk/empathy-account-widget.c:2208
+#: ../libempathy-gtk/empathy-account-widget.c:2199
msgid "Ca_ncel"
msgstr "åæ(_N)"
@@ -816,19 +820,19 @@ msgstr "åæ(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2477
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s äç %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2503
#, c-format
msgid "%s Account"
msgstr "%s åè"
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2507
msgid "New account"
msgstr "æååè"
@@ -1199,7 +1203,7 @@ msgid "STUN Server:"
msgstr "STUN äæåï"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
msgid "Server:"
msgstr "äæåï"
@@ -1281,7 +1285,7 @@ msgid "Click to enlarge"
msgstr "èæéèæå"
#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
msgid "There was an error starting the call"
msgstr "ååéèæççéè"
@@ -1301,62 +1305,66 @@ msgstr "æåçèçäçæ"
msgid "Emergency calls are not supported on this protocol"
msgstr "æååäææçæéèåè"
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "æçåéäèäèäèéèã"
+
+#: ../libempathy-gtk/empathy-chat.c:706
msgid "Failed to open private chat"
msgstr "éåçäèååæ"
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "Topic not supported on this conversation"
msgstr "æèèçäéäèææ"
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:770
msgid "You are not allowed to change the topic"
msgstr "æäèåèèæéåäé"
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:971
#, c-format
msgid "â%sâ is not a valid contact ID"
msgstr "ã%sãäæææçéçä ID"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
msgid "/clear: clear all messages from the current conversation"
msgstr "/clearïæéçåèèçææèæ"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <äé>ïèççåèèçäé"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1072
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <èåå ID>ïååæçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1075
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <èåå ID>ïååæçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1079
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1089
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <æç>ïèæåçåäæåäçæçæç"
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1092
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1095
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1365,11 +1373,11 @@ msgstr ""
"/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèää"
"èïã/say /join æçäååæçèååã"
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1100
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <èçä ID>ïéçèçäççéèè"
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1103
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1377,113 +1385,120 @@ msgstr ""
"/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåçç"
"æã"
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1122
#, c-format
msgid "Usage: %s"
msgstr "çæï%s"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1167
msgid "Unknown command"
msgstr "æççåä"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1293
msgid "Unknown command; see /help for the available commands"
msgstr "æççæäïèåè /help äåååççæä"
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1457
msgid "insufficient balance to send message"
msgstr "ééäèäåéèæ"
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1538
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "åéèæã%sãæççéèï%s"
+
+#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1542
+#, c-format
+msgid "Error sending message: %s"
+msgstr "åéèææççéèï%s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1469
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
+
+#: ../libempathy-gtk/empathy-chat.c:1509
msgid "not capable"
msgstr "çæ"
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1516
msgid "offline"
msgstr "éç"
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1519
msgid "invalid contact"
msgstr "çæçéçä"
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "permission denied"
msgstr "æéèæç"
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1525
msgid "too long message"
msgstr "åéçèæ"
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1528
msgid "not implemented"
msgstr "æåä"
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1532
msgid "unknown"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "åéèæã%sãæççéèï%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "åéèææççéèï%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
msgid "Topic:"
msgstr "äéï"
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1611
#, c-format
msgid "Topic set to: %s"
msgstr "äéèåç: %s"
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1613
msgid "No topic defined"
msgstr "åæåçäé"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2126
msgid "(No Suggestions)"
msgstr "(ææåè)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2194
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "ååã%sãèåå"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2231
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "ååã%sãè %s åå"
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2301
msgid "Insert Smiley"
msgstr "æåèæçè"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
msgid "_Send"
msgstr "åé(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2376
msgid "_Spelling Suggestions"
msgstr "æååè(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2465
msgid "Failed to retrieve recent logs"
msgstr "çæååæèçæè"
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2602
#, c-format
msgid "%s has disconnected"
msgstr "%s åæç"
@@ -1491,12 +1506,12 @@ msgstr "%s åæç"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2609
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s è %2$s èåå"
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2612
#, c-format
msgid "%s was kicked"
msgstr "%s èèå"
@@ -1504,17 +1519,17 @@ msgstr "%s èèå"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2620
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s è %2$s èçéåå"
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2623
#, c-format
msgid "%s was banned"
msgstr "%s èèçéåå"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2627
#, c-format
msgid "%s has left the room"
msgstr "%s åçééæèåå"
@@ -1524,17 +1539,17 @@ msgstr "%s åçééæèåå"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2636
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2661
#, c-format
msgid "%s has joined the room"
msgstr "%s åçååæèåå"
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2686
#, c-format
msgid "%s is now known as %s"
msgstr "%s çåèçç %s"
@@ -1542,88 +1557,87 @@ msgstr "%s çåèçç %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2839
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
+#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
msgid "Disconnected"
msgstr "åæç"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3485
msgid "Would you like to store this password?"
msgstr "ææèååæåçï"
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3491
msgid "Remember"
msgstr "èä"
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3501
msgid "Not now"
msgstr "çåäè"
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3545
msgid "Retry"
msgstr "éè"
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3549
msgid "Wrong password; please try again:"
msgstr "åçéèïèåèäæï"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3679
msgid "This room is protected by a password:"
msgstr "æèåååèåçäèï"
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3706
msgid "Join"
msgstr "åå"
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
msgid "Connected"
msgstr "æåéç"
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:3949
msgid "Conversation"
msgstr "èè"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:3954
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
msgid "Unknown or invalid identifier"
msgstr "æçæçæçèåèå"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
msgid "Contact blocking temporarily unavailable"
msgstr "èçäåéææçæäç"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
msgid "Contact blocking unavailable"
msgstr "èçäåéçæäç"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
msgid "Permission Denied"
msgstr "åæçææ"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
msgid "Could not block contact"
msgstr "çæåéèçä"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
msgid "Edit Blocked Contacts"
msgstr "çèåéçèçä"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1441
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
@@ -1641,56 +1655,56 @@ msgid "Remove"
msgstr "çé"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
#: ../libempathy-gtk/empathy-webkit-utils.c:277
msgid "_Copy Link Address"
msgstr "èèéçäå(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Open Link"
msgstr "éåéç(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "çèéçäèè"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
+#: ../libempathy-gtk/empathy-contact-dialogs.c:338
msgid "Personal Information"
msgstr "åäèè"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-contact-dialogs.c:439
#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "æåéçä"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:508
+#: ../libempathy-gtk/empathy-individual-dialogs.c:198
#, c-format
msgid "Block %s?"
msgstr "åé %sï"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:513
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "æçåæèåéã%sãèäçæåèæèçåï"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:518
+#: ../libempathy-gtk/empathy-individual-dialogs.c:275
msgid "_Block"
msgstr "åé(_B)"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:536
+#: ../libempathy-gtk/empathy-individual-dialogs.c:284
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "ååéäèçäæçåè(_R)"
@@ -1707,349 +1721,359 @@ msgstr "èéèæ"
msgid "_Block User"
msgstr "åéäçè(_B)"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "æçç"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ååçä"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-contact-list-view.c:1935
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "æåæèçéççã%sãï"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
+#: ../libempathy-gtk/empathy-contact-list-view.c:1937
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "æåçéçç"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-contact-list-view.c:2059
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "çé(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2015
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "æåæèçééçäã%sãï"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
+#: ../libempathy-gtk/empathy-contact-list-view.c:2017
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "æåçééçä"
-#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../libempathy-gtk/empathy-contact-menu.c:212
#: ../src/empathy-main-window-menubar.ui.h:14
msgid "_Add Contactâ"
msgstr "ååèçä(_A)â"
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:287
msgid "_Block Contact"
msgstr "åéèçä(_B)"
-#: ../libempathy-gtk/empathy-contact-menu.c:329
+#. add chat button
+#: ../libempathy-gtk/empathy-contact-menu.c:316
#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../libempathy-gtk/empathy-new-message-dialog.c:320
#: ../src/empathy-main-window-menubar.ui.h:16
msgid "_Chat"
msgstr "èå(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
+#: ../libempathy-gtk/empathy-contact-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:850
msgctxt "menu item"
msgid "_Audio Call"
msgstr "èééè(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
+#: ../libempathy-gtk/empathy-contact-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:895
msgctxt "menu item"
msgid "_Video Call"
msgstr "èèéè(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../libempathy-gtk/empathy-contact-menu.c:427
+#: ../libempathy-gtk/empathy-individual-menu.c:948
#: ../src/empathy-main-window-menubar.ui.h:27
msgid "_Previous Conversations"
msgstr "éåèè(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
+#: ../libempathy-gtk/empathy-contact-menu.c:449
+#: ../libempathy-gtk/empathy-individual-menu.c:989
msgid "Send File"
msgstr "åéææ"
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
+#: ../libempathy-gtk/empathy-contact-menu.c:472
+#: ../libempathy-gtk/empathy-individual-menu.c:1031
msgid "Share My Desktop"
msgstr "åäæçæé"
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+#: ../libempathy-gtk/empathy-individual-menu.c:1094
msgid "Infor_mation"
msgstr "èè(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:600
+#: ../libempathy-gtk/empathy-contact-menu.c:547
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "çè(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../libempathy-gtk/empathy-contact-menu.c:601
+#: ../libempathy-gtk/empathy-individual-menu.c:1285
#: ../src/empathy-chat-window.c:1011
msgid "Inviting you to this room"
msgstr "éèæåéåèåå"
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
+#: ../libempathy-gtk/empathy-contact-menu.c:632
+#: ../libempathy-gtk/empathy-individual-menu.c:1331
msgid "_Invite to Chat Room"
msgstr "éèåèåå(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
msgid "Search contacts"
msgstr "æåéçä"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
msgid "Search: "
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
msgid "_Add Contact"
msgstr "ååèçä(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
msgid "No contacts found"
msgstr "æäåèçä"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
msgid "Your message introducing yourself:"
msgstr "æçèæ"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
msgid "Please let me see when you're online. Thanks!"
msgstr "çæäçæèèæçéãæèï"
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "éæéçä"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ååï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "éèèçï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "éåäçäåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "çæï"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "äæçèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "åéæåï"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "ééèæï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Channels:"
msgstr "ééï"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:799
+#: ../libempathy-gtk/empathy-individual-widget.c:421
msgid "Country ISO Code:"
msgstr "åå ISO çï"
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:801
+#: ../libempathy-gtk/empathy-individual-widget.c:423
msgid "Country:"
msgstr "ååï"
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:803
+#: ../libempathy-gtk/empathy-individual-widget.c:425
msgid "State:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:805
+#: ../libempathy-gtk/empathy-individual-widget.c:427
msgid "City:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:807
+#: ../libempathy-gtk/empathy-individual-widget.c:429
msgid "Area:"
msgstr "ååï"
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:809
+#: ../libempathy-gtk/empathy-individual-widget.c:431
msgid "Postal Code:"
msgstr "ééåèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:811
+#: ../libempathy-gtk/empathy-individual-widget.c:433
msgid "Street:"
msgstr "èï"
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:813
+#: ../libempathy-gtk/empathy-individual-widget.c:435
msgid "Building:"
msgstr "åçï"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:815
+#: ../libempathy-gtk/empathy-individual-widget.c:437
msgid "Floor:"
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:817
+#: ../libempathy-gtk/empathy-individual-widget.c:439
msgid "Room:"
msgstr "åï"
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:819
+#: ../libempathy-gtk/empathy-individual-widget.c:441
msgid "Text:"
msgstr "æåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:821
+#: ../libempathy-gtk/empathy-individual-widget.c:443
msgid "Description:"
msgstr "æèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:823
+#: ../libempathy-gtk/empathy-individual-widget.c:445
msgid "URI:"
msgstr "URIï"
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:825
+#: ../libempathy-gtk/empathy-individual-widget.c:447
msgid "Accuracy Level:"
msgstr "æçåççï"
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:827
+#: ../libempathy-gtk/empathy-individual-widget.c:449
msgid "Error:"
msgstr "éèï"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:829
+#: ../libempathy-gtk/empathy-individual-widget.c:451
msgid "Vertical Error (meters):"
msgstr "åçèå (åå)ï"
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:831
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Horizontal Error (meters):"
msgstr "æåèå (åå)ï"
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:833
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Speed:"
msgstr "éåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:835
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Bearing:"
msgstr "æäï"
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:837
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "Climb Speed:"
msgstr "çåéåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:839
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Last Updated on:"
msgstr "äææææï"
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Longitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Latitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Altitude:"
msgstr "çåï"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:574
#: ../src/empathy-preferences.ui.h:17
msgid "Location"
msgstr "äç"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:576
#, c-format
msgid "%s, %s"
msgstr "%sï%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:967
+#: ../libempathy-gtk/empathy-individual-widget.c:625
msgid "%B %e, %Y at %R UTC"
msgstr "%Y %B %e æ %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:1049
+#: ../libempathy-gtk/empathy-individual-widget.c:867
msgid "Save Avatar"
msgstr "åååéè"
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1105
+#: ../libempathy-gtk/empathy-individual-widget.c:925
msgid "Unable to save avatar"
msgstr "çæåååéè"
+#: ../libempathy-gtk/empathy-contact-widget.c:1793
+#: ../libempathy-gtk/empathy-individual-menu.c:1066
+#: ../libempathy-gtk/empathy-individual-widget.c:1324
+msgid "Favorite"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "éèèç"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "éåäçäå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "çç"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "çæ"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+msgid "Last seen:"
+msgstr "äæçèï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "åéæåï"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "ééèæï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "åä"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "äå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "èé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "åè"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>äç</b> æ (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1260
msgid "Alias:"
msgstr "ååï"
@@ -2069,7 +2093,7 @@ msgstr "éçäèçèæ"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1469
msgid "Identifier:"
msgstr "èåèåï"
@@ -2107,16 +2131,16 @@ msgid "Select"
msgstr "éå"
#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1953
msgid "Group"
msgstr "çç"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:258
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "äåèåèååèåéï"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:265
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "äåèåèåçæèåéï"
@@ -2154,7 +2178,7 @@ msgstr "éåèçäæçéèçåè"
#. * title
#: ../libempathy-gtk/empathy-individual-menu.c:313
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1285
#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "éè"
@@ -2171,29 +2195,29 @@ msgstr "åä"
msgid "HOME"
msgstr "äå"
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:805
+#: ../libempathy-gtk/empathy-new-message-dialog.c:314
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1143
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "çè(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
+#: ../libempathy-gtk/empathy-individual-menu.c:1169
msgctxt "Link individual (contextual menu)"
msgid "_Link Contactsâ"
msgstr "éçèçä(_L)â"
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "åéäåé(_B)"
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2202,7 +2226,7 @@ msgstr ""
"æççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèç"
"äã"
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-widget.c:1608
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2283,133 +2307,133 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "åæéç(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
msgid "History"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
msgid "Show"
msgstr "éç"
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
msgid "Search"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1145
#, c-format
msgid "Chat in %s"
msgstr "æ %s åèå"
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1147
#, c-format
msgid "Chat with %s"
msgstr "è %s èåä"
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1344
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%Y %B %d %A"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1286
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%sï</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1368
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s ç"
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s åé"
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1383
#, c-format
msgid "Call took %s, ended at %s"
msgstr "éèæé %sïçææ %s"
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1715
msgid "Today"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1719
msgid "Yesterday"
msgstr "ææ"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1734
msgid "%e %B %Y"
msgstr "%Yå%B%eæ"
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1815
+#: ../libempathy-gtk/empathy-log-window.c:3430
msgid "Anytime"
msgstr "ääæé"
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1902
+#: ../libempathy-gtk/empathy-log-window.c:2358
msgid "Anyone"
msgstr "ääå"
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2671
msgid "Who"
msgstr "è"
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2875
msgid "When"
msgstr "äæ"
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:2991
msgid "Anything"
msgstr "äää"
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:2993
msgid "Text chats"
msgstr "æåèå"
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:2995
#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "éè"
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3000
msgid "Incoming calls"
msgstr "äé"
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3001
msgid "Outgoing calls"
msgstr "æå"
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3002
msgid "Missed calls"
msgstr "ææäé"
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3024
msgid "What"
msgstr "äé"
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3719
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "æçåèåééåèèçææçéåï"
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3723
msgid "Clear All"
msgstr "æéåé"
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3730
msgid "Delete from:"
msgstr "åéåï"
@@ -2450,32 +2474,72 @@ msgstr "ææ(_F)"
msgid "page 2"
msgstr "éé 2"
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "éçä IDï"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+msgid "The contact is offline"
+msgstr "èçäåçéç"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "èå(_C)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+msgid "The specified contact is either invalid or unknown"
+msgstr "æåçèçäçæææç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+msgid "The contact does not support this kind of conversation"
+msgstr "èèçääææééèè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "èæçåèåæåæååäåä"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+msgid "Could not start a conversation with the given contact"
+msgstr "çæååèçåèçäçèè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+msgid "You are banned from this channel"
+msgstr "æèæééçå"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+msgid "This channel is full"
+msgstr "æééåæ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+msgid "You must be invited to join this channel"
+msgstr "æåéèéèæèååæéé"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+msgid "Can't proceed while disconnected"
+msgstr "æçæçæèç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+msgid "Permission denied"
+msgstr "èåèæç"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+msgid "There was an error starting the conversation"
+msgstr "ååèèæççéè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:291
+#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+msgid "Enter a contact identifier or phone number:"
+msgstr "èèåèçäèèèäæéèèçï"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:334
msgid "New Conversation"
msgstr "æåèè"
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "åéèè(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+msgid "_Video Call"
+msgstr "èèéè(_V)"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "éè(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+msgid "_Audio Call"
+msgstr "èééè(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:246
msgid "New Call"
msgstr "æåéè"
@@ -2516,12 +2580,8 @@ msgstr "æéèåéåçæèçåå"
msgid "Set status"
msgstr "èåçæ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "èåæçäçèçåççæ"
-
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
msgid "Custom messagesâ"
msgstr "èèèæâ"
@@ -2598,12 +2658,12 @@ msgstr "èééèçæ"
msgid "Edit Custom Messages"
msgstr "çèèèèæ"
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1047
#, c-format
msgid "Message edited at %s"
msgstr "èæçèæ %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1752
msgid "Normal"
msgstr "äè"
@@ -2694,26 +2754,26 @@ msgstr "èèäæéæääæäéçäç"
msgid "Certificate Details"
msgstr "æèèçèæ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
msgid "Unable to open URI"
msgstr "çæéå URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
msgid "Select a file"
msgstr "éæäåææ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
msgid "Insufficient free space to save file"
msgstr "çéäèäååææ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
#, c-format
msgid "Incoming file from %s"
msgstr "æåäè %s çææ"
@@ -2885,39 +2945,31 @@ msgstr "èæèç"
msgid "Vietnamese"
msgstr "èåæ"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "æéçèçäçæææææã"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "æéçèçäåçéçã"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
msgid "No error message"
msgstr "ææéèèæ"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
msgid "Instant Message (Empathy)"
msgstr "åæéè (Empathy)"
-#: ../src/empathy.c:431
+#: ../src/empathy.c:433
msgid "Don't connect on startup"
msgstr "ååæäèèåéç"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:437
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "ååæäéçéçäæåæääåäåèç"
-#: ../src/empathy.c:450
+#: ../src/empathy.c:452
msgid "- Empathy IM Client"
msgstr "- Empathy åæéçæç"
-#: ../src/empathy.c:637
+#: ../src/empathy.c:639
msgid "Error contacting the Account Manager"
msgstr "èçåèçççåæççéè"
-#: ../src/empathy.c:639
+#: ../src/empathy.c:641
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3070,8 +3122,8 @@ msgid "Select the accounts you want to import:"
msgstr "éæèååçåèï"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "Yes"
msgstr "æ"
@@ -3144,8 +3196,8 @@ msgid "Your new account has not been saved yet."
msgstr "åæååæçæåèã"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-streamed-media-window.c:755
+#: ../src/empathy-call-window.c:1326
msgid "Connectingâ"
msgstr "éçäâ"
@@ -3239,11 +3291,11 @@ msgstr "èååæçåèïæåéååèæåæçåçéèåå
msgid "_Importâ"
msgstr "åå(_I)â"
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:251
msgid " - Empathy authentication client"
msgstr "- Empathy èèçæç"
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:267
msgid "Empathy authentication client"
msgstr "Empathy èèçæç"
@@ -3251,157 +3303,145 @@ msgstr "Empathy èèçæç"
msgid "People nearby"
msgstr "éèçä"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy éèèèçæç"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
msgid "Empathy Audio/Video Client"
msgstr "Empathy éèèèçæç"
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:432
msgid "Contrast"
msgstr "åæ"
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:435
msgid "Brightness"
msgstr "äå"
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:438
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:543
msgid "Volume"
msgstr "éé"
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1094
msgid "_Sidebar"
msgstr "åéæ(_S)"
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1114
msgid "Audio input"
msgstr "éæèå"
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1118
msgid "Video input"
msgstr "èèèå"
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1126
msgid "Dialpad"
msgstr "æèç"
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1137
msgid "Details"
msgstr "èçèæ"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1206
+#: ../src/empathy-call-window.c:1932
#, c-format
msgid "Call with %s"
msgstr "è %s éèä"
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1439
+#: ../src/empathy-call-window.c:2176
msgid "The IP address as seen by the machine"
msgstr "æåçèç IP äå"
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1441
+#: ../src/empathy-call-window.c:2178
msgid "The IP address as seen by a server on the Internet"
msgstr "çéçèäçäæåçèç IP äå"
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1443
+#: ../src/empathy-call-window.c:2180
msgid "The IP address of the peer as seen by the other side"
msgstr "åäççèçéç IP äå"
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1445
+#: ../src/empathy-call-window.c:2182
msgid "The IP address of a relay server"
msgstr "äçäæåç IP äå"
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1447
+#: ../src/empathy-call-window.c:2184
msgid "The IP address of the multicast group"
msgstr "åéåæççç IP äå"
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+msgctxt "codec"
msgid "Unknown"
msgstr "æç"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
#, c-format
msgid "Connected â %d:%02dm"
msgstr "åéç â %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:3045
msgid "Technical Details"
msgstr "æèçç"
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3084
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s çèéäçèääæéèäæææçéèæå"
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3089
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s çèéäçèääæéèäæææçèèæå"
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3095
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "çæå %s åçéçãæååäääåèåäåäåèçæéçççèääã"
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3101
msgid "There was a failure on the network"
msgstr "éåçèäæéèçç"
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3105
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "æéèæåèçéèæååæåæçéèäåè"
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3108
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "æéèæåèçèèæååæåæçéèäåè"
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3120
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3411,23 +3451,23 @@ msgstr ""
"å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
"åæåéååçãééãèçäææéççéã"
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3129
msgid "There was a failure in the call engine"
msgstr "éèåæåæéèçç"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3132
msgid "The end of the stream was reached"
msgstr "åéäææç"
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3172
msgid "Can't establish audio stream"
msgstr "çæåçéèäæ"
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3182
msgid "Can't establish video stream"
msgstr "çæåçèèäæ"
@@ -3518,8 +3558,8 @@ msgstr "åæèèåæ"
#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
+#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
msgid "Unknown"
msgstr "äæ"
@@ -3683,7 +3723,7 @@ msgstr "ççååçèåå"
msgid "Incoming video call"
msgstr "ååçèèéè"
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
msgid "Incoming call"
msgstr "äé"
@@ -3698,7 +3738,7 @@ msgid "%s is calling you. Do you want to answer?"
msgstr "%s èèæéèéèãææåèæèï"
#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
#, c-format
msgid "Incoming call from %s"
msgstr "%s çäé"
@@ -3716,7 +3756,7 @@ msgid "_Answer with video"
msgstr "äèèæè(_A)"
#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-call-window.c:1562
#, c-format
msgid "Incoming video call from %s"
msgstr "äè %s çèèéè"
@@ -3759,16 +3799,16 @@ msgstr "æèéèåå %s"
msgid "Incoming file transfer from %s"
msgstr "æåäè %s çææåè"
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
msgid "Password required"
msgstr "éèåç"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s æèååæçææåäççèå"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
#, c-format
msgid ""
"\n"
@@ -3911,51 +3951,60 @@ msgstr "éèåå"
msgid "Source"
msgstr "äæ"
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
msgid "Provide Password"
msgstr "æäåç"
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
msgid "Disconnect"
msgstr "æç"
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:638
msgid "No match found"
msgstr "æäåçåéç"
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:746
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "åææï%s åèçæäçïééæç %s èéåææã"
+
+#: ../src/empathy-main-window.c:814
+msgid "Update software..."
+msgstr "ææèé..."
+
+#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+msgid "Close"
+msgstr "éé"
+
+#: ../src/empathy-main-window.c:929
msgid "Reconnect"
msgstr "éæéæ"
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:935
msgid "Edit Account"
msgstr "çèåè"
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "éé"
-
#. Translators: this string will be something like:
#. * Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:1074
#, c-format
msgid "Top up %s (%s)..."
msgstr "åå %s (%s)..."
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1121
msgid "Top up account credit"
-msgstr "åååèéå"
+msgstr "åååèåé"
#. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1192
msgid "Top Up..."
msgstr "åå..."
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1935
msgid "Contact"
msgstr "éçä"
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-main-window.c:2310
msgid "Contact List"
msgstr "éçäæå"
@@ -4048,17 +4097,17 @@ msgstr "èåå(_R)"
msgid "_Search for Contactsâ"
msgstr "æåèçä(_S)â"
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
msgid "Chat Room"
msgstr "èåå"
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
msgid "Members"
msgstr "æå"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
#, c-format
msgid ""
"%s\n"
@@ -4071,16 +4120,16 @@ msgstr ""
"éèåçï%s\n"
"æåï%s"
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "No"
msgstr "å"
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
msgid "Could not start room listing"
msgstr "çæéåååèååæå"
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
msgid "Could not stop room listing"
msgstr "çæåæååèååæå"
@@ -4184,7 +4233,7 @@ msgstr "åäæåççèïçåäçäçéã"
msgid "Juliet has disconnected"
msgstr "çèååæç"
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1175
msgid "Preferences"
msgstr "ååèå"
@@ -4307,43 +4356,47 @@ msgid "Themes"
msgstr "äæäé"
#: ../src/empathy-preferences.ui.h:30
+msgid "Use _echo cancellation to improve call quality"
+msgstr "äçåéæéäæåéèåè(_E)"
+
+#: ../src/empathy-preferences.ui.h:31
msgid "Variant:"
msgstr "æåï"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Automatically connect on startup"
msgstr "ååæèåéç(_A)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Cellphone"
msgstr "ææ(_C)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
msgid "_Enable bubble notifications"
msgstr "åçææåéç(_E)"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Enable sound notifications"
msgstr "åçéæéç(_E)"
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
msgid "_Network (IP, Wi-Fi)"
msgstr "çè (IP, Wi-Fi)(_N)"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
msgid "_Open new chats in separate windows"
msgstr "åååèçéåæçèå(_O)"
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:39
msgid "_Publish location to my contacts"
msgstr "åæçéçäåéäç(_P)"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:41
msgid "_Reduce location accuracy"
msgstr "éääçæçå(_R)"
@@ -4469,16 +4522,16 @@ msgid ""
"extension."
msgstr "éåçéççççåäææéçåéæååèã"
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:197
+#: ../src/empathy-invite-participant-dialog.c:225
msgid "Invite Participant"
msgstr "éèåè"
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:198
msgid "Choose a contact to invite into the conversation:"
msgstr "éææèéèéåèèçèçäï"
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:221
msgid "Invite"
msgstr "éè"
@@ -4499,23 +4552,27 @@ msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "éçåèåç"
+
+#: ../src/empathy-accounts.c:202
msgid "- Empathy Accounts"
msgstr "- Empathy åè"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
msgid "Empathy Accounts"
msgstr "Empathy åè"
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
msgstr "éççåæå"
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
msgid "- Empathy Debugger"
msgstr "- Empathy ééå"
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
msgid "Empathy Debugger"
msgstr "Empathy ééçå"
@@ -4523,39 +4580,39 @@ msgstr "Empathy ééçå"
msgid "- Empathy Chat Client"
msgstr "- Empathy èåçæç"
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
msgid "Respond"
msgstr "åæ"
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1566
msgid "Reject"
msgstr "æç"
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1567
msgid "Answer"
msgstr "æè"
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
msgid "Answer with video"
msgstr "äèèæè"
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
msgid "Decline"
msgstr "æç"
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
msgid "Accept"
msgstr "æå"
#. translators: the 'Provide' button is displayed in a notification
#. * bubble when Empathy is asking for an account password; clicking on it
#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
msgid "Provide"
msgstr "æä"
@@ -4566,32 +4623,97 @@ msgstr "%s ååææçæïäææèääéèã"
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
msgid "i"
msgstr "è"
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2941
msgid "On hold"
msgstr "äç"
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2944
msgid "Mute"
msgstr "éé"
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2946
msgid "Duration"
msgstr "æé"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2949
#, c-format
msgid "%s â %d:%02dm"
msgstr "%s â %d:%02dm"
+#: ../src/empathy-call-window.c:3219
+#, c-format
+msgid "Your current balance is %s."
+msgstr "æçåçééç %sã"
+
+#: ../src/empathy-call-window.c:3223
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "åææïæçåéäèäéèèéèã"
+
+#: ../src/empathy-call-window.c:3225
+msgid "Top Up"
+msgstr "åå"
+
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "æåååå(_M)"
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy åèç butterfly æè"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy æåæèç butterfly æèã"
+
+#~ msgid "Ungrouped"
+#~ msgstr "æçç"
+
+#~ msgid "Favorite People"
+#~ msgstr "ååçä"
+
+#~ msgid "Select a contact"
+#~ msgstr "éæéçä"
+
+#~ msgid "Contact ID:"
+#~ msgstr "éçä IDï"
+
+#~ msgid "C_hat"
+#~ msgstr "èå(_C)"
+
+#~ msgid "Send _Video"
+#~ msgstr "åéèè(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "éè(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "èåæçäçèçåççæ"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "æéçèçäçæææææã"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "æéçèçäåçéçã"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
#~ msgid "Find Next"
#~ msgstr "åæääå"
@@ -4753,9 +4875,6 @@ msgstr "æåååå(_M)"
#~ "fails"
#~ msgstr "åèååääèèçåèïèåææåéçåå"
-#~ msgid "Show the accounts dialog"
-#~ msgstr "éçåèåèç"
-
#~ msgid "The error message was: <span style=\"italic\">%s</span>"
#~ msgstr "éèèæçï <span style=\"italic\">%s</span>"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
