diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | help/en_GB/en_GB.po | 360 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom.c | 205 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom.h | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-roomlist.c | 28 | ||||
| -rw-r--r-- | po/POTFILES.in | 54 | ||||
| -rw-r--r-- | po/ar.po | 8 | ||||
| -rw-r--r-- | po/es.po | 931 | ||||
| -rw-r--r-- | src/empathy-ft-manager.c | 2 | ||||
| -rw-r--r-- | src/empathy-main-window.ui | 2 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 159 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.ui | 112 |
12 files changed, 1063 insertions, 811 deletions
diff --git a/configure.ac b/configure.ac index 397e61bba..c3926fdb2 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,6 @@ AC_CONFIG_AUX_DIR(.) GNOME_COMMON_INIT AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability) -AM_MAINTAINER_MODE AC_ISC_POSIX AC_PROG_CC AC_HEADER_STDC diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po index ccb54e4a0..e7c28df68 100644 --- a/help/en_GB/en_GB.po +++ b/help/en_GB/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-10 20:31+0000\n" +"POT-Creation-Date: 2009-04-16 20:27+0000\n" "PO-Revision-Date: 2009-03-10 00:10+0000\n" "Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n" "Language-Team: British English <en@li.org>\n" @@ -17,7 +17,7 @@ msgstr "" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. -#: C/empathy.xml:238(None) +#: C/empathy.xml:237(None) msgid "" "@@image: 'figures/empathy-main-window.png'; " "md5=38259a866f38ff1f754828e46d2b0e5c" @@ -201,33 +201,33 @@ msgstr "Feedback" msgid "" "To report a bug or make a suggestion regarding the <application>Empathy</" "application> application or this manual, follow the directions in the <ulink " -"url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>." +"url=\"ghelp:user-guide?feedback\" type=\"help\">GNOME Feedback Page</ulink>." msgstr "" "To report a bug or make a suggestion regarding the <application>Empathy</" "application> application or this manual, follow the directions in the <ulink " -"url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>." +"url=\"ghelp:user-guide?feedback\" type=\"help\">GNOME Feedback Page</ulink>." -#: C/empathy.xml:119(para) +#: C/empathy.xml:118(para) msgid "Empathy is an application for instant messaging." msgstr "Empathy is an application for instant messaging." -#: C/empathy.xml:127(primary) C/empathy.xml:0(application) +#: C/empathy.xml:126(primary) C/empathy.xml:0(application) msgid "Empathy" msgstr "Empathy" -#: C/empathy.xml:130(primary) +#: C/empathy.xml:129(primary) msgid "empathy" msgstr "empathy" -#: C/empathy.xml:131(secondary) +#: C/empathy.xml:130(secondary) msgid "istant messaging" msgstr "instant messaging" -#: C/empathy.xml:135(title) +#: C/empathy.xml:134(title) msgid "Introduction" msgstr "Introduction" -#: C/empathy.xml:136(para) +#: C/empathy.xml:135(para) msgid "" "<application>Empathy</application> is a multi-protocol instant messaging " "program for the GNOME Desktop. With <application>Empathy</application> you " @@ -239,47 +239,47 @@ msgstr "" "can keep in touch with all of your friends through lots of supported instant " "messaging services." -#: C/empathy.xml:146(acronym) +#: C/empathy.xml:145(acronym) msgid "AIM" msgstr "AIM" -#: C/empathy.xml:150(para) +#: C/empathy.xml:149(para) msgid "Google Talk" msgstr "Google Talk" -#: C/empathy.xml:155(para) C/empathy.xml:1090(title) +#: C/empathy.xml:154(para) C/empathy.xml:1089(title) msgid "ICQ" msgstr "ICQ" -#: C/empathy.xml:161(acronym) +#: C/empathy.xml:160(acronym) msgid "IRC" msgstr "IRC" -#: C/empathy.xml:165(para) +#: C/empathy.xml:164(para) msgid "Jabber (or <acronym>XMPP</acronym>)" msgstr "Jabber (or <acronym>XMPP</acronym>)" -#: C/empathy.xml:171(acronym) +#: C/empathy.xml:170(acronym) msgid "MSN" msgstr "MSN" -#: C/empathy.xml:175(para) C/empathy.xml:442(para) C/empathy.xml:1050(title) +#: C/empathy.xml:174(para) C/empathy.xml:441(para) C/empathy.xml:1049(title) msgid "Salut" msgstr "Salut" -#: C/empathy.xml:181(acronym) +#: C/empathy.xml:180(acronym) msgid "SIP" msgstr "SIP" -#: C/empathy.xml:185(para) C/empathy.xml:920(title) +#: C/empathy.xml:184(para) C/empathy.xml:919(title) msgid "Yahoo" msgstr "Yahoo" -#: C/empathy.xml:190(para) +#: C/empathy.xml:189(para) msgid "And many others..." msgstr "And many others…" -#: C/empathy.xml:141(para) +#: C/empathy.xml:140(para) msgid "" "<application>Empathy</application> supports the following services: " "<placeholder-1/>" @@ -287,24 +287,24 @@ msgstr "" "<application>Empathy</application> supports the following services: " "<placeholder-1/>" -#: C/empathy.xml:199(title) +#: C/empathy.xml:198(title) msgid "Getting Started" msgstr "Getting Started" -#: C/empathy.xml:202(title) +#: C/empathy.xml:201(title) msgid "Starting Empathy" msgstr "Starting Empathy" -#: C/empathy.xml:203(para) +#: C/empathy.xml:202(para) msgid "You can start <application>Empathy</application> in the following ways:" msgstr "" "You can start <application>Empathy</application> in the following ways:" -#: C/empathy.xml:207(term) +#: C/empathy.xml:206(term) msgid "<guimenu>Applications</guimenu> menu" msgstr "<guimenu>Applications</guimenu> menu" -#: C/empathy.xml:209(para) +#: C/empathy.xml:208(para) msgid "" "Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy " "Instant Messenger</guimenuitem></menuchoice>." @@ -312,23 +312,23 @@ msgstr "" "Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy " "Instant Messenger</guimenuitem></menuchoice>." -#: C/empathy.xml:218(term) +#: C/empathy.xml:217(term) msgid "Command line" msgstr "Command line" -#: C/empathy.xml:220(para) +#: C/empathy.xml:219(para) msgid "Type <command>empathy</command> and then press <keycap>Enter</keycap>." msgstr "Type <command>empathy</command> and then press <keycap>Enter</keycap>." -#: C/empathy.xml:229(title) +#: C/empathy.xml:228(title) msgid "When You Start Empathy" msgstr "When You Start Empathy" -#: C/empathy.xml:234(title) +#: C/empathy.xml:233(title) msgid "<application>Empathy</application> Main Window" msgstr "<application>Empathy</application> Main Window" -#: C/empathy.xml:241(phrase) +#: C/empathy.xml:240(phrase) msgid "" "Shows <placeholder-1/> main window. Contains the titlebar, the menubar, " "contact list, status icon and status arrow button list." @@ -336,7 +336,7 @@ msgstr "" "Shows the <placeholder-1/> main window. Contains the titlebar, the menubar, " "contact list, status icon and status arrow button list." -#: C/empathy.xml:230(para) +#: C/empathy.xml:229(para) msgid "" "When you start <application>Empathy</application> the following window is " "shown. <placeholder-1/>" @@ -344,53 +344,53 @@ msgstr "" "When you start <application>Empathy</application> the following window is " "shown. <placeholder-1/>" -#: C/empathy.xml:256(title) +#: C/empathy.xml:255(title) msgid "<application>Empathy</application> Main Components" msgstr "<application>Empathy</application> Main Components" -#: C/empathy.xml:263(para) +#: C/empathy.xml:262(para) msgid "Component" msgstr "Component" -#: C/empathy.xml:266(para) +#: C/empathy.xml:265(para) msgid "Description" msgstr "Description" -#: C/empathy.xml:273(para) +#: C/empathy.xml:272(para) msgid "Menubar" msgstr "Menubar" -#: C/empathy.xml:276(para) +#: C/empathy.xml:275(para) msgid "" "Contains menus used to perform actions in <application>Empathy</application>." msgstr "" "Contains menus used to perform actions in <application>Empathy</application>." -#: C/empathy.xml:283(para) +#: C/empathy.xml:282(para) msgid "Status Drop-Down List" msgstr "Status Drop-Down List" -#: C/empathy.xml:286(para) +#: C/empathy.xml:285(para) msgid "Allows to update the status." msgstr "Allows you to update your status." -#: C/empathy.xml:293(para) +#: C/empathy.xml:292(para) msgid "Account Button" msgstr "Account Button" -#: C/empathy.xml:296(para) +#: C/empathy.xml:295(para) msgid "Opens the <guilabel>Accounts</guilabel> dialog." msgstr "Opens the <guilabel>Accounts</guilabel> dialogue." -#: C/empathy.xml:303(para) +#: C/empathy.xml:302(para) msgid "Contact List" msgstr "Contact List" -#: C/empathy.xml:306(para) +#: C/empathy.xml:305(para) msgid "Shows all the available contacts and their associated status." msgstr "Shows all the available contacts and their associated status." -#: C/empathy.xml:252(para) +#: C/empathy.xml:251(para) msgid "" "<xref linkend=\"empathy-TBL-1\"/> describes the components of " "<application>Empathy</application>'s main window. <table frame=\"topbot\" id=" @@ -406,11 +406,11 @@ msgstr "" "\"colspec1\" colwidth=\"70.61*\"/><placeholder-2/><placeholder-3/></tgroup></" "table>" -#: C/empathy.xml:320(title) +#: C/empathy.xml:319(title) msgid "Accounts" msgstr "Accounts" -#: C/empathy.xml:321(para) +#: C/empathy.xml:320(para) msgid "" "To use <application>Empathy</application> you need at least one account of " "the supported services." @@ -418,7 +418,7 @@ msgstr "" "To use <application>Empathy</application> you need at least one account on " "the supported services." -#: C/empathy.xml:324(para) +#: C/empathy.xml:323(para) msgid "" "If you don't already have an account and you don't have your <emphasis>user " "name</emphasis> and <emphasis>password</emphasis>, you need to register a " @@ -428,7 +428,7 @@ msgstr "" "<emphasis>username</emphasis> and <emphasis>password</emphasis>, you need to " "register a new account (see <xref linkend=\"empathy-register-account\"/>)." -#: C/empathy.xml:329(para) +#: C/empathy.xml:328(para) msgid "" "In order to talk with other users, also called <emphasis>contacts</" "emphasis>, you need to use the same service they are using. If, for example, " @@ -440,7 +440,7 @@ msgstr "" "one contact is using the <emphasis role=\"strong\">Jabber</emphasis> " "service, you need to have an account registered with that service." -#: C/empathy.xml:336(para) +#: C/empathy.xml:335(para) msgid "" "<application>Empathy</application> can handle as many accounts on any " "supported services as you want and you can have them all open at the same " @@ -450,11 +450,11 @@ msgstr "" "supported services as you want and you can have them all open at the same " "time." -#: C/empathy.xml:342(title) +#: C/empathy.xml:341(title) msgid "Registering an Account" msgstr "Registering an Account" -#: C/empathy.xml:343(para) +#: C/empathy.xml:342(para) msgid "" "You can freely register an account on any of the following services. Follow " "the instructions reported on each website on how to register your new " @@ -472,7 +472,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:361(para) +#: C/empathy.xml:360(para) msgid "" "The <ulink type=\"http\" url=\"http://dashboard.aim.com/aim\">AIM</ulink> " "service." @@ -482,7 +482,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:368(para) +#: C/empathy.xml:367(para) msgid "" "The <ulink type=\"http\" url=\"http://www.google.com/talk/\">Google Talk</" "ulink> service." @@ -492,7 +492,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:376(para) +#: C/empathy.xml:375(para) msgid "" "The <ulink type=\"http\" url=\"https://www.icq.com/register/\">ICQ</ulink> " "service." @@ -502,7 +502,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:383(para) +#: C/empathy.xml:382(para) msgid "" "The <ulink type=\"http\" url=\"https://accountservices.passport.net\">MSN</" "ulink> service." @@ -512,7 +512,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:390(para) +#: C/empathy.xml:389(para) msgid "" "The <ulink type=\"http\" url=\"https://login.yahoo.com/config/login\">Yahoo</" "ulink> service." @@ -520,12 +520,12 @@ msgstr "" "The <ulink type=\"http\" url=\"https://login.yahoo.com/config/login\">Yahoo</" "ulink> service." -#: C/empathy.xml:352(para) +#: C/empathy.xml:351(para) msgid "Click on the name of the service to visit its website: <placeholder-1/>" msgstr "" "Click on the name of the service to visit its website: <placeholder-1/>" -#: C/empathy.xml:396(para) +#: C/empathy.xml:395(para) msgid "" "For registering a <acronym>SIP</acronym> account, you can use one of the " "following service:" @@ -535,7 +535,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:405(para) +#: C/empathy.xml:404(para) msgid "" "The <ulink type=\"http\" url=\"https://www.ekiga.net/index.php?page=register" "\">Ekiga</ulink> service." @@ -545,7 +545,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:412(para) +#: C/empathy.xml:411(para) msgid "" "The <ulink type=\"http\" url=\"http://account2.freeworlddialup.com/index.php?" "section_id=94\"><acronym>FWD</acronym></ulink> (Free World Dialup) service." @@ -555,7 +555,7 @@ msgstr "" #. Translators: try to find a localized version of the #. registration service website -#: C/empathy.xml:420(para) +#: C/empathy.xml:419(para) msgid "" "The <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/app?" "class=NewUser;proc=start\">Sipphone</ulink> service." @@ -563,7 +563,7 @@ msgstr "" "The <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/app?" "class=NewUser;proc=start\">Sipphone</ulink> service." -#: C/empathy.xml:426(para) +#: C/empathy.xml:425(para) msgid "" "For registering a <emphasis role=\"strong\">Jabber</emphasis> account, you " "can use the automatic account creation of <application>Empathy</" @@ -579,7 +579,7 @@ msgstr "" "<application>Empathy</application> is <ulink type=\"http\" url=\"http://www." "jabber.org/web/Jabber.org\">jabber.org</ulink>." -#: C/empathy.xml:434(para) +#: C/empathy.xml:433(para) msgid "" "If you already have a <emphasis role=\"strong\">Jabber</emphasis> account, " "you can use one of the following services:" @@ -587,12 +587,12 @@ msgstr "" "If you already have a <emphasis role=\"strong\">Jabber</emphasis> account, " "you can use one of the following services:" -#: C/empathy.xml:451(title) +#: C/empathy.xml:450(title) msgid "Adding your Account to <application>Empathy</application>" msgstr "Adding your Account to <application>Empathy</application>" -#: C/empathy.xml:456(para) C/empathy.xml:534(para) C/empathy.xml:586(para) -#: C/empathy.xml:619(para) C/empathy.xml:649(para) C/empathy.xml:672(para) +#: C/empathy.xml:455(para) C/empathy.xml:533(para) C/empathy.xml:585(para) +#: C/empathy.xml:618(para) C/empathy.xml:648(para) C/empathy.xml:671(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window </link> " "(<guilabel>Contact List</guilabel>) click on the account button or press " @@ -602,7 +602,7 @@ msgstr "" "(<guilabel>Contact List</guilabel>) click on the account button or press " "<keycap>F4</keycap> to open the <guilabel>Accounts</guilabel> dialogue." -#: C/empathy.xml:468(para) C/empathy.xml:485(para) +#: C/empathy.xml:467(para) C/empathy.xml:484(para) msgid "" "From the <guilabel>Type</guilabel> drop-down list choose the service you " "wish to add an account for, then click on the <guibutton>Create</guibutton> " @@ -612,7 +612,7 @@ msgstr "" "which you wish to add an account, then click on the <guibutton>Create</" "guibutton> button." -#: C/empathy.xml:464(para) +#: C/empathy.xml:463(para) msgid "" "If it is the first time you launch <application>Empathy</application>: " "<placeholder-1/>" @@ -620,15 +620,15 @@ msgstr "" "If it is the first time you're launching <application>Empathy</application>: " "<placeholder-1/>" -#: C/empathy.xml:480(para) +#: C/empathy.xml:479(para) msgid "Click on the <guilabel>Add</guilabel> button." msgstr "Click on the <guilabel>Add</guilabel> button." -#: C/empathy.xml:476(para) +#: C/empathy.xml:475(para) msgid "Otherwise: <placeholder-1/>" msgstr "Otherwise: <placeholder-1/>" -#: C/empathy.xml:495(para) +#: C/empathy.xml:494(para) msgid "" "Fill the required fields with your <emphasis>user name</emphasis> and " "<emphasis>password</emphasis>. Optionally, you can modify some advanced " @@ -640,7 +640,7 @@ msgstr "" "options. For more information, see <xref linkend=\"empathy-advanced-options" "\"/>." -#: C/empathy.xml:504(para) C/empathy.xml:567(para) +#: C/empathy.xml:503(para) C/empathy.xml:566(para) msgid "" "To enable the new account, select the <guilabel>Enabled</guilabel> check-box " "next to the name of the account in the box on the left." @@ -648,7 +648,7 @@ msgstr "" "To enable the new account, select the <guilabel>Enabled</guilabel> check box " "next to the name of the account in the box on the left." -#: C/empathy.xml:452(para) +#: C/empathy.xml:451(para) msgid "" "To add your account to <application>Empathy</application>, proceed as " "follows: <placeholder-1/>" @@ -656,11 +656,11 @@ msgstr "" "To add your account to <application>Empathy</application>, proceed as " "follows: <placeholder-1/>" -#: C/empathy.xml:514(title) +#: C/empathy.xml:513(title) msgid "Importing Accounts" msgstr "Importing Accounts" -#: C/empathy.xml:515(para) +#: C/empathy.xml:514(para) msgid "" "If you use another instant messaging program, you can import the accounts " "from that program into <application>Empathy</application>" @@ -668,7 +668,7 @@ msgstr "" "If you use another instant messaging program, you can import the accounts " "from that program into <application>Empathy</application>" -#: C/empathy.xml:521(para) +#: C/empathy.xml:520(para) msgid "" "At the moment <application>Empathy</application> can import the accounts " "only from the instant messaging program <application>Pidgin</application>. " @@ -680,7 +680,7 @@ msgstr "" "For more information about <application>Pidgin</application>, see the <ulink " "type=\"http\" url=\"http://www.pidgin.im/\">Pidgin website</ulink>." -#: C/empathy.xml:542(para) +#: C/empathy.xml:541(para) msgid "" "Click on the <guibutton>Import Accounts...</guibutton> button to open the " "<guilabel>Import Accounts</guilabel> dialog." @@ -688,7 +688,7 @@ msgstr "" "Click on the <guibutton>Import Accounts...</guibutton> button to open the " "<guilabel>Import Accounts</guilabel> dialogue." -#: C/empathy.xml:549(para) +#: C/empathy.xml:548(para) msgid "" "Select the accounts you would like to import by clicking on the " "<guilabel>Import</guilabel> check-box." @@ -696,7 +696,7 @@ msgstr "" "Select the accounts you would like to import by clicking on the " "<guilabel>Import</guilabel> check box." -#: C/empathy.xml:555(para) +#: C/empathy.xml:554(para) msgid "" "When you have selected all the desired accounts, click <guibutton>OK</" "guibutton> to import them. If you don't want to import the accounts, click " @@ -706,7 +706,7 @@ msgstr "" "guibutton> to import them. If you don't want to import the accounts, click " "<guibutton>Cancel</guibutton>." -#: C/empathy.xml:563(para) +#: C/empathy.xml:562(para) msgid "" "When you import a new account into <application>Empathy</application>, it " "will not be enabled by default." @@ -714,7 +714,7 @@ msgstr "" "When you import a new account into <application>Empathy</application>, it " "will not be enabled by default." -#: C/empathy.xml:530(para) +#: C/empathy.xml:529(para) msgid "" "To import the accounts into <application>Empathy</application>, proceed as " "follows: <placeholder-1/>" @@ -722,19 +722,19 @@ msgstr "" "To import the accounts into <application>Empathy</application>, proceed as " "follows: <placeholder-1/>" -#: C/empathy.xml:579(title) +#: C/empathy.xml:578(title) msgid "Editing an Account" msgstr "Editing an Account" -#: C/empathy.xml:594(para) +#: C/empathy.xml:593(para) msgid "Select the account you wish to edit in the box on the left." msgstr "Select the account you wish to edit in the box on the left." -#: C/empathy.xml:600(para) +#: C/empathy.xml:599(para) msgid "Modify the desired data." msgstr "Modify the desired data." -#: C/empathy.xml:580(para) +#: C/empathy.xml:579(para) msgid "" "To edit one of your accounts, i.e. to change the <emphasis>password</" "emphasis> or your <emphasis>user name</emphasis>, proceed as follows: " @@ -744,13 +744,13 @@ msgstr "" "emphasis> or your <emphasis>username</emphasis>, proceed as follows: " "<placeholder-1/>" -#: C/empathy.xml:608(para) +#: C/empathy.xml:607(para) msgid "" "Based on the type of the account, it is possibile to edit different settings." msgstr "" "Based on the type of the account, it is possibile to edit different settings." -#: C/empathy.xml:627(para) +#: C/empathy.xml:626(para) msgid "" "Select the account you wish to edit in the box on the left and double-click " "on its name." @@ -758,11 +758,11 @@ msgstr "" "Select the account you wish to edit in the box on the left and double-click " "on its name." -#: C/empathy.xml:633(para) +#: C/empathy.xml:632(para) msgid "Change the name of the account as you desire." msgstr "Change the name of the account as you desire." -#: C/empathy.xml:614(para) +#: C/empathy.xml:613(para) msgid "" "To modify the identifier of an account, how <application>Empathy</" "application> identifies an account, proceed as follows: <placeholder-1/>" @@ -770,15 +770,15 @@ msgstr "" "To modify the identifier of an account – how <application>Empathy</" "application> identifies an account – proceed as follows: <placeholder-1/>" -#: C/empathy.xml:642(title) +#: C/empathy.xml:641(title) msgid "Disabling and Removing an Account" msgstr "Disabling and Removing an Account" -#: C/empathy.xml:643(para) +#: C/empathy.xml:642(para) msgid "To disable an account, proceed as follows:" msgstr "To disable an account, proceed as follows:" -#: C/empathy.xml:658(para) +#: C/empathy.xml:657(para) msgid "" "Select the account you wish to disable in the box on the left of the dialog " "and deselect the <guilabel>Enabled</guilabel> check-box." @@ -786,22 +786,22 @@ msgstr "" "Select the account you wish to disable in the box on the left of the " "dialogue and deselect the <guilabel>Enabled</guilabel> check box." -#: C/empathy.xml:666(para) +#: C/empathy.xml:665(para) msgid "To remove an account, proceed as follows:" msgstr "To remove an account, proceed as follows:" -#: C/empathy.xml:681(para) +#: C/empathy.xml:680(para) msgid "" "Select the account you wish to disable in the box on the left of the dialog." msgstr "" "Select the account you wish to disable in the box on the left of the " "dialogue." -#: C/empathy.xml:687(para) +#: C/empathy.xml:686(para) msgid "Click on the <guibutton>Remove</guibutton> button." msgstr "Click on the <guibutton>Remove</guibutton> button." -#: C/empathy.xml:692(para) +#: C/empathy.xml:691(para) msgid "" "A dialog will be shown asking for confirmation. Click on the " "<guibutton>Remove</guibutton> button to remove the account." @@ -809,11 +809,11 @@ msgstr "" "A dialogue will be shown asking for confirmation. Click on the " "<guibutton>Remove</guibutton> button to remove the account." -#: C/empathy.xml:702(title) +#: C/empathy.xml:701(title) msgid "Editing Personal Information" msgstr "Editing Personal Information" -#: C/empathy.xml:703(para) +#: C/empathy.xml:702(para) msgid "" "To change your personal information, your alias and your icon (the image " "that other contacts will see of you), for each of your accounts, proceed as " @@ -823,7 +823,7 @@ msgstr "" "that other contacts will see of you), for each of your accounts, proceed as " "follows:" -#: C/empathy.xml:711(para) +#: C/empathy.xml:710(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select " "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Personal Information</" @@ -833,7 +833,7 @@ msgstr "" "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Personal Information</" "guimenuitem></menuchoice>." -#: C/empathy.xml:720(para) +#: C/empathy.xml:719(para) msgid "" "From the <guilabel>Account</guilabel> drop-down list, choose the account you " "want to edit." @@ -841,22 +841,22 @@ msgstr "" "From the <guilabel>Account</guilabel> drop-down list, choose the account you " "want to edit." -#: C/empathy.xml:726(para) +#: C/empathy.xml:725(para) msgid "In the <guilabel>Alias</guilabel> text box, write your new alias." msgstr "In the <guilabel>Alias</guilabel> text box, write your new alias." -#: C/empathy.xml:732(para) +#: C/empathy.xml:731(para) msgid "" "To change your icon, click on the person-looking button and choose an image " "file." msgstr "" "To change your icon, click on the person button and choose an image file." -#: C/empathy.xml:738(para) C/empathy.xml:1319(para) C/empathy.xml:1353(para) +#: C/empathy.xml:737(para) C/empathy.xml:1318(para) C/empathy.xml:1352(para) msgid "When done, click <guibutton>Close</guibutton>." msgstr "When done, click <guibutton>Close</guibutton>." -#: C/empathy.xml:746(para) +#: C/empathy.xml:745(para) msgid "" "An <emphasis>alias</emphasis> is an alternative way you can identify " "yourself. You can use your real name or a nickname." @@ -864,11 +864,11 @@ msgstr "" "An <emphasis>alias</emphasis> is an alternative way you can identify " "yourself. You can use your real name or a nickname." -#: C/empathy.xml:756(title) +#: C/empathy.xml:755(title) msgid "Advanced Options" msgstr "Advanced Options" -#: C/empathy.xml:757(para) +#: C/empathy.xml:756(para) msgid "" "Based on the service you are using, it is possible to configure more " "advanced options to modify the normal behavior of <application>Empathy</" @@ -878,7 +878,7 @@ msgstr "" "advanced options to modify the normal behavior of <application>Empathy</" "application>." -#: C/empathy.xml:762(para) +#: C/empathy.xml:761(para) msgid "" "To configure these options, when you are <link linkend=\"empathy-create-" "account\">adding a new account</link>, click on the drop-down section " @@ -888,15 +888,15 @@ msgstr "" "account\">adding a new account</link>, click on the drop-down section " "<guilabel>Advanced</guilabel>." -#: C/empathy.xml:770(title) +#: C/empathy.xml:769(title) msgid "Jabber (or <acronym>XMPP</acronym>) and Google Talk" msgstr "Jabber (or <acronym>XMPP</acronym>) and Google Talk" -#: C/empathy.xml:777(guilabel) +#: C/empathy.xml:776(guilabel) msgid "Encryption required (TLS/SSL)" msgstr "Encryption required (TLS/SSL)" -#: C/empathy.xml:780(para) +#: C/empathy.xml:779(para) msgid "" "Select this option in order to use some sort of encryption during your " "conversations." @@ -904,11 +904,11 @@ msgstr "" "Select this option in order to use some sort of encryption during your " "conversations." -#: C/empathy.xml:788(guilabel) +#: C/empathy.xml:787(guilabel) msgid "Ignore SSL certificate errors" msgstr "Ignore SSL certificate errors" -#: C/empathy.xml:791(para) +#: C/empathy.xml:790(para) msgid "" "Select this option in order to ignore the errors that can be generated by " "some types of security certificates. Usually these certificates are called " @@ -918,7 +918,7 @@ msgstr "" "some types of security certificates. Usually these certificates are called " "auto-signed." -#: C/empathy.xml:799(para) +#: C/empathy.xml:798(para) msgid "" "Select this option only if you are sure the certificate is secure and you " "can trust it." @@ -926,11 +926,11 @@ msgstr "" "Select this option only if you are sure the certificate is secure and you " "can trust it." -#: C/empathy.xml:809(guilabel) +#: C/empathy.xml:808(guilabel) msgid "Resource" msgstr "Resource" -#: C/empathy.xml:812(para) +#: C/empathy.xml:811(para) msgid "" "Use this text box to set a name with which you can identify the running " "program based on where you are running it. With this option, and the " @@ -950,7 +950,7 @@ msgstr "" "<guilabel>Priority</guilabel> value, you will receive messages on one of the " "two devices or both." -#: C/empathy.xml:825(para) +#: C/empathy.xml:824(para) msgid "" "This can be useful if you have two devices, a main one and a portable one, " "and you move away from the main one bringing with you the other: you can " @@ -962,7 +962,7 @@ msgstr "" "still receive messages from your account with the portable device even if " "you do not disconnect from the main one." -#: C/empathy.xml:834(para) +#: C/empathy.xml:833(para) msgid "" "If you set the same value for this text box on both the devices, when you " "connect with one of them, the other one will be disconnected, even if you " @@ -972,11 +972,11 @@ msgstr "" "connect with one of them, the other one will be disconnected, even if you " "set a different value with the <guilabel>Priority</guilabel> spin box." -#: C/empathy.xml:847(guilabel) +#: C/empathy.xml:846(guilabel) msgid "Priority" msgstr "Priority" -#: C/empathy.xml:850(para) +#: C/empathy.xml:849(para) msgid "" "Use this spin box to indicate wich device, set in the <guilabel>Resource</" "guilabel> text box, will receive the new messages. The higher the number, " @@ -988,7 +988,7 @@ msgstr "" "the higher the priority: you will receive the new messages on the device " "with the highest number." -#: C/empathy.xml:857(para) +#: C/empathy.xml:856(para) msgid "" "You can set values in the range from <literal>-128</literal> to " "<literal>127</literal>." @@ -996,7 +996,7 @@ msgstr "" "You can set values in the range from <literal>-128</literal> to " "<literal>127</literal>." -#: C/empathy.xml:863(para) +#: C/empathy.xml:862(para) msgid "" "If you set the same value of this spin box in both the devices, you will " "receive messages on both of them." @@ -1004,13 +1004,13 @@ msgstr "" "If you set the same value of this spin box in both the devices, you will " "receive messages on both of them." -#: C/empathy.xml:880(guilabel) C/empathy.xml:973(guilabel) -#: C/empathy.xml:1021(guilabel) C/empathy.xml:1115(guilabel) +#: C/empathy.xml:879(guilabel) C/empathy.xml:972(guilabel) +#: C/empathy.xml:1020(guilabel) C/empathy.xml:1114(guilabel) msgid "Server" msgstr "Server" -#: C/empathy.xml:883(para) C/empathy.xml:976(para) C/empathy.xml:1024(para) -#: C/empathy.xml:1118(para) +#: C/empathy.xml:882(para) C/empathy.xml:975(para) C/empathy.xml:1023(para) +#: C/empathy.xml:1117(para) msgid "" "Use this text box to write the name of the server you want to use for this " "service." @@ -1018,18 +1018,18 @@ msgstr "" "Use this text box to write the name of the server you want to use for this " "service." -#: C/empathy.xml:891(guilabel) C/empathy.xml:984(guilabel) -#: C/empathy.xml:1032(guilabel) C/empathy.xml:1126(guilabel) +#: C/empathy.xml:890(guilabel) C/empathy.xml:983(guilabel) +#: C/empathy.xml:1031(guilabel) C/empathy.xml:1125(guilabel) msgid "Port" msgstr "Port" -#: C/empathy.xml:894(para) C/empathy.xml:987(para) C/empathy.xml:1035(para) -#: C/empathy.xml:1129(para) +#: C/empathy.xml:893(para) C/empathy.xml:986(para) C/empathy.xml:1034(para) +#: C/empathy.xml:1128(para) msgid "Use this spin box to set the number of the port of the server to use." msgstr "Use this spin box to set the number of the port of the server to use." -#: C/empathy.xml:898(para) C/empathy.xml:991(para) C/empathy.xml:1039(para) -#: C/empathy.xml:1133(para) +#: C/empathy.xml:897(para) C/empathy.xml:990(para) C/empathy.xml:1038(para) +#: C/empathy.xml:1132(para) msgid "" "You can set values in the range from <literal>0</literal> to " "<literal>65,555</literal>." @@ -1037,11 +1037,11 @@ msgstr "" "You can set values in the range from <literal>0</literal> to " "<literal>65,555</literal>." -#: C/empathy.xml:906(guilabel) +#: C/empathy.xml:905(guilabel) msgid "Use old SSL" msgstr "Use old SSL" -#: C/empathy.xml:909(para) +#: C/empathy.xml:908(para) msgid "" "Select this option to use the old version of the secure protocol for " "encrypting your connection." @@ -1049,7 +1049,7 @@ msgstr "" "Select this option to use the old version of the secure protocol for " "encrypting your connection." -#: C/empathy.xml:874(para) +#: C/empathy.xml:873(para) msgid "" "In the <guilabel>Override server settings</guilabel> section you can set " "options that take precedence over the default settings. <placeholder-1/>" @@ -1057,21 +1057,21 @@ msgstr "" "In the <guilabel>Override server settings</guilabel> section you can set " "options that take precedence over the default settings. <placeholder-1/>" -#: C/empathy.xml:925(guilabel) +#: C/empathy.xml:924(guilabel) msgid "Ignore conference and chatrooms invitations" msgstr "Ignore conference and chatrooms invitations" -#: C/empathy.xml:929(para) +#: C/empathy.xml:928(para) msgid "" "Select this option to ignore the invitations that other people may send you." msgstr "" "Select this option to ignore the invitations that other people may send you." -#: C/empathy.xml:937(guilabel) +#: C/empathy.xml:936(guilabel) msgid "Room List locale" msgstr "Room List locale" -#: C/empathy.xml:940(para) +#: C/empathy.xml:939(para) msgid "" "The value of this text box identifies the language used to retrieve the room " "list when connecting to the Yahoo service." @@ -1079,17 +1079,17 @@ msgstr "" "The value of this text box identifies the language used to retrieve the room " "list when connecting to the Yahoo! service." -#: C/empathy.xml:945(para) +#: C/empathy.xml:944(para) msgid "" "If you need to change this value, use the two letter code of your language." msgstr "" "If you need to change this value, use the two letter code of your language." -#: C/empathy.xml:953(guilabel) C/empathy.xml:1095(guilabel) +#: C/empathy.xml:952(guilabel) C/empathy.xml:1094(guilabel) msgid "Charset" msgstr "Charset" -#: C/empathy.xml:956(para) C/empathy.xml:1098(para) +#: C/empathy.xml:955(para) C/empathy.xml:1097(para) msgid "" "The value of this text box identifies the set of the characters used by " "<application>Empathy</application>." @@ -1097,7 +1097,7 @@ msgstr "" "The value of this text box identifies the set of the characters used by " "<application>Empathy</application>." -#: C/empathy.xml:962(para) C/empathy.xml:1104(para) +#: C/empathy.xml:961(para) C/empathy.xml:1103(para) msgid "" "It is advise to leave this value to <literal>UTF-8</literal>. Change it only " "if that charset does not cover your language." @@ -1105,11 +1105,11 @@ msgstr "" "It is advised to leave this value as <literal>UTF-8</literal>. Change it " "only if that charset does not cover your language." -#: C/empathy.xml:999(guilabel) +#: C/empathy.xml:998(guilabel) msgid "Use Yahoo Japan" msgstr "Use Yahoo! Japan" -#: C/empathy.xml:1002(para) +#: C/empathy.xml:1001(para) msgid "" "Select this option only if you have a Yahoo! Japan account. With the Yahoo! " "Japan service you can only use a Yahoo! Japan account: if you have " @@ -1121,15 +1121,15 @@ msgstr "" "registered an account with the English version of the service, that account " "will not work." -#: C/empathy.xml:1016(title) +#: C/empathy.xml:1015(title) msgid "<acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym>" msgstr "<acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym>" -#: C/empathy.xml:1055(guilabel) +#: C/empathy.xml:1054(guilabel) msgid "Published Name" msgstr "Published Name" -#: C/empathy.xml:1058(para) +#: C/empathy.xml:1057(para) msgid "" "Use this text box to write the name that will be visible to the other users " "of the network." @@ -1137,41 +1137,41 @@ msgstr "" "Use this text box to write the name that will be visible to the other users " "of the network." -#: C/empathy.xml:1066(guilabel) +#: C/empathy.xml:1065(guilabel) msgid "Email" msgstr "E-mail" -#: C/empathy.xml:1069(para) +#: C/empathy.xml:1068(para) msgid "Use this text box to write your email." msgstr "Use this text box to write your e-mail address." -#: C/empathy.xml:1076(guilabel) +#: C/empathy.xml:1075(guilabel) msgid "Jabber ID" msgstr "Jabber ID" -#: C/empathy.xml:1079(para) +#: C/empathy.xml:1078(para) msgid "Use this text box to write your Jabber ID, if you have one." msgstr "Use this text box to write your Jabber ID, if you have one." -#: C/empathy.xml:1144(title) +#: C/empathy.xml:1143(title) msgid "Gadu Gadu" msgstr "Gadu Gadu" -#: C/empathy.xml:1148(guilabel) +#: C/empathy.xml:1147(guilabel) msgid "Nick" msgstr "Nick" -#: C/empathy.xml:1150(para) +#: C/empathy.xml:1149(para) msgid "" "Use this text box to write an alternative name to use with this service." msgstr "" "Use this text box to write an alternative name to use with this service." -#: C/empathy.xml:1165(title) +#: C/empathy.xml:1164(title) msgid "Contacts and Groups" msgstr "Contacts and Groups" -#: C/empathy.xml:1166(para) +#: C/empathy.xml:1165(para) msgid "" "All the contacts are handled within <application>Empathy</application>'s " "<link linkend=\"empathy-FIG-mainwindow\">main window</link>." @@ -1179,7 +1179,7 @@ msgstr "" "All the contacts are handled within <application>Empathy</application>'s " "<link linkend=\"empathy-FIG-mainwindow\">main window</link>." -#: C/empathy.xml:1170(para) +#: C/empathy.xml:1169(para) msgid "" "You can add or remove a contact or you can edit the information of a " "particular contact. It is also possibile to arrange contacts in groups. You " @@ -1191,15 +1191,15 @@ msgstr "" "can have a group for your work contacts, one for you family contacts, and so " "on." -#: C/empathy.xml:1177(title) +#: C/empathy.xml:1176(title) msgid "Adding and Removing a Contact" msgstr "Adding and Removing a Contact" -#: C/empathy.xml:1178(para) +#: C/empathy.xml:1177(para) msgid "To add a new contact, proceed as follows:" msgstr "To add a new contact, proceed as follows:" -#: C/empathy.xml:1184(para) +#: C/empathy.xml:1183(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link> choose " "<menuchoice><guimenu>Chat</guimenu><guimenuitem>Add Contact...</" @@ -1211,7 +1211,7 @@ msgstr "" "guimenuitem></menuchoice>. The <guilabel>New Contact</guilabel> dialogue " "will be shown." -#: C/empathy.xml:1194(para) +#: C/empathy.xml:1193(para) msgid "" "From the <guilabel>Account</guilabel> drop-down list, choose the service " "used by the contact you are adding." @@ -1219,7 +1219,7 @@ msgstr "" "From the <guilabel>Account</guilabel> drop-down list, choose the service " "used by the contact you are adding." -#: C/empathy.xml:1200(para) +#: C/empathy.xml:1199(para) msgid "" "In the <guilabel>Identifier</guilabel> text box type the <emphasis>address</" "emphasis> of the contact in the form of <userinput><replaceable>user name</" @@ -1230,7 +1230,7 @@ msgstr "" "emphasis> of the contact in the form of <userinput><replaceable>username</" "replaceable>@<replaceable>service domain</replaceable></userinput>." -#: C/empathy.xml:1209(para) +#: C/empathy.xml:1208(para) msgid "" "In the <guilabel>Alias</guilabel> text box type the name you want to give at " "the the new contact." @@ -1238,15 +1238,15 @@ msgstr "" "In the <guilabel>Alias</guilabel> text box type the name you want to give at " "the the new contact." -#: C/empathy.xml:1215(para) +#: C/empathy.xml:1214(para) msgid "Click on <guibutton>Add</guibutton> to add the new contact." msgstr "Click on <guibutton>Add</guibutton> to add the new contact." -#: C/empathy.xml:1221(para) +#: C/empathy.xml:1220(para) msgid "To remove a contact, proceed as follows:" msgstr "To remove a contact, proceed as follows:" -#: C/empathy.xml:1227(para) +#: C/empathy.xml:1226(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select " "the contact you would like to remove and right-click on it." @@ -1254,7 +1254,7 @@ msgstr "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select " "the contact you would like to remove and right-click on it." -#: C/empathy.xml:1234(para) +#: C/empathy.xml:1233(para) msgid "" "From the popup menu, choose <guilabel>Remove</guilabel> to remove the " "contact." @@ -1262,7 +1262,7 @@ msgstr "" "From the popup menu, choose <guilabel>Remove</guilabel> to remove the " "contact." -#: C/empathy.xml:1243(para) C/empathy.xml:1279(para) +#: C/empathy.xml:1242(para) C/empathy.xml:1278(para) msgid "" "An <emphasis>alias</emphasis> is an alternative way you can identify that " "particular contact. You can use the real name or the nickname of that person." @@ -1270,15 +1270,15 @@ msgstr "" "An <emphasis>alias</emphasis> is an alternative way you can identify that " "particular contact. You can use the real name or the nickname of that person." -#: C/empathy.xml:1252(title) +#: C/empathy.xml:1251(title) msgid "Editing a Contact" msgstr "Editing a Contact" -#: C/empathy.xml:1253(para) +#: C/empathy.xml:1252(para) msgid "To edit a contact, proceed as follows:" msgstr "To edit a contact, proceed as follows:" -#: C/empathy.xml:1259(para) C/empathy.xml:1301(para) +#: C/empathy.xml:1258(para) C/empathy.xml:1300(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select " "the contact you would like to modify and choose <menuchoice><guimenu>Edit</" @@ -1290,7 +1290,7 @@ msgstr "" "guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></" "menuchoice>, or right-click on it and choose <guimenuitem>Edit</guimenuitem>." -#: C/empathy.xml:1272(para) +#: C/empathy.xml:1271(para) msgid "" "From the <guilabel>Edit Contact Information</guilabel> dialog, you can " "modify the <emphasis>alias</emphasis> and the <emphasis>group</emphasis> of " @@ -1300,7 +1300,7 @@ msgstr "" "modify the <emphasis>alias</emphasis> and the <emphasis>group</emphasis> of " "the contact." -#: C/empathy.xml:1286(para) +#: C/empathy.xml:1285(para) msgid "" "For more information about groups, see <xref linkend=\"empathy-add-contact-" "group\"/> and <xref linkend=\"empathy-add-group\"/>." @@ -1308,15 +1308,15 @@ msgstr "" "For more information about groups, see <xref linkend=\"empathy-add-contact-" "group\"/> and <xref linkend=\"empathy-add-group\"/>." -#: C/empathy.xml:1294(title) +#: C/empathy.xml:1293(title) msgid "Adding a Contact to a Group" msgstr "Adding a Contact to a Group" -#: C/empathy.xml:1295(para) +#: C/empathy.xml:1294(para) msgid "To add a contact to one or more groups, proceed as follows:" msgstr "To add a contact to one or more groups, proceed as follows:" -#: C/empathy.xml:1313(para) +#: C/empathy.xml:1312(para) msgid "" "From the <guilabel>Groups</guilabel> section, select the group, or groups, " "you want to add the contact to." @@ -1324,15 +1324,15 @@ msgstr "" "From the <guilabel>Groups</guilabel> section, select the group, or groups, " "to which you want to add the contact." -#: C/empathy.xml:1328(title) +#: C/empathy.xml:1327(title) msgid "Adding a New Group" msgstr "Adding a New Group" -#: C/empathy.xml:1329(para) +#: C/empathy.xml:1328(para) msgid "To add a new group, proceed as follows:" msgstr "To add a new group, proceed as follows:" -#: C/empathy.xml:1335(para) +#: C/empathy.xml:1334(para) msgid "" "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select " "one contact and choose <menuchoice><guimenu>Edit</" @@ -1344,7 +1344,7 @@ msgstr "" "guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></" "menuchoice>, or right-click on it and choose <guimenuitem>Edit</guimenuitem>." -#: C/empathy.xml:1346(para) +#: C/empathy.xml:1345(para) msgid "" "In the <guilabel>Groups</guilabel> section, write the name of the group you " "want to add and then click on <guibutton>Add Group</guibutton>." diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index ef89994c0..8ffd8a51e 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -37,6 +37,10 @@ typedef struct { gboolean auto_connect; gboolean favorite; EmpathyTpChat *tp_chat; + gchar *subject; + guint members_count; + gboolean invite_only; + gboolean need_password; } EmpathyChatroomPriv; @@ -58,6 +62,10 @@ enum { PROP_AUTO_CONNECT, PROP_FAVORITE, PROP_TP_CHAT, + PROP_SUBJECT, + PROP_MEMBERS_COUNT, + PROP_NEED_PASSWORD, + PROP_INVITE_ONLY }; G_DEFINE_TYPE (EmpathyChatroom, empathy_chatroom, G_TYPE_OBJECT); @@ -123,6 +131,56 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass) EMPATHY_TYPE_TP_CHAT, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_SUBJECT, + g_param_spec_string ("subject", + "Subject", + "The chatroom's subject", + "", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_MEMBERS_COUNT, + g_param_spec_uint ("members-count", + "Members count", + "The chatroom's members count", + 0, + G_MAXUINT, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_INVITE_ONLY, + g_param_spec_boolean ("invite-only", + "Invite Only", + "The chatroom is invite only", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_NEED_PASSWORD, + g_param_spec_boolean ("need-password", + "Password Needed", + "The chatroom is password protected", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + g_type_class_add_private (object_class, sizeof (EmpathyChatroomPriv)); } @@ -175,12 +233,24 @@ chatroom_get_property (GObject *object, case PROP_AUTO_CONNECT: g_value_set_boolean (value, priv->auto_connect); break; - case PROP_FAVORITE: - g_value_set_boolean (value, priv->favorite); - break; + case PROP_FAVORITE: + g_value_set_boolean (value, priv->favorite); + break; case PROP_TP_CHAT: g_value_set_object (value, priv->tp_chat); break; + case PROP_SUBJECT: + g_value_set_string (value, priv->subject); + break; + case PROP_MEMBERS_COUNT: + g_value_set_uint (value, priv->members_count); + break; + case PROP_INVITE_ONLY: + g_value_set_boolean (value, priv->invite_only); + break; + case PROP_NEED_PASSWORD: + g_value_set_boolean (value, priv->need_password); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -238,6 +308,22 @@ chatroom_set_property (GObject *object, } break; } + case PROP_SUBJECT: + empathy_chatroom_set_subject (EMPATHY_CHATROOM (object), + g_value_get_string (value)); + break; + case PROP_MEMBERS_COUNT: + empathy_chatroom_set_members_count (EMPATHY_CHATROOM (object), + g_value_get_uint (value)); + break; + case PROP_NEED_PASSWORD: + empathy_chatroom_set_need_password (EMPATHY_CHATROOM (object), + g_value_get_boolean (value)); + break; + case PROP_INVITE_ONLY: + empathy_chatroom_set_invite_only (EMPATHY_CHATROOM (object), + g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -432,3 +518,116 @@ empathy_chatroom_get_tp_chat (EmpathyChatroom *chatroom) { return priv->tp_chat; } + +const gchar * +empathy_chatroom_get_subject (EmpathyChatroom *chatroom) +{ + EmpathyChatroomPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), NULL); + + priv = GET_PRIV (chatroom); + + return priv->subject; +} + +void +empathy_chatroom_set_subject (EmpathyChatroom *chatroom, + const gchar *subject) +{ + EmpathyChatroomPriv *priv; + + g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom)); + + priv = GET_PRIV (chatroom); + + g_free (priv->subject); + priv->subject = NULL; + + if (subject) + priv->subject = g_strdup (subject); + + g_object_notify (G_OBJECT (chatroom), "subject"); +} + +guint +empathy_chatroom_get_members_count (EmpathyChatroom *chatroom) +{ + EmpathyChatroomPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), 0); + + priv = GET_PRIV (chatroom); + + return priv->members_count; +} + +void +empathy_chatroom_set_members_count (EmpathyChatroom *chatroom, + guint count) +{ + EmpathyChatroomPriv *priv; + + g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom)); + + priv = GET_PRIV (chatroom); + + priv->members_count = count; + + g_object_notify (G_OBJECT (chatroom), "members-count"); +} + +gboolean +empathy_chatroom_get_need_password (EmpathyChatroom *chatroom) +{ + EmpathyChatroomPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE); + + priv = GET_PRIV (chatroom); + + return priv->need_password; +} + +void +empathy_chatroom_set_need_password (EmpathyChatroom *chatroom, + gboolean need_password) +{ + EmpathyChatroomPriv *priv; + + g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom)); + + priv = GET_PRIV (chatroom); + + priv->need_password = need_password; + + g_object_notify (G_OBJECT (chatroom), "need-password"); +} + +gboolean +empathy_chatroom_get_invite_only (EmpathyChatroom *chatroom) +{ + EmpathyChatroomPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE); + + priv = GET_PRIV (chatroom); + + return priv->invite_only; +} + +void +empathy_chatroom_set_invite_only (EmpathyChatroom *chatroom, + gboolean invite_only) +{ + EmpathyChatroomPriv *priv; + + g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom)); + + priv = GET_PRIV (chatroom); + + priv->invite_only = invite_only; + + g_object_notify (G_OBJECT (chatroom), "invite-only"); +} + diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 3261c8d25..08e3bc1eb 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -69,6 +69,18 @@ void empathy_chatroom_set_name (EmpathyChatroom *chatroom, gboolean empathy_chatroom_get_auto_connect (EmpathyChatroom *chatroom); void empathy_chatroom_set_auto_connect (EmpathyChatroom *chatroom, gboolean auto_connect); +const gchar * empathy_chatroom_get_subject (EmpathyChatroom *chatroom); +void empathy_chatroom_set_subject (EmpathyChatroom *chatroom, + const gchar *subject); +guint empathy_chatroom_get_members_count (EmpathyChatroom *chatroom); +void empathy_chatroom_set_members_count (EmpathyChatroom *chatroom, + guint count); +gboolean empathy_chatroom_get_need_password (EmpathyChatroom *chatroom); +void empathy_chatroom_set_need_password (EmpathyChatroom *chatroom, + gboolean need_password); +gboolean empathy_chatroom_get_invite_only (EmpathyChatroom *chatroom); +void empathy_chatroom_set_invite_only (EmpathyChatroom *chatroom, + gboolean invite_only); gboolean empathy_chatroom_equal (gconstpointer v1, gconstpointer v2); EmpathyTpChat * empathy_chatroom_get_tp_chat (EmpathyChatroom *chatroom); diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index a1583c083..fc2526fd0 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -122,6 +122,10 @@ tp_roomlist_got_rooms_cb (TpChannel *channel, for (i = 0; i < rooms->len; i++) { const GValue *room_name_value; const GValue *handle_name_value; + const GValue *room_members_value; + const GValue *room_subject_value; + const GValue *room_invite_value; + const GValue *room_password_value; GValueArray *room_struct; guint handle; const gchar *channel_type; @@ -134,6 +138,10 @@ tp_roomlist_got_rooms_cb (TpChannel *channel, info = g_value_get_boxed (g_value_array_get_nth (room_struct, 2)); room_name_value = g_hash_table_lookup (info, "name"); handle_name_value = g_hash_table_lookup (info, "handle-name"); + room_subject_value = g_hash_table_lookup (info, "subject"); + room_members_value = g_hash_table_lookup (info, "members"); + room_invite_value = g_hash_table_lookup (info, "invite-only"); + room_password_value = g_hash_table_lookup (info, "password"); if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { continue; @@ -146,6 +154,26 @@ tp_roomlist_got_rooms_cb (TpChannel *channel, g_value_get_string (room_name_value)); } + if (room_members_value != NULL) { + empathy_chatroom_set_members_count (chatroom, + g_value_get_uint (room_members_value)); + } + + if (room_subject_value != NULL) { + empathy_chatroom_set_subject (chatroom, + g_value_get_string (room_subject_value)); + } + + if (room_invite_value != NULL) { + empathy_chatroom_set_invite_only (chatroom, + g_value_get_boolean (room_invite_value)); + } + + if (room_password_value != NULL) { + empathy_chatroom_set_need_password (chatroom, + g_value_get_boolean (room_password_value)); + } + if (handle_name_value != NULL) { empathy_chatroom_set_room (chatroom, g_value_get_string (handle_name_value)); diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f17ce245..32c38153c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,37 +9,37 @@ libempathy/empathy-utils.c libempathy-gtk/empathy-account-chooser.c libempathy-gtk/empathy-account-widget.c -libempathy-gtk/empathy-account-widget-aim.glade -libempathy-gtk/empathy-account-widget-generic.glade -libempathy-gtk/empathy-account-widget-groupwise.glade -libempathy-gtk/empathy-account-widget-icq.glade +[type: gettext/glade]libempathy-gtk/empathy-account-widget-aim.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-generic.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-groupwise.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-icq.ui libempathy-gtk/empathy-account-widget-irc.c -libempathy-gtk/empathy-account-widget-irc.glade -libempathy-gtk/empathy-account-widget-jabber.glade -libempathy-gtk/empathy-account-widget-msn.glade -libempathy-gtk/empathy-account-widget-salut.glade -libempathy-gtk/empathy-account-widget-sip.glade -libempathy-gtk/empathy-account-widget-yahoo.glade +[type: gettext/glade]libempathy-gtk/empathy-account-widget-irc.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-jabber.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-msn.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-salut.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-sip.ui +[type: gettext/glade]libempathy-gtk/empathy-account-widget-yahoo.ui libempathy-gtk/empathy-avatar-chooser.c libempathy-gtk/empathy-avatar-image.c libempathy-gtk/empathy-chat.c -libempathy-gtk/empathy-chat.glade +[type: gettext/glade]libempathy-gtk/empathy-chat.ui libempathy-gtk/empathy-chat-text-view.c libempathy-gtk/empathy-contact-dialogs.c -libempathy-gtk/empathy-contact-dialogs.glade +[type: gettext/glade]libempathy-gtk/empathy-contact-dialogs.ui libempathy-gtk/empathy-contact-list-view.c libempathy-gtk/empathy-contact-menu.c libempathy-gtk/empathy-contact-selector.c libempathy-gtk/empathy-contact-widget.c -libempathy-gtk/empathy-contact-widget.glade +[type: gettext/glade]libempathy-gtk/empathy-contact-widget.ui libempathy-gtk/empathy-irc-network-dialog.c libempathy-gtk/empathy-log-window.c -libempathy-gtk/empathy-log-window.glade -libempathy-gtk/empathy-new-message-dialog.glade +[type: gettext/glade]libempathy-gtk/empathy-log-window.ui +[type: gettext/glade]libempathy-gtk/empathy-new-message-dialog.ui libempathy-gtk/empathy-presence-chooser.c -libempathy-gtk/empathy-presence-chooser.glade +[type: gettext/glade]libempathy-gtk/empathy-presence-chooser.ui libempathy-gtk/empathy-spell-dialog.c -libempathy-gtk/empathy-spell-dialog.glade +[type: gettext/glade]libempathy-gtk/empathy-spell-dialog.ui libempathy-gtk/empathy-theme-boxes.c libempathy-gtk/empathy-theme-irc.c libempathy-gtk/empathy-theme-manager.c @@ -58,25 +58,25 @@ nothere/src/nothere-applet.c src/empathy.c src/empathy-about-dialog.c src/empathy-accounts-dialog.c -src/empathy-accounts-dialog.glade +[type: gettext/glade]src/empathy-accounts-dialog.ui src/empathy-call-window.c -src/empathy-call-window.glade +[type: gettext/glade]src/empathy-call-window.ui src/empathy-chat-window.c -src/empathy-chat-window.glade +src/empathy-chat-window.ui src/empathy-chatrooms-window.c -src/empathy-chatrooms-window.glade +[type: gettext/glade]src/empathy-chatrooms-window.ui src/empathy-event-manager.c src/empathy-ft-manager.c -src/empathy-ft-manager.glade +[type: gettext/glade]src/empathy-ft-manager.ui src/empathy-import-dialog.c -src/empathy-import-dialog.glade +[type: gettext/glade]src/empathy-import-dialog.ui src/empathy-main-window.c -src/empathy-main-window.glade +[type: gettext/glade]src/empathy-main-window.ui src/empathy-new-chatroom-dialog.c -src/empathy-new-chatroom-dialog.glade +[type: gettext/glade]src/empathy-new-chatroom-dialog.ui src/empathy-preferences.c -src/empathy-preferences.glade +[type: gettext/glade]src/empathy-preferences.ui src/empathy-status-icon.c -src/empathy-status-icon.glade +[type: gettext/glade]src/empathy-status-icon.ui src/empathy-tube-dispatch.c @@ -13,15 +13,15 @@ msgstr "" "Project-Id-Version: gossip.HEAD\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-16 19:06+0200\n" -"PO-Revision-Date: 2009-04-16 19:02+0300\n" +"PO-Revision-Date: 2009-04-18 22:32+0300\n" "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && " -"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Virtaal 0.3.1\n" #: ../data/empathy.desktop.in.in.h:1 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2009-04-10 16:55+0000\n" -"PO-Revision-Date: 2009-04-12 15:54+0200\n" +"POT-Creation-Date: 2009-04-17 20:26+0000\n" +"PO-Revision-Date: 2009-04-18 20:33+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -379,217 +379,194 @@ msgstr "Oculto" msgid "Offline" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-account-chooser.c:326 +#: ../libempathy-gtk/empathy-account-chooser.c:325 msgid "All" msgstr "Todo" #: ../libempathy-gtk/empathy-account-widget.c:302 -#: ../libempathy-gtk/empathy-account-widget.c:347 +#: ../libempathy-gtk/empathy-account-widget.c:349 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 msgid "<b>Advanced</b>" msgstr "<b>Avanzado</b>" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "Olvidar la contraseña y limpiar la entrada." - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Pass_word:" msgstr "Contra_seña:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 msgid "Screen _Name:" msgstr "_Nombre en pantalla:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "_Port:" msgstr "_Puerto:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10 -#: ../src/empathy-new-chatroom-dialog.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../src/empathy-new-chatroom-dialog.ui.h:8 msgid "_Server:" msgstr "_Servidor:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "_ID de sesión:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 msgid "ICQ _UIN:" msgstr "_UIN ICQ:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "_Charset:" msgstr "Conjunto de _caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:245 +#: ../libempathy-gtk/empathy-account-widget-irc.c:244 msgid "New Network" msgstr "Red nueva" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "<b>Network</b>" msgstr "<b>Red</b>" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "<b>Servers</b>" msgstr "<b>Servidores</b>" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Charset:" msgstr "Conjunto de caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4 -msgid "Create a new IRC network" -msgstr "Crear una red IRC nueva" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5 -msgid "Edit the selected IRC network" -msgstr "Editar la red IRC seleccionada" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Network" msgstr "Red" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Network:" msgstr "Red:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Apodo:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Password:" msgstr "Contraseña:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 msgid "Quit message:" msgstr "Mensaje de salida:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Real name:" msgstr "Nombre real:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12 -msgid "Remove the selected IRC network" -msgstr "Quitar la red IRC seleccionada" - -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 msgid "<b>Override server settings</b>" msgstr "<b>Sobreescribir los ajustes del servidor</b>" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Pri_ority:" msgstr "Pri_oridad:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "Reso_urce:" msgstr "Re_curso:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 msgid "Use old SS_L" msgstr "Usar SS_L antiguo" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "_Encryption required (TLS/SSL)" msgstr "Se requiere ci_frado (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 msgid "_Ignore SSL certificate errors" msgstr "_Ignorar los errores de certificados SSL" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2 msgid "_Email:" msgstr "Correo-_e:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3 msgid "_First Name:" msgstr "_Nombre:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4 msgid "_Jabber ID:" msgstr "ID _Jabber:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5 msgid "_Last Name:" msgstr "Ape_llidos:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6 -#: ../src/empathy-chatrooms-window.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6 msgid "_Nickname:" msgstr "_Apodo:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7 msgid "_Published Name:" msgstr "Nombre _publicado:" #. 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.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Discover STUN" msgstr "Descubrir STUN" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "STUN Server:" msgstr "Servidor STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "STUN port:" msgstr "Puerto STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "_Username:" msgstr "_Usuario:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Use _Yahoo Japan" msgstr "User _Yahoo Japan" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 msgid "Yahoo I_D:" msgstr "I_D de Yahoo:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 msgid "_Ignore conference and chatroom invitations" msgstr "_Ignorar invitaciones a conferencias y salas de chat" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "_Room List locale:" msgstr "Configuración de la lista de _salas:" @@ -602,19 +579,19 @@ msgstr "No se pudo convertir la imagen" msgid "None of the accepted image formats is supported on your system" msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados" -#: ../libempathy-gtk/empathy-avatar-chooser.c:956 +#: ../libempathy-gtk/empathy-avatar-chooser.c:954 msgid "Select Your Avatar Image" msgstr "Seleccione su imagen de avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:959 +#: ../libempathy-gtk/empathy-avatar-chooser.c:957 msgid "No Image" msgstr "Sin imagen" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1019 msgid "Images" msgstr "Imágenes" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1025 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1023 msgid "All Files" msgstr "Todos los archivos" @@ -622,133 +599,132 @@ msgstr "Todos los archivos" msgid "Click to enlarge" msgstr "Pulse para agrandar" -#. This is an unknown command, display a message to the user -#: ../libempathy-gtk/empathy-chat.c:378 +#: ../libempathy-gtk/empathy-chat.c:180 +msgid "Failed to reconnect this chat" +msgstr "Falló al reconectar a este chat" + +#: ../libempathy-gtk/empathy-chat.c:398 msgid "Unsupported command" msgstr "Comando no soportado" -#: ../libempathy-gtk/empathy-chat.c:506 +#: ../libempathy-gtk/empathy-chat.c:533 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:509 +#: ../libempathy-gtk/empathy-chat.c:536 msgid "invalid contact" msgstr "contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:512 +#: ../libempathy-gtk/empathy-chat.c:539 msgid "permission denied" msgstr "permiso denegado" -#: ../libempathy-gtk/empathy-chat.c:515 +#: ../libempathy-gtk/empathy-chat.c:542 msgid "too long message" msgstr "mensaje demasiado largo" -#: ../libempathy-gtk/empathy-chat.c:518 +#: ../libempathy-gtk/empathy-chat.c:545 msgid "not implemented" msgstr "no implementado" -#: ../libempathy-gtk/empathy-chat.c:521 +#: ../libempathy-gtk/empathy-chat.c:548 msgid "unknown" msgstr "desconocido" -#: ../libempathy-gtk/empathy-chat.c:525 +#: ../libempathy-gtk/empathy-chat.c:552 #, c-format msgid "Error sending message '%s': %s" msgstr "Error al enviar el mensaje «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:555 +#: ../libempathy-gtk/empathy-chat.c:582 #, c-format msgid "Topic set to: %s" msgstr "El tema se ha establecido a: %s" -#: ../libempathy-gtk/empathy-chat.c:557 +#: ../libempathy-gtk/empathy-chat.c:584 msgid "No topic defined" msgstr "No se ha definido el tema" -#: ../libempathy-gtk/empathy-chat.c:972 +#: ../libempathy-gtk/empathy-chat.c:977 msgid "Insert Smiley" msgstr "Insertar emoticono" #. send button -#: ../libempathy-gtk/empathy-chat.c:990 -#: ../libempathy-gtk/empathy-ui-utils.c:1559 +#: ../libempathy-gtk/empathy-chat.c:995 +#: ../libempathy-gtk/empathy-ui-utils.c:1507 msgid "_Send" msgstr "E_nviar" -#: ../libempathy-gtk/empathy-chat.c:1024 +#: ../libempathy-gtk/empathy-chat.c:1029 msgid "_Check Word Spelling..." msgstr "_Comprobar ortografía…" -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1147 #, c-format msgid "%s has joined the room" msgstr "%s ha entrado en la sala" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1150 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" -#: ../libempathy-gtk/empathy-chat.c:1260 ../src/empathy-call-window.c:764 +#: ../libempathy-gtk/empathy-chat.c:1265 ../src/empathy-call-window.c:756 msgid "Disconnected" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-chat.c:1657 +#: ../libempathy-gtk/empathy-chat.c:1660 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:1707 -#: ../libempathy-gtk/empathy-log-window.c:505 +#: ../libempathy-gtk/empathy-chat.c:1710 +#: ../libempathy-gtk/empathy-log-window.c:501 msgid "Conversation" msgstr "Conversación" -#: ../libempathy-gtk/empathy-chat.glade.h:1 +#: ../libempathy-gtk/empathy-chat.ui.h:1 msgid "<b>Topic:</b>" msgstr "<b>Tema:</b>" -#: ../libempathy-gtk/empathy-chat.glade.h:2 -msgid "Group Chat" -msgstr "Grupo de chat" - -#: ../libempathy-gtk/empathy-chat-text-view.c:331 +#: ../libempathy-gtk/empathy-chat-text-view.c:323 msgid "_Copy Link Address" msgstr "_Copiar la dirección del enlace" -#: ../libempathy-gtk/empathy-chat-text-view.c:339 +#: ../libempathy-gtk/empathy-chat-text-view.c:331 msgid "_Open Link" msgstr "_Abrir enlace" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:432 +#: ../libempathy-gtk/empathy-chat-text-view.c:424 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:180 +#: ../libempathy-gtk/empathy-contact-dialogs.c:181 msgid "Personal Information" msgstr "Información personal" -#: ../libempathy-gtk/empathy-contact-dialogs.c:183 +#: ../libempathy-gtk/empathy-contact-dialogs.c:184 msgid "Edit Contact Information" msgstr "Editar información del contacto" -#: ../libempathy-gtk/empathy-contact-dialogs.c:186 +#: ../libempathy-gtk/empathy-contact-dialogs.c:187 msgid "Contact Information" msgstr "Información del contacto" -#: ../libempathy-gtk/empathy-contact-dialogs.c:267 +#: ../libempathy-gtk/empathy-contact-dialogs.c:269 msgid "I would like to add you to my contact list." msgstr "Me gustaría añadirte a mi lista de contactos." -#: ../libempathy-gtk/empathy-contact-dialogs.c:291 +#: ../libempathy-gtk/empathy-contact-dialogs.c:293 msgid "New Contact" msgstr "Contacto nuevo" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 msgid "Decide _Later" msgstr "Decidir _luego" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Petición de suscripción" @@ -780,17 +756,17 @@ msgid "Sorry, I don't want you in my contact list anymore." msgstr "Lo siento, no te quiero en mi lista de contactos." #: ../libempathy-gtk/empathy-contact-menu.c:130 -#: ../src/empathy-main-window.glade.h:9 +#: ../src/empathy-main-window.ui.h:8 msgid "_Chat" msgstr "_Chat" #: ../libempathy-gtk/empathy-contact-menu.c:161 -#: ../src/empathy-call-window.glade.h:5 +#: ../src/empathy-call-window.ui.h:5 msgid "_Call" msgstr "_Llamar" #: ../libempathy-gtk/empathy-contact-menu.c:200 -#: ../src/empathy-main-window.glade.h:17 +#: ../src/empathy-main-window.ui.h:17 msgid "_View Previous Conversations" msgstr "_Ver conversaciones previas" @@ -803,7 +779,7 @@ msgid "Infor_mation" msgstr "Infor_mación" #: ../libempathy-gtk/empathy-contact-menu.c:277 -#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11 +#: ../src/empathy-main-window.ui.h:10 msgid "_Edit" msgstr "_Editar" @@ -815,88 +791,84 @@ msgstr "Invitando a esta sala" msgid "_Invite to chatroom" msgstr "_Invitar a la sala" -#: ../libempathy-gtk/empathy-contact-selector.c:111 +#: ../libempathy-gtk/empathy-contact-selector.c:112 msgid "Select a contact" msgstr "Seleccionar un contacto" -#: ../libempathy-gtk/empathy-contact-widget.c:361 +#: ../libempathy-gtk/empathy-contact-widget.c:354 msgid "Save Avatar" msgstr "Guardar avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:417 +#: ../libempathy-gtk/empathy-contact-widget.c:410 msgid "Unable to save avatar" msgstr "No se pudo guardar el avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:912 +#: ../libempathy-gtk/empathy-contact-widget.c:905 msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-contact-widget.c:921 -#: ../src/empathy-main-window.c:991 +#: ../libempathy-gtk/empathy-contact-widget.c:914 +#: ../src/empathy-main-window.c:882 msgid "Group" msgstr "Grupo" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:1 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "<b>Client Information</b>" msgstr "<b>Información del cliente</b>" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:2 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 msgid "<b>Contact Details</b>" msgstr "<b>Detalles del contacto</b>" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:3 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "<b>Contact</b>" msgstr "<b>Contacto</b>" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:4 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "<b>Groups</b>" msgstr "<b>Grupos</b>" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:5 -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1 -#: ../src/empathy-chatrooms-window.glade.h:1 -#: ../src/empathy-new-chatroom-dialog.glade.h:1 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "Cuenta:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 msgid "Alias:" msgstr "Apodo:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:8 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 msgid "Client:" msgstr "Cliente:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:9 -msgid "Contact information" -msgstr "Información del contacto" - -#: ../libempathy-gtk/empathy-contact-widget.glade.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "Email:" msgstr "Correo-e:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Fullname:" msgstr "Nombre completo:" #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.glade.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:12 msgid "Identifier:" msgstr "Identificador:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:14 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 msgid "Information requested..." msgstr "Información solicitada…" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "OS:" msgstr "SO:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:16 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -904,75 +876,72 @@ msgstr "" "Seleccione los grupos en los que quiere que este contacto aparezca, Note que " "puede seleccionar más de un grupo o ningún grupo." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 msgid "Version:" msgstr "Versión:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:18 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 msgid "Web site:" msgstr "Página web:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "_Add Group" msgstr "_Añadir grupo" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:284 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:283 msgid "new server" msgstr "servidor nuevo" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:513 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:510 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:528 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:525 msgid "Port" msgstr "Puerto" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:541 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:538 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:498 -#: ../src/empathy-import-dialog.c:282 +#: ../libempathy-gtk/empathy-log-window.c:494 +#: ../src/empathy-import-dialog.c:281 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-log-window.c:515 +#: ../libempathy-gtk/empathy-log-window.c:511 msgid "Date" msgstr "Fecha" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:1 msgid "Conversations" msgstr "Conversaciones" -#: ../libempathy-gtk/empathy-log-window.glade.h:3 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 msgid "Previous Conversations" msgstr "Conversaciones anteriores" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Search" msgstr "Buscar" -#. Searching *for* something -#: ../libempathy-gtk/empathy-log-window.glade.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "_For:" msgstr "_Para:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 msgid "C_all" msgstr "_Llamar" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 msgid "C_hat" msgstr "C_hat" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 msgid "Contact ID:" msgstr "ID del contacto:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 msgid "New Conversation" msgstr "Conversación nueva" @@ -982,60 +951,56 @@ msgstr "Conversación nueva" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:161 -#| msgid "Custom messages..." +#: ../libempathy-gtk/empathy-presence-chooser.c:162 msgid "Custom Message..." msgstr "Mensaje personalizado…" #: ../libempathy-gtk/empathy-presence-chooser.c:217 -#| msgid "Custom messages..." msgid "Edit Custom Messages..." msgstr "Editar mensajes personalizados…" #: ../libempathy-gtk/empathy-presence-chooser.c:269 -#| msgid "Status" msgid "Set status" msgstr "Establecer estado" -#. FIXME: this string sucks -#: ../libempathy-gtk/empathy-presence-chooser.c:655 +#: ../libempathy-gtk/empathy-presence-chooser.c:653 msgid "Set your presence and current status" msgstr "Establecer su presencia y estado actual" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:874 +#: ../libempathy-gtk/empathy-presence-chooser.c:873 msgid "Custom messages..." msgstr "Mensajes personalizados…" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1 +#: ../libempathy-gtk/empathy-presence-chooser.ui.h:1 msgid "Custom message" msgstr "Mensaje personalizado…" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2 +#: ../libempathy-gtk/empathy-presence-chooser.ui.h:2 msgid "Message:" msgstr "Mensaje:" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3 +#: ../libempathy-gtk/empathy-presence-chooser.ui.h:3 msgid "Save message" msgstr "Guardar mensaje" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4 +#: ../libempathy-gtk/empathy-presence-chooser.ui.h:4 msgid "Status:" msgstr "Estado:" -#: ../libempathy-gtk/empathy-spell-dialog.c:88 +#: ../libempathy-gtk/empathy-spell-dialog.c:81 msgid "Word" msgstr "Palabra" -#: ../libempathy-gtk/empathy-spell-dialog.c:265 +#: ../libempathy-gtk/empathy-spell-dialog.c:255 msgid "Suggestions for the word" msgstr "Sugerencias para la palabra" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1 +#: ../libempathy-gtk/empathy-spell-dialog.ui.h:1 msgid "Spell Checker" msgstr "Corrector ortográfico" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2 +#: ../libempathy-gtk/empathy-spell-dialog.ui.h:2 msgid "Suggestions for the word:" msgstr "Sugerencias para la palabra:" @@ -1055,51 +1020,51 @@ msgstr "Limpio" msgid "Blue" msgstr "Azul" -#: ../libempathy-gtk/empathy-ui-utils.c:1406 +#: ../libempathy-gtk/empathy-ui-utils.c:1354 msgid "Unable to open URI" msgstr "No se pudo abrir el URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1551 +#: ../libempathy-gtk/empathy-ui-utils.c:1499 msgid "Select a file" msgstr "Seleccionar un archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1587 +#: ../libempathy-gtk/empathy-ui-utils.c:1535 msgid "Received an instant message" msgstr "Mensaje instantáneo recibido" -#: ../libempathy-gtk/empathy-ui-utils.c:1589 +#: ../libempathy-gtk/empathy-ui-utils.c:1537 msgid "Sent an instant message" msgstr "Enviar un mensaje instantáneo" -#: ../libempathy-gtk/empathy-ui-utils.c:1591 +#: ../libempathy-gtk/empathy-ui-utils.c:1539 msgid "Incoming chat request" msgstr "Solicitud de chat entrante" -#: ../libempathy-gtk/empathy-ui-utils.c:1593 +#: ../libempathy-gtk/empathy-ui-utils.c:1541 msgid "Contact connected" msgstr "Contacto conectado" -#: ../libempathy-gtk/empathy-ui-utils.c:1595 +#: ../libempathy-gtk/empathy-ui-utils.c:1543 msgid "Contact disconnected" msgstr "Contacto desconectado" -#: ../libempathy-gtk/empathy-ui-utils.c:1597 +#: ../libempathy-gtk/empathy-ui-utils.c:1545 msgid "Connected to server" msgstr "Conectado con el servidor" -#: ../libempathy-gtk/empathy-ui-utils.c:1599 +#: ../libempathy-gtk/empathy-ui-utils.c:1547 msgid "Disconnected from server" msgstr "Desconectado del servidor" -#: ../libempathy-gtk/empathy-ui-utils.c:1601 +#: ../libempathy-gtk/empathy-ui-utils.c:1549 msgid "Incoming voice call" msgstr "Llamada de voz entrante" -#: ../libempathy-gtk/empathy-ui-utils.c:1603 +#: ../libempathy-gtk/empathy-ui-utils.c:1551 msgid "Outgoing voice call" msgstr "Llamada de voz saliente" -#: ../libempathy-gtk/empathy-ui-utils.c:1605 +#: ../libempathy-gtk/empathy-ui-utils.c:1553 msgid "Voice call ended" msgstr "Finalizó la llamada de vz" @@ -1303,7 +1268,7 @@ msgid "_Information" msgstr "_Información" #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.glade.h:15 +#: ../src/empathy-main-window.ui.h:15 msgid "_Preferences" msgstr "_Preferencias" @@ -1340,7 +1305,7 @@ msgstr "Mostrar el diálogo de las cuentas" msgid "- Empathy Instant Messenger" msgstr "- Mensajería instantánea Empathy" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy-about-dialog.c:83 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1352,7 +1317,7 @@ msgstr "" "Foundation; ya sea en la versión 2 de la Licencia, o (a su elección) " "cualquier versión posterior." -#: ../src/empathy-about-dialog.c:88 +#: ../src/empathy-about-dialog.c:87 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -1364,7 +1329,7 @@ msgstr "" "PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General de GNU para " "más detalles." -#: ../src/empathy-about-dialog.c:92 +#: ../src/empathy-about-dialog.c:91 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -1374,11 +1339,11 @@ msgstr "" "con Gossip ; si no, escriba a la Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 EE. UU." -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:119 msgid "An Instant Messaging client for GNOME" msgstr "Un cliente de mensajería instantánea para GNOME" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009" @@ -1386,8 +1351,7 @@ msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009" msgid "Enabled" msgstr "Activado" -#: ../src/empathy-accounts-dialog.c:401 -#: ../src/empathy-accounts-dialog.glade.h:4 +#: ../src/empathy-accounts-dialog.c:401 ../src/empathy-accounts-dialog.ui.h:4 msgid "Accounts" msgstr "Cuentas" @@ -1419,31 +1383,31 @@ msgstr "" "\n" "Si decidiera volver a añadir la cuenta más tarde, estarán aún disponibles." -#: ../src/empathy-accounts-dialog.glade.h:1 +#: ../src/empathy-accounts-dialog.ui.h:1 msgid "<b>New Account</b>" msgstr "<b>Nueva cuenta</b>" -#: ../src/empathy-accounts-dialog.glade.h:2 +#: ../src/empathy-accounts-dialog.ui.h:2 msgid "<b>No protocol installed</b>" msgstr "<b>No hay protocolos instalados</b>" -#: ../src/empathy-accounts-dialog.glade.h:3 +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "<b>Settings</b>" msgstr "<b>Configuración</b>" -#: ../src/empathy-accounts-dialog.glade.h:5 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Cr_eate" msgstr "Cr_ear" -#: ../src/empathy-accounts-dialog.glade.h:6 +#: ../src/empathy-accounts-dialog.ui.h:6 msgid "I already have an account I want to use" msgstr "Ya tengo una cuenta que quiero usar" -#: ../src/empathy-accounts-dialog.glade.h:7 +#: ../src/empathy-accounts-dialog.ui.h:7 msgid "Import Accounts..." msgstr "Importar cuentas…" -#: ../src/empathy-accounts-dialog.glade.h:8 +#: ../src/empathy-accounts-dialog.ui.h:8 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." @@ -1451,204 +1415,106 @@ msgstr "" "Para añadir una nueva cuenta debe instalar primero un «backend» para cada " "protocolo que quiera usar." -#: ../src/empathy-accounts-dialog.glade.h:9 +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "Type:" msgstr "Tipo:" -#: ../src/empathy-call-window.c:346 +#: ../src/empathy-call-window.c:319 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:349 +#: ../src/empathy-call-window.c:322 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-call-window.c:352 +#: ../src/empathy-call-window.c:325 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:456 +#: ../src/empathy-call-window.c:429 msgid "Volume" msgstr "Volumen" -#: ../src/empathy-call-window.c:547 +#: ../src/empathy-call-window.c:532 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../src/empathy-call-window.c:565 +#: ../src/empathy-call-window.c:550 msgid "Dialpad" msgstr "Teclado de llamada" -#: ../src/empathy-call-window.c:571 +#: ../src/empathy-call-window.c:556 msgid "Audio input" msgstr "Entrada de sonido" -#: ../src/empathy-call-window.c:575 +#: ../src/empathy-call-window.c:560 msgid "Video input" msgstr "Entrada de vídeo" -#: ../src/empathy-call-window.c:588 +#: ../src/empathy-call-window.c:573 msgid "Connecting..." msgstr "Conectando…" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:844 +#: ../src/empathy-call-window.c:837 #, c-format -#| msgid "Connected -- %d:%02dm" msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" -#: ../src/empathy-call-window.glade.h:1 +#: ../src/empathy-call-window.ui.h:1 msgid "Hang up" msgstr "Colgar" -#: ../src/empathy-call-window.glade.h:2 +#: ../src/empathy-call-window.ui.h:2 msgid "Send Audio" msgstr "Enviar sonido" -#: ../src/empathy-call-window.glade.h:3 +#: ../src/empathy-call-window.ui.h:3 msgid "Send video" msgstr "Enviar vídeo" -#: ../src/empathy-call-window.glade.h:4 +#: ../src/empathy-call-window.ui.h:4 msgid "Video preview" msgstr "Vista preliminar de vídeo" -#: ../src/empathy-call-window.glade.h:6 +#: ../src/empathy-call-window.ui.h:6 msgid "_View" msgstr "_Ver" -#: ../src/empathy-chat-window.c:313 +#: ../src/empathy-chat-window.c:308 #, c-format msgid "Conversations (%d)" msgstr "Conversaciones (%d)" -#: ../src/empathy-chat-window.c:418 +#: ../src/empathy-chat-window.c:413 msgid "Topic:" msgstr "Tema:" -#: ../src/empathy-chat-window.c:423 +#: ../src/empathy-chat-window.c:418 msgid "Typing a message." msgstr "Tecleando un mensaje." -#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429 +#: ../src/empathy-chat-window.c:889 ../src/empathy-event-manager.c:429 #, c-format msgid "New message from %s" msgstr "Nuevo mensaje de %s" -#: ../src/empathy-chat-window.glade.h:1 -msgid "C_lear" -msgstr "_Limpiar" - -#: ../src/empathy-chat-window.glade.h:2 -msgid "Chat" -msgstr "Chat" - -#: ../src/empathy-chat-window.glade.h:3 -msgid "Insert _Smiley" -msgstr "Insertar _emoticono" - -#: ../src/empathy-chat-window.glade.h:4 -msgid "Invitation _message:" -msgstr "_Mensaje de invitación:" - -#: ../src/empathy-chat-window.glade.h:5 -msgid "Invite" -msgstr "Invitar" - -#: ../src/empathy-chat-window.glade.h:6 -msgid "Move Tab _Left" -msgstr "Mover solapa a la _izquierda" - -#: ../src/empathy-chat-window.glade.h:7 -msgid "Move Tab _Right" -msgstr "Mover solapa a la _derecha" - -#: ../src/empathy-chat-window.glade.h:8 -msgid "Select who would you like to invite:" -msgstr "Seleccione a quién quiere invitar:" - -#: ../src/empathy-chat-window.glade.h:9 -msgid "You have been invited to join a chat conference." -msgstr "Le han invitado a unirse a una conferencia por chat." - -#: ../src/empathy-chat-window.glade.h:10 -msgid "_Contact" -msgstr "Con_tacto" - -#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10 -msgid "_Contents" -msgstr "Índ_ice" - -#: ../src/empathy-chat-window.glade.h:12 -msgid "_Conversation" -msgstr "_Conversación" - -#: ../src/empathy-chat-window.glade.h:13 -msgid "_Detach Tab" -msgstr "_Desacoplar solapa" - -#: ../src/empathy-chat-window.glade.h:15 -msgid "_Favorite Chatroom" -msgstr "Sala de chat _favorita" - -#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12 -msgid "_Help" -msgstr "Ay_uda" - -#: ../src/empathy-chat-window.glade.h:17 -msgid "_Next Tab" -msgstr "Solapa _siguiente" - -#: ../src/empathy-chat-window.glade.h:18 -msgid "_Previous Tab" -msgstr "Solapa _anterior" - -#: ../src/empathy-chat-window.glade.h:19 -msgid "_Tabs" -msgstr "_Solapas" - -#: ../src/empathy-chatrooms-window.c:262 +#: ../src/empathy-chatrooms-window.c:258 msgid "Name" msgstr "Nombre" -#: ../src/empathy-chatrooms-window.c:280 +#: ../src/empathy-chatrooms-window.c:276 msgid "Room" msgstr "Sala" -#: ../src/empathy-chatrooms-window.c:289 +#: ../src/empathy-chatrooms-window.c:285 msgid "Auto-Connect" msgstr "Autoconectar" -#: ../src/empathy-chatrooms-window.glade.h:2 -msgid "Edit Favorite Room" -msgstr "Editar sala de favoritos" - -#: ../src/empathy-chatrooms-window.glade.h:3 -msgid "Join room on start_up" -msgstr "Unirse a una sala al _iniciar" - -#: ../src/empathy-chatrooms-window.glade.h:4 -msgid "Join this chat room when Empathy starts and you are connected" -msgstr "Unirse a esta sala de chat cuando Empathy se inicie y esté conectado" - -#: ../src/empathy-chatrooms-window.glade.h:5 +#: ../src/empathy-chatrooms-window.ui.h:2 msgid "Manage Favorite Rooms" msgstr "Gestionar salas favoritas" -#: ../src/empathy-chatrooms-window.glade.h:6 -msgid "N_ame:" -msgstr "_Nombre:" - -#: ../src/empathy-chatrooms-window.glade.h:7 -msgid "S_erver:" -msgstr "_Servidor:" - -#: ../src/empathy-chatrooms-window.glade.h:9 -#: ../src/empathy-new-chatroom-dialog.glade.h:9 -msgid "_Room:" -msgstr "_Sala:" - #: ../src/empathy-event-manager.c:377 msgid "Incoming call" msgstr "Llamada entrante" @@ -1694,11 +1560,12 @@ msgid "%s is inviting you to join %s" msgstr "%s le está invitando a unirse a %s" #. Decline button -#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1032 +#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1031 msgid "_Decline" msgstr "_Rechazar" #: ../src/empathy-event-manager.c:714 +#: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "_Join" msgstr "_Unirse" @@ -1791,7 +1658,8 @@ msgid "%s of %s" msgstr "%s de %s" #: ../src/empathy-ft-manager.c:254 -msgid "Waiting the other participant's response" +#| msgid "Waiting the other participant's response" +msgid "Waiting for the other participant's response" msgstr "Esperando la respuesta del otro participante" #: ../src/empathy-ft-manager.c:264 @@ -1833,70 +1701,70 @@ msgctxt "file transfer percent" msgid "Unknown" msgstr "Desconocido" -#: ../src/empathy-ft-manager.c:663 +#: ../src/empathy-ft-manager.c:662 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:675 +#: ../src/empathy-ft-manager.c:674 msgid "File" msgstr "Archivo" -#: ../src/empathy-ft-manager.c:697 +#: ../src/empathy-ft-manager.c:696 msgid "Remaining" msgstr "Restantes" -#: ../src/empathy-ft-manager.c:895 +#: ../src/empathy-ft-manager.c:894 msgid "Cannot save file to this location" msgstr "No se puede guardar el archivo en esta ubicación" -#: ../src/empathy-ft-manager.c:941 +#: ../src/empathy-ft-manager.c:940 msgid "Save file as..." msgstr "Guardar archivo como…" -#: ../src/empathy-ft-manager.c:1011 +#: ../src/empathy-ft-manager.c:1010 msgid "unknown size" msgstr "tamaño desconocido" -#: ../src/empathy-ft-manager.c:1017 +#: ../src/empathy-ft-manager.c:1016 #, c-format msgid "%s would like to send you a file" msgstr "%s quiere enviarle un archivo" #. Translators: the first %s is the file name, the second %s is the file size -#: ../src/empathy-ft-manager.c:1023 +#: ../src/empathy-ft-manager.c:1022 #, c-format msgid "Do you want to accept the file \"%s\" (%s)?" msgstr "¿Quiere aceptar el archivo «%s» (%s)?" #. Accept button -#: ../src/empathy-ft-manager.c:1041 +#: ../src/empathy-ft-manager.c:1040 msgid "_Accept" msgstr "_Aceptar" -#: ../src/empathy-ft-manager.glade.h:1 +#: ../src/empathy-ft-manager.ui.h:1 msgid "File transfers" msgstr "Transferencias de archivos" -#: ../src/empathy-ft-manager.glade.h:2 +#: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" msgstr "" "Eliminar transferencias de archivo completadas, canceladas y fallidas de la " "lista" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:260 +#: ../src/empathy-import-dialog.c:259 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-dialog.c:269 +#: ../src/empathy-import-dialog.c:268 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-dialog.c:295 +#: ../src/empathy-import-dialog.c:294 msgid "Source" msgstr "Origen" -#: ../src/empathy-import-dialog.c:389 +#: ../src/empathy-import-dialog.c:388 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -1904,138 +1772,175 @@ msgstr "" "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo " "soporta importar cuentas desde Pidgin." -#: ../src/empathy-import-dialog.glade.h:1 +#: ../src/empathy-import-dialog.ui.h:1 msgid "Import Accounts" msgstr "Importar cuentas" -#: ../src/empathy-main-window.c:391 +#: ../src/empathy-main-window.c:393 +msgid "_Edit account" +msgstr "_Editar cuenta" + +#: ../src/empathy-main-window.c:496 msgid "No error specified" msgstr "No se especificó el error" -#: ../src/empathy-main-window.c:394 +#: ../src/empathy-main-window.c:499 msgid "Network error" msgstr "Error de red" -#: ../src/empathy-main-window.c:397 +#: ../src/empathy-main-window.c:502 msgid "Authentication failed" msgstr "Falló la autenticación" -#: ../src/empathy-main-window.c:400 +#: ../src/empathy-main-window.c:505 msgid "Encryption error" msgstr "Error de cifrado" -#: ../src/empathy-main-window.c:403 +#: ../src/empathy-main-window.c:508 msgid "Name in use" msgstr "Nombre en uso" -#: ../src/empathy-main-window.c:406 +#: ../src/empathy-main-window.c:511 msgid "Certificate not provided" msgstr "No se proporcionó el certificado" -#: ../src/empathy-main-window.c:409 +#: ../src/empathy-main-window.c:514 msgid "Certificate untrusted" msgstr "Certificado sin confianza" -#: ../src/empathy-main-window.c:412 +#: ../src/empathy-main-window.c:517 msgid "Certificate expired" msgstr "El certificado ha expirado" -#: ../src/empathy-main-window.c:415 +#: ../src/empathy-main-window.c:520 msgid "Certificate not activated" msgstr "El certificado no está activado" -#: ../src/empathy-main-window.c:418 +#: ../src/empathy-main-window.c:523 msgid "Certificate hostname mismatch" msgstr "El nombre del equipo del certificado no coincide" -#: ../src/empathy-main-window.c:421 +#: ../src/empathy-main-window.c:526 msgid "Certificate fingerprint mismatch" msgstr "La huella del certificado no coincide" -#: ../src/empathy-main-window.c:424 +#: ../src/empathy-main-window.c:529 msgid "Certificate self-signed" msgstr "Certificado firmado consigo mismo" -#: ../src/empathy-main-window.c:427 +#: ../src/empathy-main-window.c:532 msgid "Certificate error" msgstr "Error del certificado" -#: ../src/empathy-main-window.c:430 +#: ../src/empathy-main-window.c:535 msgid "Unknown error" msgstr "Error desconocido" -#: ../src/empathy-main-window.c:594 -msgid "Show and edit accounts" -msgstr "Mostrar y editar cuentas" - -#: ../src/empathy-main-window.c:974 +#: ../src/empathy-main-window.c:865 msgid "Contact" msgstr "Contacto" -#: ../src/empathy-main-window.c:1176 -msgid "_Edit account" -msgstr "_Editar cuenta" +#: ../src/empathy-main-window.c:1202 +msgid "Show and edit accounts" +msgstr "Mostrar y editar cuentas" -#: ../src/empathy-main-window.glade.h:1 +#: ../src/empathy-main-window.ui.h:1 msgid "Contact List" msgstr "Lista de contactos" -#: ../src/empathy-main-window.glade.h:2 +#: ../src/empathy-main-window.ui.h:2 msgid "Context" msgstr "Contexto" -#: ../src/empathy-main-window.glade.h:3 +#: ../src/empathy-main-window.ui.h:3 msgid "Join _Favorites" msgstr "Unirse a _favoritas" -#: ../src/empathy-main-window.glade.h:4 -msgid "Join _New..." -msgstr "Unirse a _nueva…" - -#: ../src/empathy-main-window.glade.h:5 +#: ../src/empathy-main-window.ui.h:4 msgid "Manage Favorites" msgstr "Gestionar favoritos" -#: ../src/empathy-main-window.glade.h:6 +#: ../src/empathy-main-window.ui.h:5 msgid "Show _Offline Contacts" msgstr "Mostrar contactos _desconectados" -#: ../src/empathy-main-window.glade.h:7 +#: ../src/empathy-main-window.ui.h:6 msgid "_Accounts" msgstr "_Cuentas" -#: ../src/empathy-main-window.glade.h:8 +#: ../src/empathy-main-window.ui.h:7 msgid "_Add Contact..." msgstr "_Añadir contacto…" -#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2 +#: ../src/empathy-main-window.ui.h:9 +msgid "_Contents" +msgstr "Índ_ice" + +#: ../src/empathy-main-window.ui.h:11 +msgid "_Help" +msgstr "Ay_uda" + +#: ../src/empathy-main-window.ui.h:12 +#| msgid "_Join" +msgid "_Join..." +msgstr "_Unirse…" + +#: ../src/empathy-main-window.ui.h:13 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "_Conversación nueva…" -#: ../src/empathy-main-window.glade.h:14 +#: ../src/empathy-main-window.ui.h:14 msgid "_Personal Information" msgstr "Información p_ersonal" -#: ../src/empathy-main-window.glade.h:16 +#: ../src/empathy-main-window.ui.h:16 msgid "_Room" msgstr "_Sala" -#: ../src/empathy-new-chatroom-dialog.c:291 -msgid "Chat Rooms" -msgstr "Salas de chat" +#: ../src/empathy-new-chatroom-dialog.c:313 +#| msgid "Chat Rooms" +msgid "Chat Room" +msgstr "Sala de chat" -#: ../src/empathy-new-chatroom-dialog.glade.h:2 -msgid "Browse:" -msgstr "Buscar:" +#: ../src/empathy-new-chatroom-dialog.c:328 +#| msgid "Themes" +msgid "Members" +msgstr "Miembros" -#: ../src/empathy-new-chatroom-dialog.glade.h:3 +#: ../src/empathy-new-chatroom-dialog.c:447 +#, c-format +msgctxt "" +"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " +"and a number." +msgid "" +"<b>%s</b>\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" +"<b>%s</b>\n" +"Invite necesaria: %s\n" +"Contraseña necesaria: %s\n" +"Miembros: %s" + +#: ../src/empathy-new-chatroom-dialog.c:449 +#: ../src/empathy-new-chatroom-dialog.c:450 +msgid "Yes" +msgstr "Sí" + +#: ../src/empathy-new-chatroom-dialog.c:449 +#: ../src/empathy-new-chatroom-dialog.c:450 +msgid "No" +msgstr "No" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "" "Enter the room name to join here or click on one or more rooms in the list." msgstr "" "Introduzca el nombre de la sala a la que unirse o pulse una o más salas de " "la lista." -#: ../src/empathy-new-chatroom-dialog.glade.h:4 +#: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -2043,78 +1948,73 @@ msgstr "" "Introduzca el servidor que aloja la sala o déjelo vacío si la sala está en " "la cuenta del servidor actual" -#: ../src/empathy-new-chatroom-dialog.glade.h:5 -msgid "Join" -msgstr "Unirse" +#: ../src/empathy-new-chatroom-dialog.ui.h:4 +#| msgid "Room" +msgid "Join Room" +msgstr "Unirse a sala" -#: ../src/empathy-new-chatroom-dialog.glade.h:6 -msgid "Join New" -msgstr "Unirse a nueva" +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +#| msgid "_Room List locale:" +msgid "Room List" +msgstr "Lista de salas" -#: ../src/empathy-new-chatroom-dialog.glade.h:7 -msgid "Re_fresh" -msgstr "A_ctualizar" - -#: ../src/empathy-new-chatroom-dialog.glade.h:8 -msgid "" -"This list represents all chat rooms hosted on the server you have entered." -msgstr "" -"Esta lista representa todas las salas de chat hospedadas en el servidor al " -"que ha entrado." +#: ../src/empathy-new-chatroom-dialog.ui.h:7 +msgid "_Room:" +msgstr "_Sala:" -#: ../src/empathy-preferences.c:157 +#: ../src/empathy-preferences.c:156 msgid "Message received" msgstr "Mensaje recibido" -#: ../src/empathy-preferences.c:158 +#: ../src/empathy-preferences.c:157 msgid "Message sent" msgstr "Mensaje enviado" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:158 msgid "New conversation" msgstr "Conversación nueva" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:159 msgid "Contact goes online" msgstr "El contacto se conecta" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:160 msgid "Contact goes offline" msgstr "El contacto se desconecta" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:161 msgid "Account connected" msgstr "Cuenta conectada" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:162 msgid "Account disconnected" msgstr "Cuenta desconectada" -#: ../src/empathy-preferences.c:397 +#: ../src/empathy-preferences.c:396 msgid "Language" msgstr "Idioma" -#: ../src/empathy-preferences.glade.h:1 +#: ../src/empathy-preferences.ui.h:1 msgid "<b>Appearance</b>" msgstr "<b>Apariencia</b>" -#: ../src/empathy-preferences.glade.h:2 +#: ../src/empathy-preferences.ui.h:2 msgid "<b>Behavior</b>" msgstr "<b>Comportamiento</b>" -#: ../src/empathy-preferences.glade.h:3 +#: ../src/empathy-preferences.ui.h:3 msgid "<b>Contact List</b>" msgstr "<b>Lista de contactos</b>" -#: ../src/empathy-preferences.glade.h:4 +#: ../src/empathy-preferences.ui.h:4 msgid "<b>Enable spell checking for languages:</b>" msgstr "<b>Activar la revisión ortográfica para idiomas:</b>" -#: ../src/empathy-preferences.glade.h:5 +#: ../src/empathy-preferences.ui.h:5 msgid "<b>Play sound for events</b>" msgstr "<b>Reproducir sonido para eventos</b>" -#: ../src/empathy-preferences.glade.h:6 +#: ../src/empathy-preferences.ui.h:6 msgid "" "<small>The list of languages reflects only the languages for which you have " "a dictionary installed.</small>" @@ -2122,97 +2022,97 @@ msgstr "" "<small>La lista de idiomas refleja sólo los idiomas para los cuales tiene un " "diccionario instalado.</small>" -#: ../src/empathy-preferences.glade.h:7 +#: ../src/empathy-preferences.ui.h:7 msgid "Automatically _connect on startup " msgstr "_Conectarse automáticamente al inicio" -#: ../src/empathy-preferences.glade.h:8 +#: ../src/empathy-preferences.ui.h:8 msgid "Avatars are user chosen images shown in the contact list" msgstr "" "Los avatares son imágenes elegidas por el usuario que se muestran en la " "lista de contactos" -#: ../src/empathy-preferences.glade.h:9 +#: ../src/empathy-preferences.ui.h:9 msgid "Chat Th_eme:" msgstr "_Tema del chat:" -#: ../src/empathy-preferences.glade.h:10 +#: ../src/empathy-preferences.ui.h:10 msgid "Disable notifications when _away or busy" msgstr "Desactivar notificaciones al _ausentarse o estar ocupado" -#: ../src/empathy-preferences.glade.h:11 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable sounds when _away or busy" msgstr "Desactivar sonidos al _ausentarse o estar ocupado" -#: ../src/empathy-preferences.glade.h:12 +#: ../src/empathy-preferences.ui.h:12 msgid "Enable notifications when the _chat is not focused" msgstr "Activar notificaciones cuando el _chat no tenga el foco" -#: ../src/empathy-preferences.glade.h:13 +#: ../src/empathy-preferences.ui.h:13 msgid "General" msgstr "General" -#: ../src/empathy-preferences.glade.h:14 +#: ../src/empathy-preferences.ui.h:14 msgid "Notifications" msgstr "Notificaciones" -#: ../src/empathy-preferences.glade.h:15 +#: ../src/empathy-preferences.ui.h:15 msgid "Preferences" msgstr "Preferencias" -#: ../src/empathy-preferences.glade.h:16 +#: ../src/empathy-preferences.ui.h:16 msgid "Show _avatars" msgstr "Mostrar _avatares" -#: ../src/empathy-preferences.glade.h:17 +#: ../src/empathy-preferences.ui.h:17 msgid "Show _smileys as images" msgstr "Mostrar los _emoticonos como imágenes" -#: ../src/empathy-preferences.glade.h:18 +#: ../src/empathy-preferences.ui.h:18 msgid "Show co_mpact contact list" msgstr "Mostrar lista de contactos co_mpacta" -#: ../src/empathy-preferences.glade.h:19 +#: ../src/empathy-preferences.ui.h:19 msgid "Sort by _name" msgstr "Ordenar por _nombre" -#: ../src/empathy-preferences.glade.h:20 +#: ../src/empathy-preferences.ui.h:20 msgid "Sort by s_tate" msgstr "Ordenar por es_tado" -#: ../src/empathy-preferences.glade.h:21 +#: ../src/empathy-preferences.ui.h:21 msgid "Sounds" msgstr "Sonidos" -#: ../src/empathy-preferences.glade.h:22 +#: ../src/empathy-preferences.ui.h:22 msgid "Spell Checking" msgstr "Revisión ortográfica" -#: ../src/empathy-preferences.glade.h:23 +#: ../src/empathy-preferences.ui.h:23 msgid "Themes" msgstr "Temas" -#: ../src/empathy-preferences.glade.h:24 +#: ../src/empathy-preferences.ui.h:24 msgid "_Enable bubble notifications" msgstr "_Activar notificaciones de burbuja" -#: ../src/empathy-preferences.glade.h:25 +#: ../src/empathy-preferences.ui.h:25 msgid "_Enable sound notifications" msgstr "_Activar notificaciones de sonido" -#: ../src/empathy-preferences.glade.h:26 +#: ../src/empathy-preferences.ui.h:26 msgid "_Open new chats in separate windows" msgstr "_Abrir charlas nuevas en ventanas separadas" -#: ../src/empathy-status-icon.glade.h:1 +#: ../src/empathy-status-icon.ui.h:1 msgid "Status" msgstr "Estado" -#: ../src/empathy-status-icon.glade.h:3 +#: ../src/empathy-status-icon.ui.h:3 msgid "_Quit" msgstr "_Salir" -#: ../src/empathy-status-icon.glade.h:4 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Show Contact List" msgstr "_Mostrar lista de contactos" @@ -2230,6 +2130,109 @@ msgstr "" "Se le ha ofrecido una invitación para el servicio %s pero no tiene la " "aplicación necesaria para manejarla" +#~ msgid "Forget password and clear the entry." +#~ msgstr "Olvidar la contraseña y limpiar la entrada." + +#~ msgid "Create a new IRC network" +#~ msgstr "Crear una red IRC nueva" + +#~ msgid "Edit the selected IRC network" +#~ msgstr "Editar la red IRC seleccionada" + +#~ msgid "Remove the selected IRC network" +#~ msgstr "Quitar la red IRC seleccionada" + +#~ msgid "Group Chat" +#~ msgstr "Grupo de chat" + +#~ msgid "Contact information" +#~ msgstr "Información del contacto" + +#~ msgid "C_lear" +#~ msgstr "_Limpiar" + +#~ msgid "Chat" +#~ msgstr "Chat" + +#~ msgid "Insert _Smiley" +#~ msgstr "Insertar _emoticono" + +#~ msgid "Invitation _message:" +#~ msgstr "_Mensaje de invitación:" + +#~ msgid "Invite" +#~ msgstr "Invitar" + +#~ msgid "Move Tab _Left" +#~ msgstr "Mover solapa a la _izquierda" + +#~ msgid "Move Tab _Right" +#~ msgstr "Mover solapa a la _derecha" + +#~ msgid "Select who would you like to invite:" +#~ msgstr "Seleccione a quién quiere invitar:" + +#~ msgid "You have been invited to join a chat conference." +#~ msgstr "Le han invitado a unirse a una conferencia por chat." + +#~ msgid "_Contact" +#~ msgstr "Con_tacto" + +#~ msgid "_Conversation" +#~ msgstr "_Conversación" + +#~ msgid "_Detach Tab" +#~ msgstr "_Desacoplar solapa" + +#~ msgid "_Favorite Chatroom" +#~ msgstr "Sala de chat _favorita" + +#~ msgid "_Next Tab" +#~ msgstr "Solapa _siguiente" + +#~ msgid "_Previous Tab" +#~ msgstr "Solapa _anterior" + +#~ msgid "_Tabs" +#~ msgstr "_Solapas" + +#~ msgid "Edit Favorite Room" +#~ msgstr "Editar sala de favoritos" + +#~ msgid "Join room on start_up" +#~ msgstr "Unirse a una sala al _iniciar" + +#~ msgid "Join this chat room when Empathy starts and you are connected" +#~ msgstr "" +#~ "Unirse a esta sala de chat cuando Empathy se inicie y esté conectado" + +#~ msgid "N_ame:" +#~ msgstr "_Nombre:" + +#~ msgid "S_erver:" +#~ msgstr "_Servidor:" + +#~ msgid "Join _New..." +#~ msgstr "Unirse a _nueva…" + +#~ msgid "Browse:" +#~ msgstr "Buscar:" + +#~ msgid "Join" +#~ msgstr "Unirse" + +#~ msgid "Join New" +#~ msgstr "Unirse a nueva" + +#~ msgid "Re_fresh" +#~ msgstr "A_ctualizar" + +#~ msgid "" +#~ "This list represents all chat rooms hosted on the server you have entered." +#~ msgstr "" +#~ "Esta lista representa todas las salas de chat hospedadas en el servidor " +#~ "al que ha entrado." + #~ msgid "menuitem2" #~ msgstr "elemento de menú 2" diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index e157cdbfe..98e58d4f3 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -251,7 +251,7 @@ ft_manager_update_ft_row (EmpathyFTManager *ft_manager, } else - second_line = g_strdup (_("Waiting the other participant's response")); + second_line = g_strdup (_("Waiting for the other participant's response")); remaining = empathy_tp_file_get_remaining_time (tp_file); break; diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index 4aa225493..cd45bc7d7 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -88,7 +88,7 @@ <child> <object class="GtkAction" id="room_join_new"> <property name="name">room_join_new</property> - <property name="label" translatable="yes">Join _New...</property> + <property name="label" translatable="yes">_Join...</property> </object> </child> <child> diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 75ab742c3..bf107d1b6 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -59,13 +59,9 @@ typedef struct { GtkWidget *account_chooser; GtkWidget *label_server; GtkWidget *entry_server; - GtkWidget *togglebutton_refresh; GtkWidget *label_room; GtkWidget *entry_room; - GtkWidget *vbox_browse; - GtkWidget *image_status; - GtkWidget *label_status; - GtkWidget *hbox_status; + GtkWidget *expander_browse; GtkWidget *throbber; GtkWidget *treeview; GtkTreeModel *model; @@ -74,8 +70,12 @@ typedef struct { } EmpathyNewChatroomDialog; enum { + COL_NEED_PASSWORD, + COL_INVITE_ONLY, COL_NAME, COL_ROOM, + COL_MEMBERS, + COL_TOOLTIP, COL_COUNT }; @@ -111,7 +111,10 @@ static void new_chatroom_dialog_browse_start (EmpathyNewC static void new_chatroom_dialog_browse_stop (EmpathyNewChatroomDialog *dialog); static void new_chatroom_dialog_entry_server_activate_cb (GtkWidget *widget, EmpathyNewChatroomDialog *dialog); -static void new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget *widget, +static void new_chatroom_dialog_expander_browse_activate_cb (GtkWidget *widget, + EmpathyNewChatroomDialog *dialog); +static gboolean new_chatroom_dialog_entry_server_focus_out_cb (GtkWidget *widget, + GdkEventFocus *event, EmpathyNewChatroomDialog *dialog); static EmpathyNewChatroomDialog *dialog_p = NULL; @@ -140,13 +143,9 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent) "label_room", &dialog->label_room, "entry_server", &dialog->entry_server, "entry_room", &dialog->entry_room, - "togglebutton_refresh", &dialog->togglebutton_refresh, - "vbox_browse", &dialog->vbox_browse, - "image_status", &dialog->image_status, - "label_status", &dialog->label_status, - "hbox_status", &dialog->hbox_status, "treeview", &dialog->treeview, "button_join", &dialog->button_join, + "expander_browse", &dialog->expander_browse, NULL); g_free (filename); @@ -155,8 +154,9 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent) "new_chatroom_dialog", "destroy", new_chatroom_dialog_destroy_cb, "entry_server", "changed", new_chatroom_dialog_entry_changed_cb, "entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb, + "entry_server", "focus-out-event", new_chatroom_dialog_entry_server_focus_out_cb, "entry_room", "changed", new_chatroom_dialog_entry_changed_cb, - "togglebutton_refresh", "toggled", new_chatroom_dialog_togglebutton_refresh_toggled_cb, + "expander_browse", "activate", new_chatroom_dialog_expander_browse_activate_cb, NULL); g_object_unref (gui); @@ -179,9 +179,10 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent) dialog->throbber = ephy_spinner_new (); ephy_spinner_set_size (EPHY_SPINNER (dialog->throbber), GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show (dialog->throbber); - - gtk_box_pack_start (GTK_BOX (dialog->hbox_status), dialog->throbber, - FALSE, FALSE, 0); + gtk_table_attach (GTK_TABLE (dialog->table_info), + dialog->throbber, + 2, 3, 0, 1, + 0, 0, 0, 0); /* Account chooser for custom */ dialog->account_chooser = empathy_account_chooser_new (); @@ -190,7 +191,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent) NULL); gtk_table_attach_defaults (GTK_TABLE (dialog->table_info), dialog->account_chooser, - 1, 3, 0, 1); + 1, 2, 0, 1); gtk_widget_show (dialog->account_chooser); g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed", @@ -247,12 +248,17 @@ new_chatroom_dialog_model_setup (EmpathyNewChatroomDialog *dialog) /* Store/Model */ store = gtk_list_store_new (COL_COUNT, - G_TYPE_STRING, /* Image */ - G_TYPE_STRING, /* Text */ - G_TYPE_STRING); /* Room */ + G_TYPE_STRING, /* Invite */ + G_TYPE_STRING, /* Password */ + G_TYPE_STRING, /* Name */ + G_TYPE_STRING, /* Room */ + G_TYPE_STRING, /* Member count */ + G_TYPE_STRING); /* Tool tip */ dialog->model = GTK_TREE_MODEL (store); gtk_tree_view_set_model (view, dialog->model); + gtk_tree_view_set_tooltip_column (view, COL_TOOLTIP); + gtk_tree_view_set_search_column (view, COL_NAME); /* Selection */ selection = gtk_tree_view_get_selection (view); @@ -273,24 +279,57 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog) GtkTreeView *view; GtkTreeViewColumn *column; GtkCellRenderer *cell; + gint width, height; + + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height); view = GTK_TREE_VIEW (dialog->treeview); - gtk_tree_view_set_headers_visible (view, FALSE); + + cell = gtk_cell_renderer_pixbuf_new (); + g_object_set (cell, + "width", width, + "height", height, + "stock-size", GTK_ICON_SIZE_MENU, + NULL); + column = gtk_tree_view_column_new_with_attributes (NULL, + cell, + "stock-id", COL_INVITE_ONLY, + NULL); + gtk_tree_view_append_column (view, column); + + column = gtk_tree_view_column_new_with_attributes (NULL, + cell, + "stock-id", COL_NEED_PASSWORD, + NULL); + gtk_tree_view_append_column (view, column); cell = gtk_cell_renderer_text_new (); g_object_set (cell, "xpad", (guint) 4, - "ypad", (guint) 1, + "ypad", (guint) 2, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - column = gtk_tree_view_column_new_with_attributes (_("Chat Rooms"), + column = gtk_tree_view_column_new_with_attributes (_("Chat Room"), cell, "text", COL_NAME, NULL); gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_append_column (view, column); + + cell = gtk_cell_renderer_text_new (); + g_object_set (cell, + "xpad", (guint) 4, + "ypad", (guint) 2, + "ellipsize", PANGO_ELLIPSIZE_END, + "alignment", PANGO_ALIGN_RIGHT, + NULL); + column = gtk_tree_view_column_new_with_attributes (_("Members"), + cell, + "text", COL_MEMBERS, + NULL); + gtk_tree_view_append_column (view, column); } static void @@ -312,19 +351,15 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog) /* hardcode here known protocols */ if (strcmp (protocol, "jabber") == 0) { gtk_widget_set_sensitive (dialog->entry_server, TRUE); - gtk_widget_show (dialog->vbox_browse); - } else if (strcmp (protocol, "local-xmpp") == 0) { gtk_widget_set_sensitive (dialog->entry_server, FALSE); - gtk_widget_show (dialog->vbox_browse); } else if (strcmp (protocol, "irc") == 0) { gtk_widget_set_sensitive (dialog->entry_server, FALSE); - gtk_widget_show (dialog->vbox_browse); - } else { + } + else { gtk_widget_set_sensitive (dialog->entry_server, TRUE); - gtk_widget_show (dialog->vbox_browse); } room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room)); @@ -356,7 +391,7 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox *combobox, account = empathy_account_chooser_get_account (account_chooser); dialog->room_list = empathy_tp_roomlist_new (account); - if (dialog->room_list) { + if (dialog->room_list) { g_signal_connect (dialog->room_list, "destroy", G_CALLBACK (new_chatroom_dialog_roomlist_destroy_cb), dialog); @@ -393,6 +428,10 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist *room_list, GtkTreeSelection *selection; GtkListStore *store; GtkTreeIter iter; + gchar *members; + gchar *tooltip; + const gchar *need_password; + const gchar *invite_only; DEBUG ("New chatroom listed: %s (%s)", empathy_chatroom_get_name (chatroom), @@ -402,12 +441,31 @@ new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist *room_list, view = GTK_TREE_VIEW (dialog->treeview); selection = gtk_tree_view_get_selection (view); store = GTK_LIST_STORE (dialog->model); + members = g_strdup_printf ("%d", empathy_chatroom_get_members_count (chatroom)); + tooltip = g_strdup_printf (C_("Room/Join's roomlist tooltip. Parameters" + "are a channel name, yes/no, yes/no and a number.", + "<b>%s</b>\nInvite required: %s\nPassword required: %s\nMembers: %s"), + empathy_chatroom_get_name (chatroom), + empathy_chatroom_get_invite_only (chatroom) ? _("Yes") : _("No"), + empathy_chatroom_get_need_password (chatroom) ? _("Yes") : _("No"), + members); + invite_only = (empathy_chatroom_get_invite_only (chatroom) ? + GTK_STOCK_INDEX : NULL); + need_password = (empathy_chatroom_get_need_password (chatroom) ? + GTK_STOCK_DIALOG_AUTHENTICATION : NULL); gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, + COL_NEED_PASSWORD, need_password, + COL_INVITE_ONLY, invite_only, COL_NAME, empathy_chatroom_get_name (chatroom), COL_ROOM, empathy_chatroom_get_room (chatroom), + COL_MEMBERS, members, + COL_TOOLTIP, tooltip, -1); + + g_free (members); + g_free (tooltip); } static void @@ -425,16 +483,6 @@ new_chatroom_dialog_listing_cb (EmpathyTpRoomlist *room_list, } else { ephy_spinner_stop (EPHY_SPINNER (dialog->throbber)); } - - /* Update the refresh toggle button */ - g_signal_handlers_block_by_func (dialog->togglebutton_refresh, - new_chatroom_dialog_togglebutton_refresh_toggled_cb, - dialog); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->togglebutton_refresh), - listing); - g_signal_handlers_unblock_by_func (dialog->togglebutton_refresh, - new_chatroom_dialog_togglebutton_refresh_toggled_cb, - dialog); } static void @@ -542,22 +590,35 @@ static void new_chatroom_dialog_entry_server_activate_cb (GtkWidget *widget, EmpathyNewChatroomDialog *dialog) { - new_chatroom_dialog_togglebutton_refresh_toggled_cb (dialog->togglebutton_refresh, - dialog); + new_chatroom_dialog_browse_start (dialog); } static void -new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget *widget, - EmpathyNewChatroomDialog *dialog) +new_chatroom_dialog_expander_browse_activate_cb (GtkWidget *widget, + EmpathyNewChatroomDialog *dialog) { - gboolean toggled; + gboolean expanded; - toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - if (toggled) { - new_chatroom_dialog_browse_start (dialog); - } else { + expanded = gtk_expander_get_expanded (GTK_EXPANDER (widget)); + if (expanded) { new_chatroom_dialog_browse_stop (dialog); + gtk_window_set_resizable (GTK_WINDOW (dialog->window), FALSE); + } else { + new_chatroom_dialog_browse_start (dialog); + gtk_window_set_resizable (GTK_WINDOW (dialog->window), TRUE); } } +static gboolean +new_chatroom_dialog_entry_server_focus_out_cb (GtkWidget *widget, + GdkEventFocus *event, + EmpathyNewChatroomDialog *dialog) +{ + gboolean expanded; + + expanded = gtk_expander_get_expanded (GTK_EXPANDER (dialog->expander_browse)); + if (expanded) { + new_chatroom_dialog_browse_start (dialog); + } + return FALSE; +} diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui index 04927be2c..ba7a326ef 100644 --- a/src/empathy-new-chatroom-dialog.ui +++ b/src/empathy-new-chatroom-dialog.ui @@ -4,28 +4,26 @@ <object class="GtkDialog" id="new_chatroom_dialog"> <property name="visible">True</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Join New</property> + <property name="title" translatable="yes">Join Room</property> <property name="role">join_new_chatroom</property> - <property name="resizable">False</property> <property name="default_width">350</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox4"> <property name="visible">True</property> - <property name="spacing">6</property> <child> <object class="GtkVBox" id="vbox_widgets"> <property name="visible">True</property> <property name="border_width">5</property> - <property name="spacing">18</property> + <property name="spacing">5</property> <child> <object class="GtkTable" id="table_info"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">3</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> <child> <placeholder/> </child> @@ -38,30 +36,28 @@ <property name="can_focus">True</property> <property name="tooltip-text" translatable="yes">Enter the room name to join here or click on one or more rooms in the list.</property> <property name="activates_default">True</property> - <property name="width_chars">32</property> + <property name="width_chars">25</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"/> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <object class="GtkToggleButton" id="togglebutton_refresh"> + <object class="GtkLabel" id="label_room"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Re_fresh</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Room:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">entry_room</property> </object> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> @@ -73,23 +69,9 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_room"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Room:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry_room</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -121,50 +103,18 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> <child> - <object class="GtkVBox" id="vbox_browse"> + <object class="GtkExpander" id="expander_browse"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkHBox" id="hbox_status"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkHBox" id="hbox35"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image_status"> - <property name="visible">True</property> - <property name="icon_size">2</property> - <property name="icon_name">gtk-find</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_status"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Browse:</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child> - <placeholder/> - </child> - </object> - </child> + <property name="can_focus">True</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="width_request">350</property> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -175,14 +125,17 @@ <object class="GtkTreeView" id="treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip-text" translatable="yes">This list represents all chat rooms hosted on the server you have entered.</property> - <property name="headers_visible">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Room List</property> + </object> </child> </object> <packing> @@ -191,8 +144,6 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -205,7 +156,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-close</property> + <property name="label">gtk-cancel</property> <property name="use_stock">True</property> </object> </child> @@ -228,7 +179,7 @@ <child> <object class="GtkImage" id="image4"> <property name="visible">True</property> - <property name="stock">gtk-execute</property> + <property name="stock">gtk-jump-to</property> </object> <packing> <property name="expand">False</property> @@ -238,7 +189,7 @@ <child> <object class="GtkLabel" id="label79"> <property name="visible">True</property> - <property name="label" translatable="yes">Join</property> + <property name="label" translatable="yes">_Join</property> <property name="use_underline">True</property> </object> <packing> @@ -265,7 +216,6 @@ </object> </child> <action-widgets> - <action-widget response="0">togglebutton_refresh</action-widget> <action-widget response="-7">button_cancel</action-widget> <action-widget response="-5">button_join</action-widget> </action-widgets> |