diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2010-08-27 03:44:23 +0800 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2010-08-27 03:44:23 +0800 |
| commit | 3bdcc8ded8e80167626ef22a89c85455f36b50c4 (patch) | |
| tree | e79236966479d6115d252845562957333463cdeb | |
| parent | 197d3f143f4ad7980bc651d9b643334d1dac910d (diff) | |
| download | gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar.gz gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar.bz2 gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar.lz gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar.xz gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.tar.zst gsoc2013-empathy-3bdcc8ded8e80167626ef22a89c85455f36b50c4.zip | |
Update British English translation
| -rw-r--r-- | po/en_GB.po | 1824 |
1 files changed, 1119 insertions, 705 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index 8e9b1f37f..f28303045 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 22:21+0000\n" +"POT-Creation-Date: 2010-08-26 20:34+0100\n" "PO-Revision-Date: 2010-03-17 22:22+0100\n" -"Last-Translator: Bruce Cowan <bcowan@fastmail.co.uk>\n" +"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n" "Language-Team: British English <en@li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -19,26 +19,26 @@ msgstr "" "X-Generator: Virtaal 0.5.2\n" #: ../data/empathy.desktop.in.in.h:1 -msgid "Empathy" -msgstr "Empathy" +msgid "Chat on Google Talk, Facebook, MSN, and many other chat services" +msgstr "Chat on Google Talk, Facebook, MSN and many other chat services" #: ../data/empathy.desktop.in.in.h:2 -msgid "Empathy IM Client" -msgstr "Empathy IM Client" +msgid "Empathy" +msgstr "Empathy" #: ../data/empathy.desktop.in.in.h:3 -msgid "IM Client" -msgstr "IM Client" +msgid "Empathy Internet Messaging" +msgstr "Empathy Internet Messaging" #: ../data/empathy.desktop.in.in.h:4 -msgid "Send and receive messages" -msgstr "Send and receive messages" +msgid "IM Client" +msgstr "IM Client" -#: ../data/empathy.schemas.in.h:1 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:1 msgid "Always open a separate chat window for new chats." msgstr "Always open a separate chat window for new chats." -#: ../data/empathy.schemas.in.h:2 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:2 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -46,262 +46,281 @@ msgstr "" "Character to add after nickname when using nick completion (tab) in group " "chat." -#: ../data/empathy.schemas.in.h:3 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:3 msgid "Chat window theme" msgstr "Chat window theme" -#: ../data/empathy.schemas.in.h:4 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:4 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -#: ../data/empathy.schemas.in.h:5 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Compact contact list" msgstr "Compact contact list" -#: ../data/empathy.schemas.in.h:6 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:6 msgid "Connection managers should be used" msgstr "Connection managers should be used" -#: ../data/empathy.schemas.in.h:7 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:7 msgid "Contact list sort criterion" msgstr "Contact list sort criterion" -#: ../data/empathy.schemas.in.h:8 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:8 msgid "Default directory to select an avatar image from" msgstr "Default directory to select an avatar image from" -#: ../data/empathy.schemas.in.h:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 msgid "Disable popup notifications when away" msgstr "Disable popup notifications when away" -#: ../data/empathy.schemas.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Disable sounds when away" msgstr "Disable sounds when away" -#: ../data/empathy.schemas.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +msgid "Display incoming events in the status area" +msgstr "Display incoming events in the status area" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +msgid "" +"Display incoming events in the status area. If false present them right away " +"to the user." +msgstr "" +"Display incoming events in the status area. If false, present them to the user immediately." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Empathy can publish the user's location" msgstr "Empathy can publish the user's location" -#: ../data/empathy.schemas.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy can use the GPS to guess the location" -#: ../data/empathy.schemas.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy can use the mobile phone network to guess the location" -#: ../data/empathy.schemas.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Empathy can use the network to guess the location" msgstr "Empathy can use the network to guess the location" -#: ../data/empathy.schemas.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Empathy default download folder" msgstr "Empathy default download folder" -#: ../data/empathy.schemas.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Empathy has asked about importing accounts" msgstr "Empathy has asked about importing accounts" -#: ../data/empathy.schemas.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Empathy has migrated butterfly logs" msgstr "Empathy has migrated butterfly logs" -#: ../data/empathy.schemas.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +msgid "Empathy should auto-away when idle" +msgstr "Empathy should auto-away when idle" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Empathy should auto-connect on startup" msgstr "Empathy should auto-connect on startup" -#: ../data/empathy.schemas.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy should reduce the location's accuracy" -#: ../data/empathy.schemas.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy should use the avatar of the contact as the chat window icon" -#: ../data/empathy.schemas.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Enable WebKit Developer Tools" msgstr "Enable WebKit Developer Tools" -#: ../data/empathy.schemas.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "Enable popup notifications for new messages" msgstr "Enable popup notifications for new messages" -#: ../data/empathy.schemas.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Enable spell checker" msgstr "Enable spell checker" -#: ../data/empathy.schemas.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Hide main window" msgstr "Hide main window" -#: ../data/empathy.schemas.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Hide the main window." msgstr "Hide the main window." -#: ../data/empathy.schemas.in.h:26 -msgid "MC 4 accounts have been imported" -msgstr "MC 4 accounts have been imported" - -#: ../data/empathy.schemas.in.h:27 -msgid "MC 4 accounts have been imported." -msgstr "MC 4 accounts have been imported." - -#: ../data/empathy.schemas.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Nick completed character" msgstr "Nick completed character" -#: ../data/empathy.schemas.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "Open new chats in separate windows" msgstr "Open new chats in separate windows" -#: ../data/empathy.schemas.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "Path of the Adium theme to use" msgstr "Path of the Adium theme to use" -#: ../data/empathy.schemas.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "Path of the Adium theme to use if the theme used for chat is Adium." -#: ../data/empathy.schemas.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Play a sound for incoming messages" msgstr "Play a sound for incoming messages" -#: ../data/empathy.schemas.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Play a sound for new conversations" msgstr "Play a sound for new conversations" -#: ../data/empathy.schemas.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Play a sound for outgoing messages" msgstr "Play a sound for outgoing messages" -#: ../data/empathy.schemas.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Play a sound when a contact logs in" msgstr "Play a sound when a contact logs in" -#: ../data/empathy.schemas.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Play a sound when a contact logs out" msgstr "Play a sound when a contact logs out" -#: ../data/empathy.schemas.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Play a sound when we log in" msgstr "Play a sound when we log in" -#: ../data/empathy.schemas.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Play a sound when we log out" msgstr "Play a sound when we log out" -#: ../data/empathy.schemas.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Pop up notifications if the chat isn't focused" msgstr "Pop up notifications if the chat isn't focused" -#: ../data/empathy.schemas.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Pop up notifications when a contact logs in" msgstr "Pop up notifications when a contact logs in" -#: ../data/empathy.schemas.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Pop up notifications when a contact logs out" msgstr "Pop up notifications when a contact logs out" -#: ../data/empathy.schemas.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Show avatars" msgstr "Show avatars" -#: ../data/empathy.schemas.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Show contact list in rooms" msgstr "Show contact list in rooms" -#: ../data/empathy.schemas.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Show hint about closing the main window" msgstr "Show hint about closing the main window" -#: ../data/empathy.schemas.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Show offline contacts" msgstr "Show offline contacts" -#: ../data/empathy.schemas.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Show protocols" msgstr "Show protocols" -#: ../data/empathy.schemas.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Spell checking languages" msgstr "Spell checking languages" -#: ../data/empathy.schemas.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "The default folder to save file transfers in." msgstr "The default folder to save file transfers in." -#: ../data/empathy.schemas.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "The last directory that an avatar image was chosen from." msgstr "The last directory that an avatar image was chosen from." -#: ../data/empathy.schemas.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +msgid "The position for the chat window side pane" +msgstr "The position for the chat window side pane" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +msgid "The stored position (in pixels) of the chat window side pane." +msgstr "The stored position (in pixels) of the chat window side pane." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "The theme that is used to display the conversation in chat windows." msgstr "The theme that is used to display the conversation in chat windows." -#: ../data/empathy.schemas.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Use graphical smileys" msgstr "Use graphical smileys" -#: ../data/empathy.schemas.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Use notification sounds" msgstr "Use notification sounds" -#: ../data/empathy.schemas.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Use theme for chat rooms" msgstr "Use theme for chat rooms" -#: ../data/empathy.schemas.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "Whether Empathy can publish the user's location to their contacts." -#: ../data/empathy.schemas.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Whether Empathy can use the GPS to guess the location." -#: ../data/empathy.schemas.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Whether Empathy can use the mobile phone network to guess the location." -#: ../data/empathy.schemas.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "Whether Empathy can use the network to guess the location." msgstr "Whether Empathy can use the network to guess the location." -#: ../data/empathy.schemas.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether Empathy has asked about importing accounts from other programs." msgstr "" "Whether Empathy has asked about importing accounts from other programs." -#: ../data/empathy.schemas.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Whether Empathy has migrated butterfly logs." msgstr "Whether Empathy has migrated butterfly logs." -#: ../data/empathy.schemas.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" "Whether Empathy should automatically log into your accounts on startup." -#: ../data/empathy.schemas.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +msgid "Whether Empathy should go into away mode automatically if user is idle." +msgstr "Whether Empathy should go into away mode automatically if the user is idle." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Whether Empathy should reduce the location's accuracy for privacy reasons." -#: ../data/empathy.schemas.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Whether Empathy should use the avatar of the contact as the chat window icon." -#: ../data/empathy.schemas.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." -#: ../data/empathy.schemas.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." @@ -309,64 +328,64 @@ msgstr "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." -#: ../data/empathy.schemas.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" "Whether to check words typed against the languages you want to check with." -#: ../data/empathy.schemas.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Whether to convert smileys into graphical images in conversations." msgstr "Whether to convert smileys into graphical images in conversations." -#: ../data/empathy.schemas.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Whether to play a sound to notify of contacts logging into the network." -#: ../data/empathy.schemas.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" "Whether to play a sound to notify of contacts logging out of the network." -#: ../data/empathy.schemas.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Whether to play a sound to notify of events." msgstr "Whether to play a sound to notify of events." -#: ../data/empathy.schemas.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Whether to play a sound to notify of incoming messages." msgstr "Whether to play a sound to notify of incoming messages." -#: ../data/empathy.schemas.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "Whether to play a sound to notify of new conversations." msgstr "Whether to play a sound to notify of new conversations." -#: ../data/empathy.schemas.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Whether to play a sound to notify of outgoing messages." msgstr "Whether to play a sound to notify of outgoing messages." -#: ../data/empathy.schemas.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to play a sound when logging into a network." msgstr "Whether to play a sound when logging into a network." -#: ../data/empathy.schemas.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Whether to play a sound when logging out of a network." msgstr "Whether to play a sound when logging out of a network." -#: ../data/empathy.schemas.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to play sound notifications when away or busy." msgstr "Whether to play sound notifications when away or busy." -#: ../data/empathy.schemas.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Whether to show a popup notification when a contact goes offline." msgstr "Whether to show a popup notification when a contact goes offline." -#: ../data/empathy.schemas.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Whether to show a popup notification when a contact goes online." msgstr "Whether to show a popup notification when a contact goes online." -#: ../data/empathy.schemas.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -374,37 +393,37 @@ msgstr "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." -#: ../data/empathy.schemas.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to show a popup notification when receiving a new message." msgstr "Whether to show a popup notification when receiving a new message." -#: ../data/empathy.schemas.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Whether to show avatars for contacts in the contact list and chat windows." -#: ../data/empathy.schemas.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Whether to show contacts that are offline in the contact list." msgstr "Whether to show contacts that are offline in the contact list." -#: ../data/empathy.schemas.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to show popup notifications when away or busy." msgstr "Whether to show popup notifications when away or busy." -#: ../data/empathy.schemas.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether to show protocols for contacts in the contact list." msgstr "Whether to show protocols for contacts in the contact list." -#: ../data/empathy.schemas.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Whether to show the contact list in chat rooms." msgstr "Whether to show the contact list in chat rooms." -#: ../data/empathy.schemas.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "Whether to show the contact list in compact mode." msgstr "Whether to show the contact list in compact mode." -#: ../data/empathy.schemas.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -412,11 +431,11 @@ msgstr "" "Whether to show the message dialogue about closing the main window with the " "'x' button in the title bar." -#: ../data/empathy.schemas.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Whether to use the theme for chat rooms." msgstr "Whether to use the theme for chat rooms." -#: ../data/empathy.schemas.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " @@ -432,149 +451,205 @@ msgstr "Manage Messaging and VoIP accounts" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243 -#: ../src/cc-empathy-accounts-panel.c:91 +#: ../src/empathy-accounts-dialog.c:2151 msgid "Messaging and VoIP Accounts" msgstr "Messaging and VoIP Accounts" -#: ../libempathy/empathy-ft-handler.c:842 +#: ../libempathy/empathy-ft-handler.c:851 msgid "The hash of the received file and the sent one do not match" msgstr "The hash of the received file and the sent one do not match" -#: ../libempathy/empathy-ft-handler.c:1102 +#: ../libempathy/empathy-ft-handler.c:1111 msgid "File transfer not supported by remote contact" msgstr "File transfer not supported by remote contact" -#: ../libempathy/empathy-ft-handler.c:1160 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is not a regular file" msgstr "The selected file is not a regular file" -#: ../libempathy/empathy-ft-handler.c:1169 +#: ../libempathy/empathy-ft-handler.c:1178 msgid "The selected file is empty" msgstr "The selected file is empty" -#: ../libempathy/empathy-tp-contact-list.c:834 -#: ../src/empathy-auto-salut-account-helper.c:77 -msgid "People nearby" -msgstr "People nearby" - -#: ../libempathy/empathy-tp-file.c:280 +#: ../libempathy/empathy-tp-file.c:283 msgid "Socket type not supported" msgstr "Socket type not supported" -#: ../libempathy/empathy-tp-file.c:399 +#: ../libempathy/empathy-tp-file.c:402 msgid "No reason was specified" msgstr "No reason was specified" -#: ../libempathy/empathy-tp-file.c:402 +#: ../libempathy/empathy-tp-file.c:405 msgid "The change in state was requested" msgstr "The change in state was requested" -#: ../libempathy/empathy-tp-file.c:405 +#: ../libempathy/empathy-tp-file.c:408 msgid "You canceled the file transfer" msgstr "You cancelled the file transfer" -#: ../libempathy/empathy-tp-file.c:408 +#: ../libempathy/empathy-tp-file.c:411 msgid "The other participant canceled the file transfer" msgstr "The other participant cancelled the file transfer" -#: ../libempathy/empathy-tp-file.c:411 +#: ../libempathy/empathy-tp-file.c:414 msgid "Error while trying to transfer the file" msgstr "Error while trying to transfer the file" -#: ../libempathy/empathy-tp-file.c:414 +#: ../libempathy/empathy-tp-file.c:417 msgid "The other participant is unable to transfer the file" msgstr "The other participant is unable to transfer the file" -#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314 +#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320 msgid "Unknown reason" msgstr "Unknown reason" -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:242 msgid "Available" msgstr "Available" -#: ../libempathy/empathy-utils.c:240 +#: ../libempathy/empathy-utils.c:244 msgid "Busy" msgstr "Busy" -#: ../libempathy/empathy-utils.c:243 +#: ../libempathy/empathy-utils.c:247 msgid "Away" msgstr "Away" -#: ../libempathy/empathy-utils.c:245 +#: ../libempathy/empathy-utils.c:249 msgid "Invisible" msgstr "Invisible" -#: ../libempathy/empathy-utils.c:247 +#: ../libempathy/empathy-utils.c:251 msgid "Offline" msgstr "Offline" -#: ../libempathy/empathy-utils.c:286 +#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883 +#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885 +#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18 +msgid "Unknown" +msgstr "Unknown" + +#: ../libempathy/empathy-utils.c:292 msgid "No reason specified" msgstr "No reason specified" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350 msgid "Status is set to offline" msgstr "Status is set to offline." -#: ../libempathy/empathy-utils.c:290 +#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330 msgid "Network error" msgstr "Network error" -#: ../libempathy/empathy-utils.c:292 +#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332 msgid "Authentication failed" msgstr "Authentication failed" -#: ../libempathy/empathy-utils.c:294 +#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334 msgid "Encryption error" msgstr "Encryption error" -#: ../libempathy/empathy-utils.c:296 +#: ../libempathy/empathy-utils.c:302 msgid "Name in use" msgstr "Name in use" -#: ../libempathy/empathy-utils.c:298 +#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336 msgid "Certificate not provided" msgstr "Certificate not provided" -#: ../libempathy/empathy-utils.c:300 +#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338 msgid "Certificate untrusted" msgstr "Certificate untrusted" -#: ../libempathy/empathy-utils.c:302 +#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340 msgid "Certificate expired" msgstr "Certificate expired" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342 msgid "Certificate not activated" msgstr "Certificate not activated" -#: ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344 msgid "Certificate hostname mismatch" msgstr "Certificate hostname mismatch" -#: ../libempathy/empathy-utils.c:308 +#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346 msgid "Certificate fingerprint mismatch" msgstr "Certificate fingerprint mismatch" -#: ../libempathy/empathy-utils.c:310 +#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348 msgid "Certificate self-signed" msgstr "Certificate self-signed" -#: ../libempathy/empathy-utils.c:312 +#: ../libempathy/empathy-utils.c:318 msgid "Certificate error" msgstr "Certificate error" -#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:352 +msgid "Encryption is not available" +msgstr "Encryption is not available" + +#: ../libempathy/empathy-utils.c:354 +msgid "Certificate is invalid" +msgstr "Certificate is invalid" + +#: ../libempathy/empathy-utils.c:356 +msgid "Connection has been refused" +msgstr "Connection has been refused" + +#: ../libempathy/empathy-utils.c:358 +msgid "Connection can't be established" +msgstr "Connection can't be established" + +#: ../libempathy/empathy-utils.c:360 +msgid "Connection has been lost" +msgstr "Connection has been lost" + +#: ../libempathy/empathy-utils.c:362 +msgid "This resource is already connected to the server" +msgstr "This resource is already connected to the server" + +#: ../libempathy/empathy-utils.c:364 +msgid "" +"Connection has been replaced by a new connection using the same resource" +msgstr "" +"Connection has been replaced by a new connection using the same resource" + +#: ../libempathy/empathy-utils.c:367 +msgid "The account already exists on the server" +msgstr "The account already exists on the server" + +#: ../libempathy/empathy-utils.c:369 +msgid "Server is currently too busy to handle the connection" +msgstr "Server is currently too busy to handle the connection" + +#: ../libempathy/empathy-utils.c:371 +msgid "Certificate has been revoked" +msgstr "Certificate has been revoked" + +#: ../libempathy/empathy-utils.c:373 +msgid "" +"Certificate uses an insecure cipher algorithm or is cryptographically weak" +msgstr "" +"Certificate uses an insecure cypher algorithm or is cryptographically weak" + +#: ../libempathy/empathy-utils.c:376 +msgid "" +"The length of the server certificate, or the depth of the server certificate " +"chain exceed the limits imposed by the crypto library" +msgstr "" +"The length of the server certificate, or the depth of the server certificate " +"chain, exceed the limits imposed by the cryptography library" + +#: ../libempathy/empathy-utils.c:540 msgid "People Nearby" msgstr "People Nearby" -#: ../libempathy/empathy-utils.c:434 +#: ../libempathy/empathy-utils.c:545 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:435 +#: ../libempathy/empathy-utils.c:546 msgid "Facebook Chat" msgstr "Facebook Chat" @@ -624,41 +699,43 @@ msgstr[1] "%d months ago" msgid "in the future" msgstr "in the future" -#: ../libempathy-gtk/empathy-account-chooser.c:462 +#: ../libempathy-gtk/empathy-account-chooser.c:463 msgid "All" msgstr "All" -#: ../libempathy-gtk/empathy-account-widget.c:538 -#: ../libempathy-gtk/empathy-account-widget.c:594 +#: ../libempathy-gtk/empathy-account-widget.c:549 +#: ../libempathy-gtk/empathy-account-widget.c:606 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1126 +#: ../libempathy-gtk/empathy-account-widget.c:1145 msgid "Username:" msgstr "Username:" -#: ../libempathy-gtk/empathy-account-widget.c:1474 +#: ../libempathy-gtk/empathy-account-widget.c:1488 msgid "L_og in" msgstr "L_og in" -#: ../libempathy-gtk/empathy-account-widget.c:1542 +#. Account and Identifier +#: ../libempathy-gtk/empathy-account-widget.c:1556 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-individual-widget.c:1393 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "Account:" -#: ../libempathy-gtk/empathy-account-widget.c:1553 +#: ../libempathy-gtk/empathy-account-widget.c:1567 msgid "Enabled" msgstr "Enabled" -#: ../libempathy-gtk/empathy-account-widget.c:1618 +#: ../libempathy-gtk/empathy-account-widget.c:1632 msgid "This account already exists on the server" msgstr "This account already exists on the server" -#: ../libempathy-gtk/empathy-account-widget.c:1621 +#: ../libempathy-gtk/empathy-account-widget.c:1635 msgid "Create a new account on the server" msgstr "Create a new account on the server" @@ -667,19 +744,19 @@ msgstr "Create a new account on the server" #. * like: "MyUserName on chat.freenode.net". #. * 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:2013 +#: ../libempathy-gtk/empathy-account-widget.c:2004 #, c-format msgid "%1$s on %2$s" msgstr "%1$s on %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2039 +#: ../libempathy-gtk/empathy-account-widget.c:2030 #, c-format msgid "%s Account" msgstr "%s Account" -#: ../libempathy-gtk/empathy-account-widget.c:2043 +#: ../libempathy-gtk/empathy-account-widget.c:2034 msgid "New account" msgstr "New account" @@ -704,7 +781,7 @@ msgstr "Advanced" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "Pass_word:" @@ -724,7 +801,7 @@ msgstr "What is your AIM screen name?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "_Port:" @@ -733,7 +810,7 @@ msgstr "_Port:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12 #: ../src/empathy-new-chatroom-dialog.ui.h:9 @@ -780,40 +857,36 @@ msgstr "What is your ICQ password?" msgid "_Character set:" msgstr "_Character set:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:244 -msgid "New Network" -msgstr "New Network" - -#: ../libempathy-gtk/empathy-account-widget-sip.c:184 -#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +#: ../libempathy-gtk/empathy-account-widget-sip.c:183 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +#: ../libempathy-gtk/empathy-account-widget-sip.c:186 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +#: ../libempathy-gtk/empathy-account-widget-sip.c:189 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +#: ../libempathy-gtk/empathy-account-widget-sip.c:192 msgid "TLS" msgstr "TLS" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +#: ../libempathy-gtk/empathy-account-widget-sip.c:221 msgid "Register" msgstr "Register" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +#: ../libempathy-gtk/empathy-account-widget-sip.c:226 msgid "Options" msgstr "Options" -#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +#: ../libempathy-gtk/empathy-account-widget-sip.c:229 msgid "None" msgstr "None" @@ -849,6 +922,14 @@ msgstr "Real name:" msgid "Servers" msgstr "Servers" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +msgid "What is your IRC nick?" +msgstr "What is your IRC nickname?" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +msgid "Which IRC network?" +msgstr "Which IRC network?" + #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 msgid "<b>Example:</b> user@gmail.com" msgstr "<b>Example:</b> user@gmail.com" @@ -869,7 +950,8 @@ msgstr "Pri_ority:" msgid "Reso_urce:" msgstr "Reso_urce:" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "" "This is your username, not your normal Facebook login.\n" "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n" @@ -881,47 +963,47 @@ msgstr "" "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " "Facebook username if you don't have one." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 msgid "Use old SS_L" msgstr "Use old SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 msgid "What is your Facebook password?" msgstr "What is your Facebook password?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 msgid "What is your Facebook username?" msgstr "What is your Facebook username?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 msgid "What is your Google ID?" msgstr "What is your Google ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "What is your Google password?" msgstr "What is your Google password?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 msgid "What is your Jabber ID?" msgstr "What is your Jabber ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 msgid "What is your Jabber password?" msgstr "What is your Jabber password?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 msgid "What is your desired Jabber ID?" msgstr "What is your desired Jabber ID?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 msgid "What is your desired Jabber password?" msgstr "What is your desired Jabber password?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 msgid "_Encryption required (TLS/SSL)" msgstr "_Encryption required (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 msgid "_Ignore SSL certificate errors" msgstr "_Ignore SSL certificate errors" @@ -978,98 +1060,58 @@ msgid "Discover the STUN server automatically" msgstr "Discover the STUN server automatically" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 -msgid "Hostname of the proxy for outbound requests." -msgstr "Hostname of the proxy for outbound requests." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "Interval (seconds)" msgstr "Interval (seconds)" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "Keep-Alive Options" msgstr "Keep-Alive Options" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 -msgid "" -"Look up the DNS SRV record at the service's domain for the host name of a " -"STUN server." -msgstr "" -"Look up the DNS SRV record at the service's domain for the host name of a " -"STUN server." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 msgid "Loose Routing" msgstr "Loose Routing" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 msgid "Mechanism:" msgstr "Mechanism:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 msgid "Miscellaneous Options" msgstr "Miscellaneous Options" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 msgid "NAT Traversal Options" msgstr "NAT Traversal Options" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 -msgid "Port of the proxy for outbound requests." -msgstr "Port of the proxy for outbound requests." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 msgid "Port:" msgstr "Port:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 msgid "Proxy Options" msgstr "Proxy Options" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 msgid "STUN Server:" msgstr "STUN Server:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 msgid "Server:" msgstr "Server:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -msgid "" -"The username for SIP authentication, if different from the SIP URI\n" -"username." -msgstr "" -"The username for SIP authentication, if different from the SIP URI\n" -"username." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "Transport:" msgstr "Transport:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 -msgid "" -"Update the registration binding if the external address for the client is " -"discovered to be different from the local binding." -msgstr "" -"Update the registration binding if the external address for the client is " -"discovered to be different from the local binding." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 -msgid "" -"Use the loose routing behavior and the Route header as recommended in RFC " -"3261." -msgstr "" -"Use the loose routing behavior and the Route header as recommended in RFC " -"3261." - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 msgid "What is your SIP account password?" msgstr "What is your SIP account password?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 msgid "What is your SIP login ID?" msgstr "What is your SIP login ID?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 msgid "_Username:" msgstr "_Username:" @@ -1097,88 +1139,80 @@ msgstr "_Ignore conference and chat room invitations" msgid "_Room List locale:" msgstr "_Room List locale:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:449 -#: ../libempathy-gtk/empathy-avatar-chooser.c:525 +#: ../libempathy-gtk/empathy-avatar-chooser.c:443 +#: ../libempathy-gtk/empathy-avatar-chooser.c:519 msgid "Couldn't convert image" msgstr "Couldn't convert image" -#: ../libempathy-gtk/empathy-avatar-chooser.c:450 +#: ../libempathy-gtk/empathy-avatar-chooser.c:444 msgid "None of the accepted image formats are supported on your system" msgstr "None of the accepted image formats are supported on your system" -#: ../libempathy-gtk/empathy-avatar-chooser.c:915 +#: ../libempathy-gtk/empathy-avatar-chooser.c:935 msgid "Select Your Avatar Image" msgstr "Select Your Avatar Image" -#: ../libempathy-gtk/empathy-avatar-chooser.c:918 +#: ../libempathy-gtk/empathy-avatar-chooser.c:938 msgid "No Image" msgstr "No Image" -#: ../libempathy-gtk/empathy-avatar-chooser.c:980 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1000 msgid "Images" msgstr "Images" -#: ../libempathy-gtk/empathy-avatar-chooser.c:984 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1004 msgid "All Files" msgstr "All Files" -#: ../libempathy-gtk/empathy-avatar-image.c:327 +#: ../libempathy-gtk/empathy-avatar-image.c:323 msgid "Click to enlarge" msgstr "Click to enlarge" -#: ../libempathy-gtk/empathy-chat.c:233 -msgid "Failed to reconnect this chat" -msgstr "Failed to reconnect this chat" - -#: ../libempathy-gtk/empathy-chat.c:655 -msgid "Failed to join chat room" -msgstr "Failed to join chat room" - -#: ../libempathy-gtk/empathy-chat.c:673 +#: ../libempathy-gtk/empathy-chat.c:639 msgid "Failed to open private chat" msgstr "Failed to open private chat" -#: ../libempathy-gtk/empathy-chat.c:712 +#: ../libempathy-gtk/empathy-chat.c:679 msgid "Topic not supported on this conversation" msgstr "Topic not supported on this conversation" -#: ../libempathy-gtk/empathy-chat.c:718 +#: ../libempathy-gtk/empathy-chat.c:685 msgid "You are not allowed to change the topic" msgstr "You are not allowed to change the topic" -#: ../libempathy-gtk/empathy-chat.c:847 +#: ../libempathy-gtk/empathy-chat.c:819 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: clear all messages from the current conversation" -#: ../libempathy-gtk/empathy-chat.c:850 +#: ../libempathy-gtk/empathy-chat.c:822 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <topic>: set the topic of the current conversation" -#: ../libempathy-gtk/empathy-chat.c:853 +#: ../libempathy-gtk/empathy-chat.c:825 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <chat room ID>: join a new chat room" -#: ../libempathy-gtk/empathy-chat.c:856 +#: ../libempathy-gtk/empathy-chat.c:828 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <chat room ID>: join a new chat room" -#: ../libempathy-gtk/empathy-chat.c:859 +#: ../libempathy-gtk/empathy-chat.c:833 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <contact ID> [<message>]: open a private chat" -#: ../libempathy-gtk/empathy-chat.c:862 +#: ../libempathy-gtk/empathy-chat.c:836 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <contact ID> <message>: open a private chat" -#: ../libempathy-gtk/empathy-chat.c:865 +#: ../libempathy-gtk/empathy-chat.c:840 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <nickname>: change your nickname on the current server" -#: ../libempathy-gtk/empathy-chat.c:868 +#: ../libempathy-gtk/empathy-chat.c:843 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <message>: send an ACTION message to the current conversation" -#: ../libempathy-gtk/empathy-chat.c:871 +#: ../libempathy-gtk/empathy-chat.c:846 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 " @@ -1188,7 +1222,7 @@ msgstr "" "send a message starting with a '/'. For example: \"/say /join is used to " "join a new chat room\"" -#: ../libempathy-gtk/empathy-chat.c:876 +#: ../libempathy-gtk/empathy-chat.c:851 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1196,80 +1230,84 @@ msgstr "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." -#: ../libempathy-gtk/empathy-chat.c:886 +#: ../libempathy-gtk/empathy-chat.c:861 #, c-format msgid "Usage: %s" msgstr "Usage: %s" -#: ../libempathy-gtk/empathy-chat.c:915 +#: ../libempathy-gtk/empathy-chat.c:890 msgid "Unknown command" msgstr "Unknown command" -#: ../libempathy-gtk/empathy-chat.c:1036 +#: ../libempathy-gtk/empathy-chat.c:1011 msgid "Unknown command; see /help for the available commands" msgstr "Unknown command; see /help for the available commands" -#: ../libempathy-gtk/empathy-chat.c:1174 +#: ../libempathy-gtk/empathy-chat.c:1149 msgid "offline" msgstr "offline" -#: ../libempathy-gtk/empathy-chat.c:1177 +#: ../libempathy-gtk/empathy-chat.c:1152 msgid "invalid contact" msgstr "invalid contact" -#: ../libempathy-gtk/empathy-chat.c:1180 +#: ../libempathy-gtk/empathy-chat.c:1155 msgid "permission denied" msgstr "permission denied" -#: ../libempathy-gtk/empathy-chat.c:1183 +#: ../libempathy-gtk/empathy-chat.c:1158 msgid "too long message" msgstr "too long message" -#: ../libempathy-gtk/empathy-chat.c:1186 +#: ../libempathy-gtk/empathy-chat.c:1161 msgid "not implemented" msgstr "not implemented" -#: ../libempathy-gtk/empathy-chat.c:1189 +#: ../libempathy-gtk/empathy-chat.c:1165 msgid "unknown" msgstr "unknown" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1169 #, c-format msgid "Error sending message '%s': %s" msgstr "Error sending message '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1228 +#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691 +msgid "Topic:" +msgstr "Topic:" + +#: ../libempathy-gtk/empathy-chat.c:1291 #, c-format msgid "Topic set to: %s" msgstr "Topic set to: %s" -#: ../libempathy-gtk/empathy-chat.c:1230 +#: ../libempathy-gtk/empathy-chat.c:1293 msgid "No topic defined" msgstr "No topic defined" -#: ../libempathy-gtk/empathy-chat.c:1629 +#: ../libempathy-gtk/empathy-chat.c:1772 msgid "(No Suggestions)" msgstr "(No Suggestions)" -#: ../libempathy-gtk/empathy-chat.c:1683 +#: ../libempathy-gtk/empathy-chat.c:1826 msgid "Insert Smiley" msgstr "Insert Smiley" #. send button -#: ../libempathy-gtk/empathy-chat.c:1701 -#: ../libempathy-gtk/empathy-ui-utils.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1844 +#: ../libempathy-gtk/empathy-ui-utils.c:1801 msgid "_Send" msgstr "_Send" -#: ../libempathy-gtk/empathy-chat.c:1735 +#: ../libempathy-gtk/empathy-chat.c:1878 msgid "_Spelling Suggestions" msgstr "_Spelling Suggestions" -#: ../libempathy-gtk/empathy-chat.c:1829 +#: ../libempathy-gtk/empathy-chat.c:1955 msgid "Failed to retrieve recent logs" msgstr "Failed to retrieve recent logs" -#: ../libempathy-gtk/empathy-chat.c:1960 +#: ../libempathy-gtk/empathy-chat.c:2061 #, c-format msgid "%s has disconnected" msgstr "%s has disconnected" @@ -1277,12 +1315,12 @@ msgstr "%s has disconnected" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1967 +#: ../libempathy-gtk/empathy-chat.c:2068 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s was kicked by %2$s" -#: ../libempathy-gtk/empathy-chat.c:1970 +#: ../libempathy-gtk/empathy-chat.c:2071 #, c-format msgid "%s was kicked" msgstr "%s was kicked" @@ -1290,17 +1328,17 @@ msgstr "%s was kicked" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1978 +#: ../libempathy-gtk/empathy-chat.c:2079 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s was banned by %2$s" -#: ../libempathy-gtk/empathy-chat.c:1981 +#: ../libempathy-gtk/empathy-chat.c:2082 #, c-format msgid "%s was banned" msgstr "%s was banned" -#: ../libempathy-gtk/empathy-chat.c:1985 +#: ../libempathy-gtk/empathy-chat.c:2086 #, c-format msgid "%s has left the room" msgstr "%s has left the room" @@ -1310,81 +1348,79 @@ msgstr "%s has left the room" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1994 +#: ../libempathy-gtk/empathy-chat.c:2095 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2019 +#: ../libempathy-gtk/empathy-chat.c:2120 #, c-format msgid "%s has joined the room" msgstr "%s has joined the room" -#: ../libempathy-gtk/empathy-chat.c:2044 +#: ../libempathy-gtk/empathy-chat.c:2145 #, c-format msgid "%s is now known as %s" msgstr "%s is now known as %s" -#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532 +#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922 msgid "Disconnected" msgstr "Disconnected" -#: ../libempathy-gtk/empathy-chat.c:2701 +#: ../libempathy-gtk/empathy-chat.c:2922 msgid "Wrong password; please try again:" msgstr "Wrong password; please try again:" -#: ../libempathy-gtk/empathy-chat.c:2702 +#: ../libempathy-gtk/empathy-chat.c:2923 msgid "Retry" msgstr "Retry" -#: ../libempathy-gtk/empathy-chat.c:2707 +#: ../libempathy-gtk/empathy-chat.c:2928 msgid "This room is protected by a password:" msgstr "This room is protected by a password:" -#: ../libempathy-gtk/empathy-chat.c:2708 +#: ../libempathy-gtk/empathy-chat.c:2929 msgid "Join" msgstr "Join" -#: ../libempathy-gtk/empathy-chat.c:2848 +#: ../libempathy-gtk/empathy-chat.c:3069 msgid "Connected" msgstr "Connected" -#: ../libempathy-gtk/empathy-chat.c:2901 -#: ../libempathy-gtk/empathy-log-window.c:707 +#: ../libempathy-gtk/empathy-chat.c:3122 +#: ../libempathy-gtk/empathy-log-window.c:653 msgid "Conversation" msgstr "Conversation" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:684 -msgid "Topic:" -msgstr "Topic:" - #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:318 -#: ../libempathy-gtk/empathy-theme-adium.c:786 +#: ../libempathy-gtk/empathy-chat-text-view.c:324 +#: ../libempathy-gtk/empathy-theme-adium.c:791 msgid "_Copy Link Address" msgstr "_Copy Link Address" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:325 -#: ../libempathy-gtk/empathy-theme-adium.c:793 +#: ../libempathy-gtk/empathy-chat-text-view.c:331 +#: ../libempathy-gtk/empathy-theme-adium.c:798 msgid "_Open Link" msgstr "_Open Link" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:423 +#: ../libempathy-gtk/empathy-chat-text-view.c:424 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:249 +#: ../libempathy-gtk/empathy-contact-dialogs.c:243 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249 msgid "Edit Contact Information" msgstr "Edit Contact Information" -#: ../libempathy-gtk/empathy-contact-dialogs.c:301 +#: ../libempathy-gtk/empathy-contact-dialogs.c:295 msgid "Personal Information" msgstr "Personal Information" -#: ../libempathy-gtk/empathy-contact-dialogs.c:406 +#: ../libempathy-gtk/empathy-contact-dialogs.c:401 +#: ../libempathy-gtk/empathy-individual-dialogs.c:112 msgid "New Contact" msgstr "New Contact" @@ -1396,214 +1432,277 @@ msgstr "Decide _Later" msgid "Subscription Request" msgstr "Subscription Request" -#: ../libempathy-gtk/empathy-contact-list-view.c:1633 +#: ../libempathy-gtk/empathy-contact-list-view.c:2004 +#: ../libempathy-gtk/empathy-individual-view.c:2089 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Do you really want to remove the group '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1635 +#: ../libempathy-gtk/empathy-contact-list-view.c:2006 +#: ../libempathy-gtk/empathy-individual-view.c:2092 msgid "Removing group" msgstr "Removing group" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1684 -#: ../libempathy-gtk/empathy-contact-list-view.c:1761 -#: ../src/empathy-accounts-dialog.ui.h:6 +#: ../libempathy-gtk/empathy-contact-list-view.c:2055 +#: ../libempathy-gtk/empathy-contact-list-view.c:2132 +#: ../libempathy-gtk/empathy-individual-view.c:2146 +#: ../libempathy-gtk/empathy-individual-view.c:2231 +#: ../src/empathy-accounts-dialog.ui.h:7 msgid "_Remove" msgstr "_Remove" -#: ../libempathy-gtk/empathy-contact-list-view.c:1714 +#: ../libempathy-gtk/empathy-contact-list-view.c:2085 +#: ../libempathy-gtk/empathy-individual-view.c:2177 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Do you really want to remove the contact '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1716 +#: ../libempathy-gtk/empathy-contact-list-view.c:2087 +#: ../libempathy-gtk/empathy-individual-view.c:2179 msgid "Removing contact" msgstr "Removing contact" -#: ../libempathy-gtk/empathy-contact-menu.c:206 -#: ../src/empathy-main-window.ui.h:14 +#: ../libempathy-gtk/empathy-contact-menu.c:203 +#: ../libempathy-gtk/empathy-individual-menu.c:360 +#: ../src/empathy-main-window.ui.h:13 msgid "_Add Contact…" msgstr "_Add Contact…" -#: ../libempathy-gtk/empathy-contact-menu.c:233 -#: ../src/empathy-main-window.ui.h:15 +#: ../libempathy-gtk/empathy-contact-menu.c:230 +#: ../libempathy-gtk/empathy-individual-menu.c:463 +#: ../src/empathy-main-window.ui.h:14 msgid "_Chat" msgstr "_Chat" -#: ../libempathy-gtk/empathy-contact-menu.c:264 +#: ../libempathy-gtk/empathy-contact-menu.c:260 +#: ../libempathy-gtk/empathy-individual-menu.c:504 msgctxt "menu item" msgid "_Audio Call" msgstr "_Audio Call" -#: ../libempathy-gtk/empathy-contact-menu.c:296 +#: ../libempathy-gtk/empathy-contact-menu.c:290 +#: ../libempathy-gtk/empathy-individual-menu.c:546 msgctxt "menu item" msgid "_Video Call" msgstr "_Video Call" -#: ../libempathy-gtk/empathy-contact-menu.c:347 -#: ../src/empathy-main-window.ui.h:26 +#: ../libempathy-gtk/empathy-contact-menu.c:330 +#: ../libempathy-gtk/empathy-individual-menu.c:604 +#: ../src/empathy-main-window.ui.h:25 msgid "_Previous Conversations" msgstr "_Previous Conversations" -#: ../libempathy-gtk/empathy-contact-menu.c:369 -msgid "Send file" -msgstr "Send file" +#: ../libempathy-gtk/empathy-contact-menu.c:352 +#: ../libempathy-gtk/empathy-individual-menu.c:645 +msgid "Send File" +msgstr "Send File" -#: ../libempathy-gtk/empathy-contact-menu.c:392 -msgid "Share my desktop" -msgstr "Share my desktop" +#: ../libempathy-gtk/empathy-contact-menu.c:375 +#: ../libempathy-gtk/empathy-individual-menu.c:687 +msgid "Share My Desktop" +msgstr "Share My Desktop" -#: ../libempathy-gtk/empathy-contact-menu.c:432 -#: ../libempathy-gtk/empathy-contact-widget.c:1379 +#: ../libempathy-gtk/empathy-contact-menu.c:415 +#: ../libempathy-gtk/empathy-contact-widget.c:1537 +#: ../libempathy-gtk/empathy-individual-menu.c:721 +#: ../libempathy-gtk/empathy-individual-widget.c:1284 msgid "Favorite" msgstr "Favourite" -#: ../libempathy-gtk/empathy-contact-menu.c:462 +#: ../libempathy-gtk/empathy-contact-menu.c:444 +#: ../libempathy-gtk/empathy-individual-menu.c:748 msgid "Infor_mation" msgstr "Infor_mation" -#: ../libempathy-gtk/empathy-contact-menu.c:508 +#: ../libempathy-gtk/empathy-contact-menu.c:490 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Edit" -#: ../libempathy-gtk/empathy-contact-menu.c:562 -#: ../src/empathy-chat-window.c:869 +#: ../libempathy-gtk/empathy-contact-menu.c:544 +#: ../libempathy-gtk/empathy-individual-menu.c:934 +#: ../src/empathy-chat-window.c:903 msgid "Inviting you to this room" msgstr "Inviting you to this room" -#: ../libempathy-gtk/empathy-contact-menu.c:593 -msgid "_Invite to chat room" -msgstr "_Invite to chat room" +#: ../libempathy-gtk/empathy-contact-menu.c:575 +#: ../libempathy-gtk/empathy-individual-menu.c:981 +msgid "_Invite to Chat Room" +msgstr "_Invite to Chat Room" #: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "Select a contact" -#: ../libempathy-gtk/empathy-contact-widget.c:238 -msgid "Select" -msgstr "Select" +#: ../libempathy-gtk/empathy-contact-widget.c:217 +#: ../libempathy-gtk/empathy-individual-widget.c:148 +msgid "Full name:" +msgstr "Full name:" -#: ../libempathy-gtk/empathy-contact-widget.c:247 -#: ../src/empathy-main-window.c:1050 -msgid "Group" -msgstr "Group" +#: ../libempathy-gtk/empathy-contact-widget.c:218 +#: ../libempathy-gtk/empathy-individual-widget.c:149 +msgid "Phone number:" +msgstr "Phone number:" + +#: ../libempathy-gtk/empathy-contact-widget.c:219 +#: ../libempathy-gtk/empathy-individual-widget.c:150 +msgid "E-mail address:" +msgstr "E-mail address:" + +#: ../libempathy-gtk/empathy-contact-widget.c:220 +#: ../libempathy-gtk/empathy-individual-widget.c:151 +msgid "Website:" +msgstr "Website:" -#: ../libempathy-gtk/empathy-contact-widget.c:478 +#: ../libempathy-gtk/empathy-contact-widget.c:221 +#: ../libempathy-gtk/empathy-individual-widget.c:152 +msgid "Birthday:" +msgstr "Birthday:" + +#: ../libempathy-gtk/empathy-contact-widget.c:579 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "Country ISO Code:" msgstr "Country ISO Code:" -#: ../libempathy-gtk/empathy-contact-widget.c:480 +#: ../libempathy-gtk/empathy-contact-widget.c:581 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Country:" msgstr "Country:" -#: ../libempathy-gtk/empathy-contact-widget.c:482 +#: ../libempathy-gtk/empathy-contact-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "State:" msgstr "State:" -#: ../libempathy-gtk/empathy-contact-widget.c:484 +#: ../libempathy-gtk/empathy-contact-widget.c:585 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "City:" msgstr "City:" -#: ../libempathy-gtk/empathy-contact-widget.c:486 +#: ../libempathy-gtk/empathy-contact-widget.c:587 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Area:" msgstr "Area:" -#: ../libempathy-gtk/empathy-contact-widget.c:488 +#: ../libempathy-gtk/empathy-contact-widget.c:589 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Postal Code:" msgstr "Postal Code:" -#: ../libempathy-gtk/empathy-contact-widget.c:490 +#: ../libempathy-gtk/empathy-contact-widget.c:591 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Street:" msgstr "Street:" -#: ../libempathy-gtk/empathy-contact-widget.c:492 +#: ../libempathy-gtk/empathy-contact-widget.c:593 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Building:" msgstr "Building:" -#: ../libempathy-gtk/empathy-contact-widget.c:494 +#: ../libempathy-gtk/empathy-contact-widget.c:595 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Floor:" msgstr "Floor:" -#: ../libempathy-gtk/empathy-contact-widget.c:496 +#: ../libempathy-gtk/empathy-contact-widget.c:597 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Room:" msgstr "Room:" -#: ../libempathy-gtk/empathy-contact-widget.c:498 +#: ../libempathy-gtk/empathy-contact-widget.c:599 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:500 +#: ../libempathy-gtk/empathy-contact-widget.c:601 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Description:" msgstr "Description:" -#: ../libempathy-gtk/empathy-contact-widget.c:502 +#: ../libempathy-gtk/empathy-contact-widget.c:603 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:504 +#: ../libempathy-gtk/empathy-contact-widget.c:605 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Accuracy Level:" msgstr "Accuracy Level:" -#: ../libempathy-gtk/empathy-contact-widget.c:506 +#: ../libempathy-gtk/empathy-contact-widget.c:607 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Error:" msgstr "Error:" -#: ../libempathy-gtk/empathy-contact-widget.c:508 +#: ../libempathy-gtk/empathy-contact-widget.c:609 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Vertical Error (meters):" msgstr "Vertical Error (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:510 +#: ../libempathy-gtk/empathy-contact-widget.c:611 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Horizontal Error (meters):" msgstr "Horizontal Error (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:512 +#: ../libempathy-gtk/empathy-contact-widget.c:613 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Speed:" msgstr "Speed:" -#: ../libempathy-gtk/empathy-contact-widget.c:514 +#: ../libempathy-gtk/empathy-contact-widget.c:615 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Bearing:" msgstr "Bearing:" -#: ../libempathy-gtk/empathy-contact-widget.c:516 +#: ../libempathy-gtk/empathy-contact-widget.c:617 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Climb Speed:" msgstr "Climb Speed:" -#: ../libempathy-gtk/empathy-contact-widget.c:518 +#: ../libempathy-gtk/empathy-contact-widget.c:619 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Last Updated on:" msgstr "Last Updated on:" -#: ../libempathy-gtk/empathy-contact-widget.c:520 +#: ../libempathy-gtk/empathy-contact-widget.c:621 +#: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Longitude:" msgstr "Longitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:522 +#: ../libempathy-gtk/empathy-contact-widget.c:623 +#: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Latitude:" msgstr "Latitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:524 +#: ../libempathy-gtk/empathy-contact-widget.c:625 +#: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:587 +#: ../libempathy-gtk/empathy-contact-widget.c:688 +#: ../libempathy-gtk/empathy-individual-widget.c:578 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Location" -#: ../libempathy-gtk/empathy-contact-widget.c:603 +#: ../libempathy-gtk/empathy-contact-widget.c:704 +#: ../libempathy-gtk/empathy-individual-widget.c:594 msgid "<b>Location</b>, " msgstr "<b>Location</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:653 +#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-individual-widget.c:642 msgid "%B %e, %Y at %R UTC" msgstr "%e %B, %Y at %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:736 +#: ../libempathy-gtk/empathy-contact-widget.c:838 +#: ../libempathy-gtk/empathy-individual-widget.c:833 msgid "Save Avatar" msgstr "Save Avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:792 +#: ../libempathy-gtk/empathy-contact-widget.c:894 +#: ../libempathy-gtk/empathy-individual-widget.c:891 msgid "Unable to save avatar" msgstr "Unable to save avatar" @@ -1611,52 +1710,50 @@ msgstr "Unable to save avatar" msgid "<b>Location</b> at (date)\t" msgstr "<b>Location</b> at (date)\t" +#. Alias #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +#: ../libempathy-gtk/empathy-individual-widget.c:1219 msgid "Alias:" msgstr "Alias:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "Birthday:" -msgstr "Birthday:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 msgid "Client Information" msgstr "Client Information" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 msgid "Client:" msgstr "Client:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Contact Details" msgstr "Contact Details" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -msgid "E-mail address:" -msgstr "E-mail address:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -msgid "Full name:" -msgstr "Full name:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 -msgid "Groups" -msgstr "Groups" - #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:12 +#. Translators: Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +#: ../libempathy-gtk/empathy-individual-widget.c:1423 msgid "Identifier:" msgstr "Identifier:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +#: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Information requested…" msgstr "Information requested…" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Version:" +msgstr "Version:" + +#: ../libempathy-gtk/empathy-groups-widget.c:332 +msgid "Groups" +msgstr "Groups" + +#: ../libempathy-gtk/empathy-groups-widget.c:344 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1664,18 +1761,67 @@ msgstr "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 -msgid "Version:" -msgstr "Version:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 -msgid "Website:" -msgstr "Website:" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 +#: ../libempathy-gtk/empathy-groups-widget.c:363 msgid "_Add Group" msgstr "_Add Group" +#: ../libempathy-gtk/empathy-groups-widget.c:397 +msgid "Select" +msgstr "Select" + +#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../src/empathy-main-window.c:1240 +msgid "Group" +msgstr "Group" + +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253 +msgctxt "Unlink individual (button)" +msgid "_Unlink" +msgstr "_Unlink" + +#. Translators: the heading at the top of the Information dialogue +#: ../libempathy-gtk/empathy-individual-information-dialog.c:143 +msgid "Linked Contacts" +msgstr "Linked Contacts" + +#: ../libempathy-gtk/empathy-individual-linker.c:247 +msgid "Select contacts to link" +msgstr "Select contacts to link" + +#: ../libempathy-gtk/empathy-individual-linker.c:304 +msgid "New contact preview" +msgstr "New contact preview" + +#: ../libempathy-gtk/empathy-individual-linker.c:344 +msgid "Contacts selected in the list on the left will be linked together." +msgstr "Contacts selected in the list on the left will be linked together." + +#: ../libempathy-gtk/empathy-individual-menu.c:108 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../libempathy-gtk/empathy-individual-menu.c:799 +msgctxt "Edit individual (contextual menu)" +msgid "_Edit" +msgstr "_Edit" + +#: ../libempathy-gtk/empathy-individual-menu.c:829 +msgctxt "Link individual (contextual menu)" +msgid "_Link…" +msgstr "_Link…" + +#: ../libempathy-gtk/empathy-individual-widget.c:1561 +#, c-format +msgid "Meta-contact containing %u contact" +msgid_plural "Meta-contact containing %u contacts" +msgstr[0] "Meta-contact containing %u contact" +msgstr[1] "Meta-contact containing %u contacts" + +#: ../libempathy-gtk/empathy-individual-widget.ui.h:1 +msgid "<b>Location</b> at (date)" +msgstr "<b>Location</b> at (date)" + #: ../libempathy-gtk/empathy-irc-network-dialog.c:280 msgid "new server" msgstr "new server" @@ -1692,28 +1838,48 @@ msgstr "Port" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:700 -#: ../src/empathy-import-widget.c:310 +#: ../libempathy-gtk/empathy-linking-dialog.c:92 +msgid "Link Contacts" +msgstr "Link Contacts" + +#. Add button +#: ../libempathy-gtk/empathy-linking-dialog.c:102 +msgid "_Link" +msgstr "_Link" + +#: ../libempathy-gtk/empathy-log-window.c:646 +#: ../src/empathy-import-widget.c:312 msgid "Account" msgstr "Account" -#: ../libempathy-gtk/empathy-log-window.c:717 +#: ../libempathy-gtk/empathy-log-window.c:663 msgid "Date" msgstr "Date" -#: ../libempathy-gtk/empathy-log-window.ui.h:1 +#. Tab Label +#: ../libempathy-gtk/empathy-log-window.ui.h:2 msgid "Conversations" msgstr "Conversations" -#: ../libempathy-gtk/empathy-log-window.ui.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 +msgid "Find next" +msgstr "Find Next" + +#: ../libempathy-gtk/empathy-log-window.ui.h:4 +msgid "Find previous" +msgstr "Find Previous" + +#: ../libempathy-gtk/empathy-log-window.ui.h:5 msgid "Previous Conversations" msgstr "Previous Conversations" -#: ../libempathy-gtk/empathy-log-window.ui.h:3 +#. Tab Label +#: ../libempathy-gtk/empathy-log-window.ui.h:7 msgid "Search" msgstr "Search" -#: ../libempathy-gtk/empathy-log-window.ui.h:4 +#. Searching *for* something +#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "_For:" msgstr "_For:" @@ -1722,28 +1888,27 @@ msgid "Contact ID:" msgstr "Contact ID:" #. add chat button -#: ../libempathy-gtk/empathy-new-message-dialog.c:144 +#: ../libempathy-gtk/empathy-new-message-dialog.c:145 msgid "C_hat" msgstr "C_hat" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:154 +#: ../libempathy-gtk/empathy-new-message-dialog.c:155 msgid "New Conversation" msgstr "New Conversation" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:188 +#: ../libempathy-gtk/empathy-new-call-dialog.c:205 msgid "Send _Video" msgstr "Send _Video" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:196 -#: ../src/empathy-call-window.ui.h:17 -msgid "_Call" -msgstr "_Call" +#: ../libempathy-gtk/empathy-new-call-dialog.c:213 +msgid "C_all" +msgstr "C_all" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:206 +#: ../libempathy-gtk/empathy-new-call-dialog.c:223 msgid "New Call" msgstr "New Call" @@ -1780,7 +1945,7 @@ msgid "Set your presence and current status" msgstr "Set your presence and current status" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1128 +#: ../libempathy-gtk/empathy-presence-chooser.c:1124 msgid "Custom messages…" msgstr "Custom messages…" @@ -1796,43 +1961,43 @@ msgstr "Match case" msgid "Phrase not found" msgstr "Phrase not found" -#: ../libempathy-gtk/empathy-sound.c:51 +#: ../libempathy-gtk/empathy-sound.c:50 msgid "Received an instant message" msgstr "Received an instant message" -#: ../libempathy-gtk/empathy-sound.c:53 +#: ../libempathy-gtk/empathy-sound.c:52 msgid "Sent an instant message" msgstr "Sent an instant message" -#: ../libempathy-gtk/empathy-sound.c:55 +#: ../libempathy-gtk/empathy-sound.c:54 msgid "Incoming chat request" msgstr "Incoming chat request" -#: ../libempathy-gtk/empathy-sound.c:57 +#: ../libempathy-gtk/empathy-sound.c:56 msgid "Contact connected" msgstr "Contact connected" -#: ../libempathy-gtk/empathy-sound.c:59 +#: ../libempathy-gtk/empathy-sound.c:58 msgid "Contact disconnected" msgstr "Contact disconnected" -#: ../libempathy-gtk/empathy-sound.c:61 +#: ../libempathy-gtk/empathy-sound.c:60 msgid "Connected to server" msgstr "Connected to server" -#: ../libempathy-gtk/empathy-sound.c:63 +#: ../libempathy-gtk/empathy-sound.c:62 msgid "Disconnected from server" msgstr "Disconnected from server" -#: ../libempathy-gtk/empathy-sound.c:65 +#: ../libempathy-gtk/empathy-sound.c:64 msgid "Incoming voice call" msgstr "Incoming voice call" -#: ../libempathy-gtk/empathy-sound.c:67 +#: ../libempathy-gtk/empathy-sound.c:66 msgid "Outgoing voice call" msgstr "Outgoing voice call" -#: ../libempathy-gtk/empathy-sound.c:69 +#: ../libempathy-gtk/empathy-sound.c:68 msgid "Voice call ended" msgstr "Voice call ended" @@ -1868,17 +2033,88 @@ msgstr "Clean" msgid "Blue" msgstr "Blue" -#: ../libempathy-gtk/empathy-ui-utils.c:1501 +#: ../libempathy-gtk/empathy-tls-dialog.c:150 +msgid "The identity provided by the chat server cannot be verified.\n" +msgstr "The identity provided by the chat server cannot be verified.\n" + +#: ../libempathy-gtk/empathy-tls-dialog.c:156 +msgid "The certrificate is not signed by a Certification Authority" +msgstr "The certrificate is not signed by a Certification Authority" + +#: ../libempathy-gtk/empathy-tls-dialog.c:160 +msgid "The certificate is expired" +msgstr "The certificate has expired" + +#: ../libempathy-gtk/empathy-tls-dialog.c:163 +msgid "The certificate hasn't yet been activated" +msgstr "The certificate hasn't yet been activated" + +#: ../libempathy-gtk/empathy-tls-dialog.c:166 +msgid "The certificate does not have the expected fingerprint" +msgstr "The certificate does not have the expected fingerprint" + +#: ../libempathy-gtk/empathy-tls-dialog.c:169 +msgid "The hostname verified by the certificate doesn't match the server name" +msgstr "The hostname verified by the certificate doesn't match the server name" + +#: ../libempathy-gtk/empathy-tls-dialog.c:173 +msgid "The certificate is self-signed" +msgstr "The certificate is self-signed" + +#: ../libempathy-gtk/empathy-tls-dialog.c:176 +msgid "The certificate has been revoked by the issuing Certification Authority" +msgstr "The certificate has been revoked by the issuing Certification Authority" + +#: ../libempathy-gtk/empathy-tls-dialog.c:180 +msgid "The certificate is cryptographically weak" +msgstr "The certificate is cryptographically weak" + +#: ../libempathy-gtk/empathy-tls-dialog.c:183 +msgid "The certificate length exceeds verifiable limits" +msgstr "The certificate length exceeds verifiable limits" + +#: ../libempathy-gtk/empathy-tls-dialog.c:187 +msgid "The certificate is malformed" +msgstr "The certificate is malformed" + +#: ../libempathy-gtk/empathy-tls-dialog.c:205 +#, c-format +msgid "Expected hostname: %s" +msgstr "Expected hostname: %s" + +#: ../libempathy-gtk/empathy-tls-dialog.c:208 +#, c-format +msgid "Certificate hostname: %s" +msgstr "Certificate hostname: %s" + +#: ../libempathy-gtk/empathy-tls-dialog.c:263 +msgid "Continue" +msgstr "Continue" + +#: ../libempathy-gtk/empathy-tls-dialog.c:269 +msgid "This connection is untrusted, would you like to continue anyway?" +msgstr "This connection is untrusted. Would you like to continue anyway?" + +#: ../libempathy-gtk/empathy-tls-dialog.c:286 +msgid "Remember this choice for future connections" +msgstr "Remember this choice for future connections" + +#: ../libempathy-gtk/empathy-tls-dialog.c:294 +msgid "Certificate Details" +msgstr "Certificate Details" + +#: ../libempathy-gtk/empathy-ui-utils.c:1698 msgid "Unable to open URI" msgstr "Unable to open URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1618 +#: ../libempathy-gtk/empathy-ui-utils.c:1793 msgid "Select a file" msgstr "Select a file" -#: ../libempathy-gtk/empathy-ui-utils.c:1682 -msgid "Select a destination" -msgstr "Select a destination" +#: ../libempathy-gtk/empathy-ui-utils.c:1862 +#, c-format +msgid "Incoming file from %s" +msgstr "Incoming file from %s" #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" @@ -2059,19 +2295,20 @@ msgstr "The selected contact is offline." msgid "No error message" msgstr "No error message" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259 msgid "Instant Message (Empathy)" msgstr "Instant Message (Empathy)" -#: ../src/empathy.c:596 +#: ../src/empathy.c:414 msgid "Don't connect on startup" msgstr "Don't connect on startup" -#: ../src/empathy.c:600 +#: ../src/empathy.c:418 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Don't display the contact list or any other dialogues on startup" -#: ../src/empathy.c:612 +#: ../src/empathy.c:435 msgid "- Empathy IM Client" msgstr "- Empathy IM Client" @@ -2150,7 +2387,7 @@ msgstr "" "this assistant and add accounts later from the Edit menu." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1303 +#: ../src/empathy-account-assistant.c:1310 msgid "An error occurred" msgstr "An error occurred" @@ -2159,36 +2396,36 @@ msgstr "An error occurred" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580 +#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614 #, c-format msgid "New %s account" msgstr "New %s account" -#: ../src/empathy-account-assistant.c:508 +#: ../src/empathy-account-assistant.c:509 msgid "What kind of chat account do you have?" msgstr "What kind of chat account do you have?" -#: ../src/empathy-account-assistant.c:514 +#: ../src/empathy-account-assistant.c:515 msgid "Do you have any other chat accounts you want to set up?" msgstr "Do you have any other chat accounts you want to set up?" -#: ../src/empathy-account-assistant.c:520 +#: ../src/empathy-account-assistant.c:521 msgid "Enter your account details" msgstr "Enter your account details" -#: ../src/empathy-account-assistant.c:525 +#: ../src/empathy-account-assistant.c:526 msgid "What kind of chat account do you want to create?" msgstr "What kind of chat account do you want to create?" -#: ../src/empathy-account-assistant.c:531 +#: ../src/empathy-account-assistant.c:532 msgid "Do you want to create other chat accounts?" msgstr "Do you want to create other chat accounts?" -#: ../src/empathy-account-assistant.c:538 +#: ../src/empathy-account-assistant.c:539 msgid "Enter the details for the new account" msgstr "Enter the details for the new account" -#: ../src/empathy-account-assistant.c:653 +#: ../src/empathy-account-assistant.c:654 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -2200,41 +2437,41 @@ msgstr "" "programs. With a microphone or a webcam you can also have audio or video " "calls." -#: ../src/empathy-account-assistant.c:670 +#: ../src/empathy-account-assistant.c:671 msgid "Do you have an account you've been using with another chat program?" msgstr "Do you have an account you've been using with another chat program?" -#: ../src/empathy-account-assistant.c:693 +#: ../src/empathy-account-assistant.c:694 msgid "Yes, import my account details from " msgstr "Yes, import my account details from " -#: ../src/empathy-account-assistant.c:714 +#: ../src/empathy-account-assistant.c:715 msgid "Yes, I'll enter my account details now" msgstr "Yes, I'll enter my account details now" -#: ../src/empathy-account-assistant.c:736 +#: ../src/empathy-account-assistant.c:737 msgid "No, I want a new account" msgstr "No, I want a new account" -#: ../src/empathy-account-assistant.c:746 +#: ../src/empathy-account-assistant.c:747 msgid "No, I just want to see people online nearby for now" msgstr "No, I just want to see people online nearby for now" -#: ../src/empathy-account-assistant.c:767 +#: ../src/empathy-account-assistant.c:768 msgid "Select the accounts you want to import:" msgstr "Select the accounts you want to import:" -#: ../src/empathy-account-assistant.c:851 -#: ../src/empathy-new-chatroom-dialog.c:541 -#: ../src/empathy-new-chatroom-dialog.c:542 +#: ../src/empathy-account-assistant.c:852 +#: ../src/empathy-new-chatroom-dialog.c:607 +#: ../src/empathy-new-chatroom-dialog.c:608 msgid "Yes" msgstr "Yes" -#: ../src/empathy-account-assistant.c:858 +#: ../src/empathy-account-assistant.c:859 msgid "No, that's all for now" msgstr "No, that's all for now" -#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1124 msgid "" "Empathy can automatically discover and chat with the people connected on the " "same network as you. If you want to use this feature, please check that the " @@ -2246,16 +2483,16 @@ msgstr "" "details below are correct. You can easily change these details later or " "disable this feature by using the 'Accounts' dialogue" -#: ../src/empathy-account-assistant.c:1123 -#: ../src/empathy-account-assistant.c:1179 +#: ../src/empathy-account-assistant.c:1130 +#: ../src/empathy-account-assistant.c:1186 msgid "Edit->Accounts" msgstr "Edit->Accounts" -#: ../src/empathy-account-assistant.c:1139 +#: ../src/empathy-account-assistant.c:1146 msgid "I don't want to enable this feature for now" msgstr "I don't want to enable this feature for now" -#: ../src/empathy-account-assistant.c:1175 +#: ../src/empathy-account-assistant.c:1182 msgid "" "You won't be able to chat with people connected to your local network, as " "telepathy-salut is not installed. If you want to enable this feature, please " @@ -2267,66 +2504,66 @@ msgstr "" "install the telepathy-salut package and create a People Nearby account from " "the Accounts dialogue" -#: ../src/empathy-account-assistant.c:1181 +#: ../src/empathy-account-assistant.c:1188 msgid "telepathy-salut not installed" msgstr "telepathy-salut not installed" -#: ../src/empathy-account-assistant.c:1227 +#: ../src/empathy-account-assistant.c:1234 msgid "Messaging and VoIP Accounts Assistant" msgstr "Messaging and VoIP Accounts Assistant" -#: ../src/empathy-account-assistant.c:1261 +#: ../src/empathy-account-assistant.c:1268 msgid "Welcome to Empathy" msgstr "Welcome to Empathy" -#: ../src/empathy-account-assistant.c:1270 +#: ../src/empathy-account-assistant.c:1277 msgid "Import your existing accounts" msgstr "Import your existing accounts" -#: ../src/empathy-account-assistant.c:1288 +#: ../src/empathy-account-assistant.c:1295 msgid "Please enter personal details" msgstr "Please enter personal details" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:66 +#: ../src/empathy-accounts-dialog.c:65 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "There are unsaved modifications to your %s account." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:70 +#: ../src/empathy-accounts-dialog.c:69 msgid "Your new account has not been saved yet." msgstr "Your new account has not been saved yet." -#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729 +#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808 msgid "Connecting…" msgstr "Connecting…" -#: ../src/empathy-accounts-dialog.c:290 -#, c-format -msgid "Disconnected — %s" -msgstr "Disconnected — %s" - -#: ../src/empathy-accounts-dialog.c:295 +#: ../src/empathy-accounts-dialog.c:322 #, c-format msgid "Offline — %s" msgstr "Offline — %s" -#: ../src/empathy-accounts-dialog.c:308 +#: ../src/empathy-accounts-dialog.c:334 +#, c-format +msgid "Disconnected — %s" +msgstr "Disconnected — %s" + +#: ../src/empathy-accounts-dialog.c:345 msgid "Offline — No Network Connection" msgstr "Offline — No Network Connection" -#: ../src/empathy-accounts-dialog.c:316 +#: ../src/empathy-accounts-dialog.c:352 msgid "Unknown Status" msgstr "Unknown Status" -#: ../src/empathy-accounts-dialog.c:327 +#: ../src/empathy-accounts-dialog.c:364 msgid "Offline — Account Disabled" msgstr "Offline — Account Disabled" -#: ../src/empathy-accounts-dialog.c:768 +#: ../src/empathy-accounts-dialog.c:805 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2334,16 +2571,16 @@ msgstr "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" -#: ../src/empathy-accounts-dialog.c:1115 +#: ../src/empathy-accounts-dialog.c:1152 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Do you want to remove %s from your computer?" -#: ../src/empathy-accounts-dialog.c:1119 +#: ../src/empathy-accounts-dialog.c:1156 msgid "This will not remove your account on the server." msgstr "This will not remove your account on the server." -#: ../src/empathy-accounts-dialog.c:1356 +#: ../src/empathy-accounts-dialog.c:1394 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2351,7 +2588,7 @@ msgstr "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" -#: ../src/empathy-accounts-dialog.c:1933 +#: ../src/empathy-accounts-dialog.c:1997 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2360,14 +2597,18 @@ msgstr "" "your changes. Are you sure you want to proceed?" #: ../src/empathy-accounts-dialog.ui.h:1 +msgid "<b><span size='xx-large'>Loading account information</span></b>" +msgstr "<b><span size='xx-large'>Loading account information</span></b>" + +#: ../src/empathy-accounts-dialog.ui.h:2 msgid "No protocol installed" msgstr "No protocol installed" -#: ../src/empathy-accounts-dialog.ui.h:2 +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "Protocol:" msgstr "Protocol:" -#: ../src/empathy-accounts-dialog.ui.h:3 +#: ../src/empathy-accounts-dialog.ui.h:4 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." @@ -2375,70 +2616,126 @@ msgstr "" "To add a new account, you first have to install a backend for each protocol " "you want to use." -#: ../src/empathy-accounts-dialog.ui.h:4 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "_Add…" msgstr "_Add…" -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:6 msgid "_Import…" msgstr "_Import…" -#: ../src/empathy-call-window.c:453 +#: ../src/empathy-accounts-dialog.ui.h:8 +msgid "page 1" +msgstr "page 1" + +#: ../src/empathy-accounts-dialog.ui.h:9 +msgid "page 2" +msgstr "page 2" + +#: ../src/empathy-accounts-dialog.ui.h:10 +msgid "page 3" +msgstr "page 3" + +#: ../src/empathy-auth-client.c:217 +msgid " - Empathy authentication client" +msgstr " - Empathy authentication client" + +#: ../src/empathy-auth-client.c:233 +msgid "Empathy authentication client" +msgstr "Empathy authentication client" + +#: ../src/empathy-auto-salut-account-helper.c:83 +msgid "People nearby" +msgstr "People nearby" + +#: ../src/empathy-av.c:133 +msgid "- Empathy Audio/Video Client" +msgstr "- Empathy Audio/Video Client" + +#: ../src/empathy-av.c:149 +msgid "Empathy Audio/Video Client" +msgstr "Empathy Audio/Video Client" + +#: ../src/empathy-call-window.c:479 msgid "Contrast" msgstr "Contrast" -#: ../src/empathy-call-window.c:456 +#: ../src/empathy-call-window.c:482 msgid "Brightness" msgstr "Brightness" -#: ../src/empathy-call-window.c:459 +#: ../src/empathy-call-window.c:485 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:567 +#: ../src/empathy-call-window.c:590 msgid "Volume" msgstr "Volume" -#: ../src/empathy-call-window.c:1022 +#: ../src/empathy-call-window.c:1163 msgid "_Sidebar" msgstr "_Sidebar" -#: ../src/empathy-call-window.c:1041 +#: ../src/empathy-call-window.c:1182 msgid "Audio input" msgstr "Audio input" -#: ../src/empathy-call-window.c:1045 +#: ../src/empathy-call-window.c:1186 msgid "Video input" msgstr "Video input" -#: ../src/empathy-call-window.c:1049 +#: ../src/empathy-call-window.c:1190 msgid "Dialpad" msgstr "Dialpad" +#: ../src/empathy-call-window.c:1195 +msgid "Details" +msgstr "Details" + #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1117 +#: ../src/empathy-call-window.c:1263 #, c-format msgid "Call with %s" msgstr "Call with %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:1198 +#: ../src/empathy-call-window.c:1342 msgid "Call" msgstr "Call" +#: ../src/empathy-call-window.c:1496 +msgid "The IP address as seen by the machine" +msgstr "The IP address as seen by the machine" + +#: ../src/empathy-call-window.c:1498 +msgid "The IP address as seen by a server on the Internet" +msgstr "The IP address as seen by a server on the Internet" + +#: ../src/empathy-call-window.c:1500 +msgid "The IP address of the peer as seen by the other side" +msgstr "The IP address of the peer as seen by the other side" + +#: ../src/empathy-call-window.c:1502 +msgid "The IP address of a relay server" +msgstr "The IP address of a relay server" + +#: ../src/empathy-call-window.c:1504 +msgid "The IP address of the multicast group" +msgstr "The IP address of the multicast group" + #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1695 +#: ../src/empathy-call-window.c:2237 #, c-format msgid "Connected — %d:%02dm" msgstr "Connected — %d:%02dm" -#: ../src/empathy-call-window.c:1756 +#: ../src/empathy-call-window.c:2298 msgid "Technical Details" msgstr "Technical Details" -#: ../src/empathy-call-window.c:1794 +#: ../src/empathy-call-window.c:2336 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -2447,7 +2744,7 @@ msgstr "" "%s's software does not understand any of the audio formats supported by your " "computer" -#: ../src/empathy-call-window.c:1799 +#: ../src/empathy-call-window.c:2341 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -2456,7 +2753,7 @@ msgstr "" "%s's software does not understand any of the video formats supported by your " "computer" -#: ../src/empathy-call-window.c:1805 +#: ../src/empathy-call-window.c:2347 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -2465,23 +2762,23 @@ msgstr "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." -#: ../src/empathy-call-window.c:1811 +#: ../src/empathy-call-window.c:2353 msgid "There was a failure on the network" msgstr "There was a failure on the network" -#: ../src/empathy-call-window.c:1815 +#: ../src/empathy-call-window.c:2357 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "The audio formats necessary for this call are not installed on your computer" -#: ../src/empathy-call-window.c:1818 +#: ../src/empathy-call-window.c:2360 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "The video formats necessary for this call are not installed on your computer" -#: ../src/empathy-call-window.c:1828 +#: ../src/empathy-call-window.c:2370 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -2492,115 +2789,147 @@ msgstr "" "\">report this bug</a> and attach logs gathered from the 'Debug' window in " "the Help menu." -#: ../src/empathy-call-window.c:1836 +#: ../src/empathy-call-window.c:2378 msgid "There was a failure in the call engine" msgstr "There was a failure in the call engine" -#: ../src/empathy-call-window.c:1875 +#: ../src/empathy-call-window.c:2381 +msgid "The end of the stream was reached" +msgstr "The end of the stream was reached" + +#: ../src/empathy-call-window.c:2421 msgid "Can't establish audio stream" msgstr "Can't establish audio stream" -#: ../src/empathy-call-window.c:1885 +#: ../src/empathy-call-window.c:2431 msgid "Can't establish video stream" msgstr "Can't establish video stream" #: ../src/empathy-call-window.ui.h:1 +msgid "Audio" +msgstr "Audio" + +#: ../src/empathy-call-window.ui.h:2 msgid "Call the contact again" msgstr "Call the contact again" -#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:3 msgid "Camera Off" msgstr "Camera Off" -#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-call-window.ui.h:4 msgid "Camera On" msgstr "Camera On" -#: ../src/empathy-call-window.ui.h:4 +#: ../src/empathy-call-window.ui.h:5 +msgid "Decoding Codec:" +msgstr "Decoding Codec:" + +#: ../src/empathy-call-window.ui.h:6 msgid "Disable camera and stop sending video" msgstr "Disable camera and stop sending video" -#: ../src/empathy-call-window.ui.h:5 +#: ../src/empathy-call-window.ui.h:7 msgid "Enable camera and send video" msgstr "Enable camera and send video" -#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:8 msgid "Enable camera but don't send video" msgstr "Enable camera but don't send video" -#: ../src/empathy-call-window.ui.h:7 +#: ../src/empathy-call-window.ui.h:9 +msgid "Encoding Codec:" +msgstr "Encoding Codec:" + +#: ../src/empathy-call-window.ui.h:10 msgid "Hang up" msgstr "Hang up" -#: ../src/empathy-call-window.ui.h:8 +#: ../src/empathy-call-window.ui.h:11 msgid "Hang up current call" msgstr "Hang up current call" -#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-call-window.ui.h:12 +msgid "Local Candidate:" +msgstr "Local Candidate:" + +#: ../src/empathy-call-window.ui.h:13 msgid "Preview" msgstr "Preview" -#: ../src/empathy-call-window.ui.h:10 +#: ../src/empathy-call-window.ui.h:14 msgid "Redial" msgstr "Redial" -#: ../src/empathy-call-window.ui.h:11 +#: ../src/empathy-call-window.ui.h:15 +msgid "Remote Candidate:" +msgstr "Remote Candidate:" + +#: ../src/empathy-call-window.ui.h:16 msgid "Send Audio" msgstr "Send Audio" -#: ../src/empathy-call-window.ui.h:12 +#: ../src/empathy-call-window.ui.h:17 msgid "Toggle audio transmission" msgstr "Toggle audio transmission" -#: ../src/empathy-call-window.ui.h:13 +#: ../src/empathy-call-window.ui.h:19 msgid "V_ideo" msgstr "V_ideo" -#: ../src/empathy-call-window.ui.h:14 +#: ../src/empathy-call-window.ui.h:20 +msgid "Video" +msgstr "Video" + +#: ../src/empathy-call-window.ui.h:21 msgid "Video Off" msgstr "Video Off" -#: ../src/empathy-call-window.ui.h:15 +#: ../src/empathy-call-window.ui.h:22 msgid "Video On" msgstr "Video On" -#: ../src/empathy-call-window.ui.h:16 +#: ../src/empathy-call-window.ui.h:23 msgid "Video Preview" msgstr "Video Preview" -#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28 +#: ../src/empathy-call-window.ui.h:24 +msgid "_Call" +msgstr "_Call" + +#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27 msgid "_View" msgstr "_View" -#: ../src/empathy-chat-window.c:440 ../src/empathy-chat-window.c:460 +#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d unread)" msgstr[1] "%s (%d unread)" -#: ../src/empathy-chat-window.c:452 +#: ../src/empathy-chat-window.c:464 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (and %u other)" msgstr[1] "%s (and %u others)" -#: ../src/empathy-chat-window.c:468 +#: ../src/empathy-chat-window.c:480 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d unread from others)" msgstr[1] "%s (%d unread from others)" -#: ../src/empathy-chat-window.c:477 +#: ../src/empathy-chat-window.c:489 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d unread from all)" msgstr[1] "%s (%d unread from all)" -#: ../src/empathy-chat-window.c:688 +#: ../src/empathy-chat-window.c:695 msgid "Typing a message." msgstr "Typing a message." @@ -2632,55 +2961,63 @@ msgstr "Move Tab _Left" msgid "Move Tab _Right" msgstr "Move Tab _Right" -#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-chat-window.ui.h:8 +msgid "Notify for All Messages" +msgstr "Notify for All Messages" + +#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16 msgid "_Contents" msgstr "_Contents" -#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-chat-window.ui.h:10 msgid "_Conversation" msgstr "_Conversation" -#: ../src/empathy-chat-window.ui.h:10 +#: ../src/empathy-chat-window.ui.h:11 msgid "_Detach Tab" msgstr "_Detach Tab" -#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18 msgid "_Edit" msgstr "_Edit" -#: ../src/empathy-chat-window.ui.h:12 +#: ../src/empathy-chat-window.ui.h:13 msgid "_Favorite Chat Room" msgstr "_Favourite Chat Room" -#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20 msgid "_Help" msgstr "_Help" -#: ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:15 msgid "_Next Tab" msgstr "_Next Tab" -#: ../src/empathy-chat-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:16 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5 +#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5 msgid "_Show Contact List" msgstr "_Show Contact List" -#: ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-chat-window.ui.h:18 msgid "_Tabs" msgstr "_Tabs" -#: ../src/empathy-chatrooms-window.c:256 +#: ../src/empathy-chat-window.ui.h:19 +msgid "_Undo Close Tab" +msgstr "_Undo Close Tab" + +#: ../src/empathy-chatrooms-window.c:241 msgid "Name" msgstr "Name" -#: ../src/empathy-chatrooms-window.c:274 +#: ../src/empathy-chatrooms-window.c:259 msgid "Room" msgstr "Room" -#: ../src/empathy-chatrooms-window.c:282 +#: ../src/empathy-chatrooms-window.c:267 msgid "Auto-Connect" msgstr "Auto-Connect" @@ -2688,76 +3025,86 @@ msgstr "Auto-Connect" msgid "Manage Favorite Rooms" msgstr "Manage Favourite Rooms" -#: ../src/empathy-event-manager.c:339 +#: ../src/empathy-event-manager.c:468 msgid "Incoming video call" msgstr "Incoming video call" -#: ../src/empathy-event-manager.c:339 +#: ../src/empathy-event-manager.c:468 msgid "Incoming call" msgstr "Incoming call" -#: ../src/empathy-event-manager.c:343 +#: ../src/empathy-event-manager.c:472 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s is video calling you. Do you want to answer?" -#: ../src/empathy-event-manager.c:344 +#: ../src/empathy-event-manager.c:473 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s is calling you. Do you want to answer?" -#: ../src/empathy-event-manager.c:366 +#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618 +#, c-format +msgid "Incoming call from %s" +msgstr "Incoming call from %s" + +#: ../src/empathy-event-manager.c:501 msgid "_Reject" msgstr "_Reject" -#: ../src/empathy-event-manager.c:372 +#: ../src/empathy-event-manager.c:507 msgid "_Answer" msgstr "_Answer" -#: ../src/empathy-event-manager.c:489 +#: ../src/empathy-event-manager.c:618 #, c-format msgid "Incoming video call from %s" msgstr "Incoming video call from %s" -#: ../src/empathy-event-manager.c:489 -#, c-format -msgid "Incoming call from %s" -msgstr "Incoming call from %s" - -#: ../src/empathy-event-manager.c:579 +#: ../src/empathy-event-manager.c:695 msgid "Room invitation" msgstr "Room invitation" -#: ../src/empathy-event-manager.c:582 +#: ../src/empathy-event-manager.c:697 +#, c-format +msgid "Invitation to join %s" +msgstr "Invitation to join %s" + +#: ../src/empathy-event-manager.c:704 #, c-format msgid "%s is inviting you to join %s" msgstr "%s is inviting you to join %s" -#: ../src/empathy-event-manager.c:590 +#: ../src/empathy-event-manager.c:712 msgid "_Decline" msgstr "_Decline" -#: ../src/empathy-event-manager.c:595 +#: ../src/empathy-event-manager.c:717 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Join" -#: ../src/empathy-event-manager.c:634 +#: ../src/empathy-event-manager.c:743 #, c-format msgid "%s invited you to join %s" msgstr "%s invited you to join %s" -#: ../src/empathy-event-manager.c:660 +#: ../src/empathy-event-manager.c:749 +#, c-format +msgid "You have been invited to join %s" +msgstr "You have been invited to join %s" + +#: ../src/empathy-event-manager.c:797 #, c-format msgid "Incoming file transfer from %s" msgstr "Incoming file transfer from %s" -#: ../src/empathy-event-manager.c:818 +#: ../src/empathy-event-manager.c:1005 #, c-format msgid "Subscription requested by %s" msgstr "Subscription requested by %s" -#: ../src/empathy-event-manager.c:822 +#: ../src/empathy-event-manager.c:1009 #, c-format msgid "" "\n" @@ -2766,118 +3113,116 @@ msgstr "" "\n" "Message: %s" -#. someone is logging off -#: ../src/empathy-event-manager.c:862 +#: ../src/empathy-event-manager.c:1052 #, c-format msgid "%s is now offline." msgstr "%s is now offline." -#. someone is logging in -#: ../src/empathy-event-manager.c:878 +#: ../src/empathy-event-manager.c:1072 #, c-format msgid "%s is now online." msgstr "%s is now online." #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:100 +#: ../src/empathy-ft-manager.c:99 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:103 +#: ../src/empathy-ft-manager.c:102 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:179 +#: ../src/empathy-ft-manager.c:178 msgctxt "file transfer percent" msgid "Unknown" msgstr "Unknown" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:273 #, c-format msgid "%s of %s at %s/s" msgstr "%s of %s at %s/s" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s" msgstr "%s of %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:306 +#: ../src/empathy-ft-manager.c:305 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Receiving \"%s\" from %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:309 +#: ../src/empathy-ft-manager.c:308 #, c-format msgid "Sending \"%s\" to %s" msgstr "Sending \"%s\" to %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:339 +#: ../src/empathy-ft-manager.c:338 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Error receiving \"%s\" from %s" -#: ../src/empathy-ft-manager.c:342 +#: ../src/empathy-ft-manager.c:341 msgid "Error receiving a file" msgstr "Error receiving a file" -#: ../src/empathy-ft-manager.c:347 +#: ../src/empathy-ft-manager.c:346 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Error sending \"%s\" to %s" -#: ../src/empathy-ft-manager.c:350 +#: ../src/empathy-ft-manager.c:349 msgid "Error sending a file" msgstr "Error sending a file" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:489 +#: ../src/empathy-ft-manager.c:488 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" received from %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:494 +#: ../src/empathy-ft-manager.c:493 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" sent to %s" -#: ../src/empathy-ft-manager.c:497 +#: ../src/empathy-ft-manager.c:496 msgid "File transfer completed" msgstr "File transfer completed" -#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783 +#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782 msgid "Waiting for the other participant's response" msgstr "Waiting for the other participant's response" -#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 +#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Checking integrity of \"%s\"" -#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 +#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 #, c-format msgid "Hashing \"%s\"" msgstr "Hashing \"%s\"" -#: ../src/empathy-ft-manager.c:991 +#: ../src/empathy-ft-manager.c:996 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1003 +#: ../src/empathy-ft-manager.c:1008 msgid "File" msgstr "File" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1030 msgid "Remaining" msgstr "Remaining" @@ -2902,138 +3247,138 @@ msgid "Import Accounts" msgstr "Import Accounts" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:290 +#: ../src/empathy-import-widget.c:292 msgid "Import" msgstr "Import" -#: ../src/empathy-import-widget.c:299 +#: ../src/empathy-import-widget.c:301 msgid "Protocol" msgstr "Protocol" -#: ../src/empathy-import-widget.c:323 +#: ../src/empathy-import-widget.c:325 msgid "Source" msgstr "Source" -#: ../src/empathy-import-mc4-accounts.c:106 -#, c-format -msgid "%s account" -msgstr "%s account" +#. Labels for empty contact list +#: ../src/empathy-main-window.c:95 +msgid "No match found" +msgstr "No match found" -#: ../src/empathy-main-window.c:437 +#: ../src/empathy-main-window.c:528 msgid "Reconnect" msgstr "Reconnect" -#: ../src/empathy-main-window.c:443 +#: ../src/empathy-main-window.c:534 msgid "Edit Account" msgstr "Edit Account" -#: ../src/empathy-main-window.c:449 +#: ../src/empathy-main-window.c:540 msgid "Close" msgstr "Close" -#: ../src/empathy-main-window.c:1033 +#: ../src/empathy-main-window.c:1222 msgid "Contact" msgstr "Contact" -#: ../src/empathy-main-window.c:1414 +#: ../src/empathy-main-window.c:1547 +msgid "Contact List" +msgstr "Contact List" + +#: ../src/empathy-main-window.c:1656 msgid "Show and edit accounts" msgstr "Show and edit accounts" #: ../src/empathy-main-window.ui.h:1 -msgid "Contact List" -msgstr "Contact List" - -#: ../src/empathy-main-window.ui.h:2 msgid "Contacts on a _Map" msgstr "Contacts on a _Map" -#: ../src/empathy-main-window.ui.h:3 +#: ../src/empathy-main-window.ui.h:2 msgid "Context" msgstr "Context" -#: ../src/empathy-main-window.ui.h:4 +#: ../src/empathy-main-window.ui.h:3 msgid "Join _Favorites" msgstr "Join _Favourites" -#: ../src/empathy-main-window.ui.h:5 +#: ../src/empathy-main-window.ui.h:4 msgid "Manage Favorites" msgstr "Manage Favourites" -#: ../src/empathy-main-window.ui.h:6 +#: ../src/empathy-main-window.ui.h:5 msgid "N_ormal Size" msgstr "N_ormal Size" -#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 msgid "New _Call…" msgstr "New _Call…" -#: ../src/empathy-main-window.ui.h:8 +#: ../src/empathy-main-window.ui.h:7 msgid "Normal Size With _Avatars" msgstr "Normal Size With _Avatars" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:8 msgid "P_references" msgstr "P_references" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:9 msgid "Show P_rotocols" msgstr "Show P_rotocols" -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:10 msgid "Sort by _Name" msgstr "Sort by _Name" -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window.ui.h:11 msgid "Sort by _Status" msgstr "Sort by _Status" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window.ui.h:12 msgid "_Accounts" msgstr "_Accounts" -#: ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-main-window.ui.h:15 msgid "_Compact Size" msgstr "_Compact Size" -#: ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-main-window.ui.h:17 msgid "_Debug" msgstr "_Debug" -#: ../src/empathy-main-window.ui.h:20 +#: ../src/empathy-main-window.ui.h:19 msgid "_File Transfers" msgstr "_File Transfers" -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:21 msgid "_Join…" msgstr "_Join…" -#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3 msgid "_New Conversation…" msgstr "_New Conversation…" -#: ../src/empathy-main-window.ui.h:24 +#: ../src/empathy-main-window.ui.h:23 msgid "_Offline Contacts" msgstr "_Offline Contacts" -#: ../src/empathy-main-window.ui.h:25 +#: ../src/empathy-main-window.ui.h:24 msgid "_Personal Information" msgstr "_Personal Information" -#: ../src/empathy-main-window.ui.h:27 +#: ../src/empathy-main-window.ui.h:26 msgid "_Room" msgstr "_Room" -#: ../src/empathy-new-chatroom-dialog.c:338 +#: ../src/empathy-new-chatroom-dialog.c:379 msgid "Chat Room" msgstr "Chat Room" -#: ../src/empathy-new-chatroom-dialog.c:354 +#: ../src/empathy-new-chatroom-dialog.c:395 msgid "Members" msgstr "Members" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:539 +#: ../src/empathy-new-chatroom-dialog.c:605 #, c-format msgid "" "<b>%s</b>\n" @@ -3046,16 +3391,16 @@ msgstr "" "Password required: %s\n" "Members: %s" -#: ../src/empathy-new-chatroom-dialog.c:541 -#: ../src/empathy-new-chatroom-dialog.c:542 +#: ../src/empathy-new-chatroom-dialog.c:607 +#: ../src/empathy-new-chatroom-dialog.c:608 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:569 +#: ../src/empathy-new-chatroom-dialog.c:635 msgid "Could not start room listing" msgstr "Could not start room listing" -#: ../src/empathy-new-chatroom-dialog.c:579 +#: ../src/empathy-new-chatroom-dialog.c:645 msgid "Could not stop room listing" msgstr "Could not stop room listing" @@ -3089,62 +3434,66 @@ msgstr "Room List" msgid "_Room:" msgstr "_Room:" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:138 msgid "Message received" msgstr "Message received" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:139 msgid "Message sent" msgstr "Message sent" -#: ../src/empathy-preferences.c:150 +#: ../src/empathy-preferences.c:140 msgid "New conversation" msgstr "New conversation" -#: ../src/empathy-preferences.c:151 +#: ../src/empathy-preferences.c:141 msgid "Contact goes online" msgstr "Contact goes online" -#: ../src/empathy-preferences.c:152 +#: ../src/empathy-preferences.c:142 msgid "Contact goes offline" msgstr "Contact goes offline" -#: ../src/empathy-preferences.c:153 +#: ../src/empathy-preferences.c:143 msgid "Account connected" msgstr "Account connected" -#: ../src/empathy-preferences.c:154 +#: ../src/empathy-preferences.c:144 msgid "Account disconnected" msgstr "Account disconnected" -#: ../src/empathy-preferences.c:394 +#: ../src/empathy-preferences.c:445 msgid "Language" msgstr "Language" +#: ../src/empathy-preferences.c:882 +msgid "Preferences" +msgstr "Preferences" + #: ../src/empathy-preferences.ui.h:1 msgid "Appearance" msgstr "Appearance" #: ../src/empathy-preferences.ui.h:2 -msgid "Automatically _connect on startup " -msgstr "Automatically _connect on startup " - -#: ../src/empathy-preferences.ui.h:3 msgid "Behavior" msgstr "Behaviour" -#: ../src/empathy-preferences.ui.h:4 +#: ../src/empathy-preferences.ui.h:3 msgid "Chat Th_eme:" msgstr "Chat Th_eme:" -#: ../src/empathy-preferences.ui.h:5 +#: ../src/empathy-preferences.ui.h:4 msgid "Disable notifications when _away or busy" msgstr "Disable notifications when _away or busy" -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:5 msgid "Disable sounds when _away or busy" msgstr "Disable sounds when _away or busy" +#: ../src/empathy-preferences.ui.h:6 +msgid "Display incoming events in the notification area" +msgstr "Display incoming events in the notification area" + #: ../src/empathy-preferences.ui.h:7 msgid "Enable notifications when a contact comes online" msgstr "Enable notifications when a contact comes online" @@ -3170,17 +3519,17 @@ msgid "Location sources:" msgstr "Location sources:" #: ../src/empathy-preferences.ui.h:14 +msgid "Log conversations" +msgstr "Log conversations" + +#: ../src/empathy-preferences.ui.h:15 msgid "Notifications" msgstr "Notifications" -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:16 msgid "Play sound for events" msgstr "Play sound for events" -#: ../src/empathy-preferences.ui.h:16 -msgid "Preferences" -msgstr "Preferences" - #: ../src/empathy-preferences.ui.h:17 msgid "Privacy" msgstr "Privacy" @@ -3224,41 +3573,62 @@ msgid "Themes" msgstr "Themes" #: ../src/empathy-preferences.ui.h:25 +msgid "_Automatically connect on startup" +msgstr "_Automatically connect on startup" + +#: ../src/empathy-preferences.ui.h:26 msgid "_Cellphone" msgstr "_Mobile phone" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:27 msgid "_Enable bubble notifications" msgstr "_Enable bubble notifications" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:28 msgid "_Enable sound notifications" msgstr "_Enable sound notifications" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:29 msgid "_GPS" msgstr "_GPS" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:30 msgid "_Network (IP, Wi-Fi)" msgstr "_Network (IP, Wi-Fi)" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:31 msgid "_Open new chats in separate windows" msgstr "_Open new chats in separate windows" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:32 msgid "_Publish location to my contacts" msgstr "_Publish location to my contacts" -#: ../src/empathy-preferences.ui.h:32 +#. 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:34 msgid "_Reduce location accuracy" msgstr "_Reduce location accuracy" -#: ../src/empathy-status-icon.c:176 +#: ../src/empathy-status-icon.c:141 msgid "Respond" msgstr "Respond" +#: ../src/empathy-status-icon.c:147 +msgid "Reject" +msgstr "Reject" + +#: ../src/empathy-status-icon.c:151 +msgid "Answer" +msgstr "Answer" + +#: ../src/empathy-status-icon.c:158 +msgid "Decline" +msgstr "Decline" + +#: ../src/empathy-status-icon.c:162 +msgid "Accept" +msgstr "Accept" + #: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "Status" @@ -3267,67 +3637,67 @@ msgstr "Status" msgid "_Quit" msgstr "_Quit" -#: ../src/empathy-map-view.ui.h:1 +#: ../src/empathy-map-view.c:452 msgid "Contact Map View" msgstr "Contact Map View" -#: ../src/empathy-debug-window.c:1066 +#: ../src/empathy-debug-window.c:1219 msgid "Save" msgstr "Save" -#: ../src/empathy-debug-window.c:1219 +#: ../src/empathy-debug-window.c:1395 msgid "Debug Window" msgstr "Debug Window" -#: ../src/empathy-debug-window.c:1299 +#: ../src/empathy-debug-window.c:1475 msgid "Pause" msgstr "Pause" -#: ../src/empathy-debug-window.c:1311 +#: ../src/empathy-debug-window.c:1487 msgid "Level " msgstr "Level " -#: ../src/empathy-debug-window.c:1331 +#: ../src/empathy-debug-window.c:1507 msgid "Debug" msgstr "Debug" -#: ../src/empathy-debug-window.c:1337 +#: ../src/empathy-debug-window.c:1513 msgid "Info" msgstr "Info" -#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 +#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568 msgid "Message" msgstr "Message" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1525 msgid "Warning" msgstr "Warning" -#: ../src/empathy-debug-window.c:1355 +#: ../src/empathy-debug-window.c:1531 msgid "Critical" msgstr "Critical" -#: ../src/empathy-debug-window.c:1361 +#: ../src/empathy-debug-window.c:1537 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-window.c:1380 +#: ../src/empathy-debug-window.c:1556 msgid "Time" msgstr "Time" -#: ../src/empathy-debug-window.c:1383 +#: ../src/empathy-debug-window.c:1559 msgid "Domain" msgstr "Domain" -#: ../src/empathy-debug-window.c:1385 +#: ../src/empathy-debug-window.c:1561 msgid "Category" msgstr "Category" -#: ../src/empathy-debug-window.c:1387 +#: ../src/empathy-debug-window.c:1563 msgid "Level" msgstr "Level" -#: ../src/empathy-debug-window.c:1424 +#: ../src/empathy-debug-window.c:1600 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3344,28 +3714,32 @@ msgstr "Invite Participant" msgid "Choose a contact to invite into the conversation:" msgstr "Choose a contact to invite into the conversation:" -#: ../src/empathy-accounts.c:213 +#: ../src/empathy-invite-participant-dialog.c:45 +msgid "Invite" +msgstr "Invite" + +#: ../src/empathy-accounts.c:182 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Don't display any dialogues; do any work (eg, importing) and exit" -#: ../src/empathy-accounts.c:217 +#: ../src/empathy-accounts.c:186 msgid "Don't display any dialogs if there are any non-salut accounts" msgstr "Don't display any dialogues if there are any non-Salut accounts" -#: ../src/empathy-accounts.c:221 +#: ../src/empathy-accounts.c:190 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:223 +#: ../src/empathy-accounts.c:192 msgid "<account-id>" msgstr "<account-id>" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:200 msgid "- Empathy Accounts" msgstr "- Empathy Accounts" -#: ../src/empathy-accounts.c:247 +#: ../src/empathy-accounts.c:216 msgid "Empathy Accounts" msgstr "Empathy Accounts" @@ -3373,6 +3747,64 @@ msgstr "Empathy Accounts" msgid "Empathy Debugger" msgstr "Empathy Debugger" +#~ msgid "Send and receive messages" +#~ msgstr "Send and receive messages" + +#~ msgid "MC 4 accounts have been imported" +#~ msgstr "MC 4 accounts have been imported" + +#~ msgid "MC 4 accounts have been imported." +#~ msgstr "MC 4 accounts have been imported." + +#~ msgid "New Network" +#~ msgstr "New Network" + +#~ msgid "Hostname of the proxy for outbound requests." +#~ msgstr "Hostname of the proxy for outbound requests." + +#~ msgid "" +#~ "Look up the DNS SRV record at the service's domain for the host name of a " +#~ "STUN server." +#~ msgstr "" +#~ "Look up the DNS SRV record at the service's domain for the host name of a " +#~ "STUN server." + +#~ msgid "Port of the proxy for outbound requests." +#~ msgstr "Port of the proxy for outbound requests." + +#~ msgid "" +#~ "The username for SIP authentication, if different from the SIP URI\n" +#~ "username." +#~ msgstr "" +#~ "The username for SIP authentication, if different from the SIP URI\n" +#~ "username." + +#~ msgid "" +#~ "Update the registration binding if the external address for the client is " +#~ "discovered to be different from the local binding." +#~ msgstr "" +#~ "Update the registration binding if the external address for the client is " +#~ "discovered to be different from the local binding." + +#~ msgid "" +#~ "Use the loose routing behavior and the Route header as recommended in RFC " +#~ "3261." +#~ msgstr "" +#~ "Use the loose routing behavior and the Route header as recommended in RFC " +#~ "3261." + +#~ msgid "Failed to reconnect this chat" +#~ msgstr "Failed to reconnect this chat" + +#~ msgid "Failed to join chat room" +#~ msgstr "Failed to join chat room" + +#~ msgid "Select a destination" +#~ msgstr "Select a destination" + +#~ msgid "%s account" +#~ msgstr "%s account" + #~ msgid "Accounts" #~ msgstr "Accounts" @@ -3472,9 +3904,6 @@ msgstr "Empathy Debugger" #~ msgid "_View Previous Conversations" #~ msgstr "_View Previous Conversations" -#~ msgid "C_all" -#~ msgstr "C_all" - #~ msgid "" #~ "The contact to display in the applet. Empty means no contact is displayed." #~ msgstr "" @@ -3557,9 +3986,6 @@ msgstr "Empathy Debugger" #~ msgid "Geoclue Settings" #~ msgstr "Geoclue Settings" -#~ msgid "Empathy Instant Messenger" -#~ msgstr "Empathy Instant Messenger" - #~ msgid "Forget password and clear the entry." #~ msgstr "Forget password and clear the entry." @@ -3644,9 +4070,6 @@ msgstr "Empathy Debugger" #~ msgid "Invitation _message:" #~ msgstr "Invitation _message:" -#~ msgid "You have been invited to join a chat conference." -#~ msgstr "You have been invited to join a chat conference." - #~ msgid "Edit Favorite Room" #~ msgstr "Edit Favourite Room" @@ -3694,9 +4117,6 @@ msgstr "Empathy Debugger" #~ msgid "Do you want to accept the file \"%s\" (%s)?" #~ msgstr "Do you want to accept the file \"%s\" (%s)?" -#~ msgid "_Accept" -#~ msgstr "_Accept" - #~ msgid "File transfers" #~ msgstr "File Transfers" @@ -3877,9 +4297,6 @@ msgstr "Empathy Debugger" #~ msgid "Invalid handle" #~ msgstr "Invalid handle" -#~ msgid "No matching connection" -#~ msgstr "No matching connection" - #~ msgid "Invalid account" #~ msgstr "Invalid account" @@ -3964,9 +4381,6 @@ msgstr "Empathy Debugger" #~ msgid "Cu_t" #~ msgstr "Cu_t" -#~ msgid "In_vite..." -#~ msgstr "In_vite..." - #~ msgid "_Add To Favorites" #~ msgstr "_Add To Favourites" |