aboutsummaryrefslogtreecommitdiffstats
path: root/help/C
diff options
context:
space:
mode:
Diffstat (limited to 'help/C')
-rw-r--r--help/C/account-irc.page12
-rw-r--r--help/C/accounts-window.page1
-rw-r--r--help/C/add-account.page2
-rw-r--r--help/C/add-contact.page2
-rw-r--r--help/C/audio-call.page30
-rw-r--r--help/C/create-account.page159
-rw-r--r--help/C/figures/audio-input-microphone.pngbin650 -> 0 bytes
-rw-r--r--help/C/figures/camera-web.pngbin881 -> 0 bytes
-rw-r--r--help/C/index.page19
-rw-r--r--help/C/link-contacts.page73
-rw-r--r--help/C/overview.page13
-rw-r--r--help/C/prob-conn-auth.page15
-rw-r--r--help/C/prob-conn-name.page13
-rw-r--r--help/C/prob-conn-neterror.page15
-rw-r--r--help/C/status-icons.page15
-rw-r--r--help/C/video-call.page32
16 files changed, 218 insertions, 183 deletions
diff --git a/help/C/account-irc.page b/help/C/account-irc.page
index 213247c8d..4b4b92776 100644
--- a/help/C/account-irc.page
+++ b/help/C/account-irc.page
@@ -1,4 +1,5 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="screen"
id="account-irc">
@@ -14,7 +15,7 @@
<revision pkgversion="2.30" version="0.2" date="2010-04-19" status="review"/>
<credit type="author">
<name>Shaun McCance</name>
- <email>shaunm@gnome.org</email>
+ <email its:translate="no">shaunm@gnome.org</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -103,13 +104,16 @@ telepathy-idle note
<list>
<item><p>To add a network to the list, click <media type="image"
mime="image/png" src="figures/gtk-add.png" width="16"
- height="16">Add</media>.</p></item>
+ height="16" its:translate="no"><span
+ its:translate="yes">Add</span></media>.</p></item>
<item><p>To modify a network in the list, select the network and click
<media type="image" mime="image/png" src="figures/gtk-edit.png" width="16"
- height="16">Edit</media>.</p></item>
+ height="16" its:translate="no"><span
+ its:translate="yes">Edit</span></media>.</p></item>
<item><p>To remove a network from the list, select the network and
click <media type="image" mime="image/png" src="figures/gtk-remove.png"
- width="16" height="16">Remove</media>.</p></item>
+ width="16" height="16" its:translate="no"><span
+ its:translate="yes">Remove</span></media>.</p></item>
</list>
<p>When adding or modifying a network, you can enter the following
diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page
index 8e25b80a2..c8839babf 100644
--- a/help/C/accounts-window.page
+++ b/help/C/accounts-window.page
@@ -5,7 +5,6 @@
<info>
<link type="topic" xref="add-account"/>
- <link type="topic" xref="create-account"/>
<link type="topic" xref="disable-account"/>
<link type="topic" xref="remove-account"/>
<desc>Add, modify, and delete accounts.</desc>
diff --git a/help/C/add-account.page b/help/C/add-account.page
index b727eddfa..cdeb4b8d9 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -1,6 +1,6 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
- type="topic" style="task"
+ type="guide" style="task"
id="add-account">
<info>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index 0bf6a0b54..3426cd6fc 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="index#contacts"/>
- <link type="seealso" xref="offline-contacts"/>
+ <link type="seealso" xref="hide-contacts"/>
<desc>Add someone to the contact list.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review">
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index 024b46377..4d9707f38 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -1,5 +1,6 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
+ xmlns:its="http://www.w3.org/2005/11/its"
type="topic" style="task"
id="audio-call">
@@ -15,10 +16,17 @@
</revision>
<revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
<revision pkgversion="2.32" version="0.4" date="2010-09-09" status="review"/>
+ <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/>
+
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
+ </credit>
+ <credit type="author">
+ <name>Ekaterina Gerasimova</name>
+ <email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
@@ -26,27 +34,27 @@
<title>Start an audio conversation</title>
- <p>You can call your contacts and have an audio conversation with them.
- This features only works with certain types of accounts, and it requires
- the other person to have an application that supports audio calls.</p>
+ <p>You can call your contacts and have an audio conversation with them. This
+ features only works with certain types of accounts and it requires the other
+ person to have an application that supports audio calls.</p>
+
<steps>
<item>
<p>
- From the <gui>Contact List</gui> window, click the
- <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
- icon next to the name of the contact you wish to call and
- choose <gui style="menuitem">Audio Call</gui>.
+ Right-click on the contact that you want to call and select
+ <gui style="menuitem">Audio Call</gui>.
</p>
</item>
<item>
<p>
A new window will open. When the connection is established, you will
- see <gui>Connected</gui> at the bottom of the window, along with the
- total conversation time.</p>
+ see the total conversation time at the bottom of the window.
+ </p>
</item>
<item>
<p>
- To end the conversation, click on <gui style="button">Hang up</gui>.
+ To end the conversation, click the <gui style="button">hand up</gui>
+ button.
</p>
</item>
</steps>
diff --git a/help/C/create-account.page b/help/C/create-account.page
index e87e117e1..3535a37b1 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -1,152 +1,145 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="task"
id="create-account">
<info>
- <link type="guide" xref="index#accounts"/>
- <link type="seealso" xref="add-account"/>
- <desc>Register for an account with one of the supported messaging services.</desc>
+ <link type="guide" xref="add-account"/>
<revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review">
- <!--
- <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
- -->
+ <!--
+ <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
+ -->
</revision>
<revision pkgversion="2.30" version="0.3" date="2010-04-19" status="review"/>
<revision pkgversion="2.30" version="0.4" date="2010-10-01" status="review"/>
+ <revision pkgversion="3.10" date="2013-06-23" status="review"/>
+
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
+ </credit>
+ <credit type="editor">
+ <name>Ekaterina Gerasimova</name>
+ <email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
-<!--
- <copyright>
- <year>2009</year>
- <name>GNOME Documentation Project</name>
- </copyright>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
+
+ <desc>Create an account for one of the supported messaging services.</desc>
+
</info>
- <title>Register for a new account</title>
+ <title>Register a new account</title>
+
+ <p>Most account types require you to create an account with a service
+ provider before you can use that account with instant messaging applications.
+ You can use <app>Empathy</app> to register for a new account with some
+ account providers using the same steps as you would to
+ <link xref="add-account">add an account</link>.</p>
+
+ <p>Once you create a new account, your account provider should give you a
+ login or a username and a password, as well as any additional information you
+ need to connect using <app>Empathy</app>.</p>
- <p>Most account types require you to create an account with a account provider
- before you can connect using instant messaging applications like <app>Empathy</app>.
- With some account providers, you can use <app>Empathy</app> to register for a new
- account, using the same steps as you would to <link xref="add-account">add an
- account</link>.</p>
+ <section id="irc">
+ <title>IRC</title>
+
+ <p>IRC networks require that you specify a nick (nickname) when you connect
+ to the server. Some IRC networks use a service, such as NickServ, to allow
+ users to <link xref="irc-nick-password">protect their nick</link>. If you
+ did not register your nick or are unable to do so and another user is using
+ it, then you will need to choose a different one.</p>
+
+ <p>Some IRC servers are password protected. You will need to know the
+ password to connect to these servers. Generally, these are private IRC
+ networks.</p>
+
+ <note>
+ <p>Many GNOME projects use <code>irc.gnome.org</code> for project-related
+ discussion.</p>
+ </note>
+ </section>
- <p>This page provides information on creating a new account for various types of
- accounts. Your account provider should give you a login ID and a password, as well
- as any additional information you need to connect using <app>Empathy</app>.</p>
-
<section id="facebook">
<title>Facebook</title>
- <p>
- Facebook is one of the most-used social networks. It allows users to
- create their own profile and to communicate with their friends.
- </p>
- <p>
- To use Facebook to communicate with your friends, you will need
- to create a new account from the website:
- <link href="http://www.facebook.com">www.facebook.com</link>.
- </p>
+
+ <p>Facebook is one of the more popular social networks. It allows users to
+ create their own profile and to communicate with their friends.</p>
+
+ <p>To use Facebook to communicate with your friends, you will need to
+ create a new account from the website:
+ <link href="https://www.facebook.com">www.facebook.com</link>.</p>
</section>
<section id="jabber">
<title>Jabber</title>
- <p>Jabber is an open instant messaging system. Like email, Jabber allows
+ <p>Jabber is an open instant messaging system. Like email, Jabber allows
you to choose your account provider and communicate with all other Jabber
users, regardless of their account provider.</p>
- <p>You will need to create a new account with a Jabber provider. There are
+ <p>You will need to create a new account with a Jabber provider. There are
many free providers; one popular provider is
- <link href="http://register.jabber.org/">Jabber.org</link>.</p>
+ <link href="http://register.jabber.org/">jabber.org</link>.</p>
<note>
- <p>If you use Google Mail or Google Talk, you already have a Jabber account.
- Google Talk is a Jabber service. Simply use your Google Mail address and
- password in <app>Empathy</app> to connect.</p>
+ <p>If you use Gmail or Google+ Hangouts, you already have a Jabber
+ account. Use your Gmail address and password in <app>Empathy</app> to
+ connect.</p>
</note>
</section>
<section id="salut">
<title>People Nearby</title>
- <p>You do not need to create an account with a service provider to use this
- feature. This service works whenever you are connected to a local network,
- such as a wireless hotspot. It automatically finds all other users on the
- network who are also using this service.</p>
+ <p>This service works whenever you are connected to a local network, such
+ as a wireless hotspot, you do not need to create an account with service
+ providor, just set up your account through <app>Empathy</app>. It
+ automatically finds all other users on the network who are also using this
+ service.</p>
- <p>For more information, see <link xref="salut-protocol" />.</p>
+ <p>For more information, see the <link xref="salut-protocol">salut
+ protocol</link>.</p>
</section>
<section id ="sip-services">
<title>SIP</title>
<p>SIP is an open system which allows users to have audio and video
- conversations over the Internet. You need to create an account with
- a SIP provider. You can communicate with all other SIP users,
+ conversations over the Internet. You need to create an account with
+ a SIP provider. You can communicate with all other SIP users,
regardless of which SIP provider they use.</p>
- <note style="warning">
- <p>Due to technical differences, the free <link
- href="https://www.ekiga.net/index.php?page=register">Ekiga.net</link>
- service does not currently work with <app>Empathy</app>.</p>
- </note>
-
<p>Some SIP providers allow you to call normal phones from your computer.
- Generally, you will need to subscribe to a paid service for this feature.</p>
- </section>
-
- <section id="irc">
- <title>IRC</title>
-
- <p>You do not need to register for an account to use IRC. Although you specify
- a nickname when you add an IRC account to <app>Empathy</app>, this nickname is
- only established each time you connect. If another user is using the nickname,
- you will need to choose a new nickname.</p>
-
- <p>Some IRC networks use a service called NickServ to allow users to protect
- their nicknames. See <link xref="irc-nick-password"/> for more information.</p>
-
- <p>Some IRC servers are password protected. You will need to know the password
- to connect to these servers. Generally, these are private IRC networks.</p>
+ Generally, you will need to subscribe to a paid service for this
+ feature.</p>
</section>
<section id="proprietary-services">
<title>Proprietary Services</title>
<p>There are many proprietary instant messaging services that have been
- developed by different companies or organizations. <app>Empathy</app>
- allows you to connect to an existing account for most popular services.
+ developed by different companies or organizations. <app>Empathy</app>
+ allows you to connect to an existing account for some of these services.
To create a new account with one of these services, you will need to
- visit the service’s web site and agree to its terms of use.</p>
+ visit the website for the service.</p>
<list>
<item>
- <p>
- <link href="http://dashboard.aim.com/aim">AIM</link>
- </p>
+ <p><link href="http://dashboard.aim.com/aim">AIM</link></p>
</item>
<item>
- <p>
- <link href="https://www.icq.com/register/">ICQ</link>
- </p>
+ <p><link href="https://www.icq.com/register/">ICQ</link></p>
</item>
<item>
- <p>
- <link href="https://accountservices.passport.net">MSN</link>
- </p>
+ <p><link href="https://accountservices.passport.net">MSN</link></p>
</item>
<item>
- <p>
- <link href="https://login.yahoo.com/config/login">Yahoo!</link>
- </p>
+ <p><link href="https://login.yahoo.com/config/login">Yahoo!</link></p>
</item>
</list>
</section>
diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
deleted file mode 100644
index f45d15d56..000000000
--- a/help/C/figures/audio-input-microphone.png
+++ /dev/null
Binary files differ
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
deleted file mode 100644
index e5406c5b9..000000000
--- a/help/C/figures/camera-web.png
+++ /dev/null
Binary files differ
diff --git a/help/C/index.page b/help/C/index.page
index 5b700188d..778115e51 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,11 +1,10 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
+ xmlns:its="http://www.w3.org/2005/11/its"
type="guide"
id="index">
<info>
- <title type="link">Empathy Internet Messenger</title>
- <title type="text">Empathy Internet Messenger</title>
<revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/>
<revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
<revision pkgversion="2.28" version="0.2" date="2009-09-05" status="review">
@@ -15,20 +14,26 @@
</revision>
<revision pkgversion="2.30" version="0.3" date="2010-02-03" status="review"/>
<revision pkgversion="2.32" version="0.4" date="2010-09-11" status="review"/>
+ <revision pkgversion="3.10" date="2013-06-23" status="review"/>
+
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
</credit>
+
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
+
+ <desc>Empathy is the instant messenging application for GNOME. It supports text, voice and video chat over many protocols.</desc>
+
+ <title type="link">Empathy</title>
+ <title type="text">Empathy</title>
</info>
<title>
- <media type="image" mime="image/png" src="figures/empathy-logo.png">
- Empathy Internet Messenger logo
- </media>
- Empathy Internet Messenger
+ <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no" />
+ Empathy
</title>
<section id="accounts" style="2column">
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 06184ac66..6a23cd142 100644
--- a/help/C/link-contacts.page
+++ b/help/C/link-contacts.page
@@ -15,6 +15,10 @@
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
</credit>
+ <credit type="editor">
+ <name>Shobha Tyagi</name>
+ <email>tyagishobha@gmail.com</email>
+ </credit>
<license>
<p>
Creative Commons Share Alike 3.0
@@ -22,18 +26,18 @@
</license>
</info>
- <title>Combine and separate contacts</title>
+ <title>Link and unlink contacts</title>
<p>
- If one, or more, of your contacts has multiple accounts with different
- messaging services, you can combine these contacts into a single one.
+ If one or more of your contacts has multiple accounts with different
+ messaging services, you can combine these accounts into a single contact.
</p>
<p>
The resulting contact is called a <em>meta-contact</em>: a contact composed
from different single contacts.
</p>
<p>
- If you have a Jane Smith contact that is using three different messaging
- services like:
+ Suppose you have a contact called Jane Smith who is using three different
+ messaging services like:
</p>
<list>
<item>
@@ -55,52 +59,71 @@
<p>
You can combine these contacts into a single Jane Smith one.
</p>
-
<section id="linking">
- <title>Combining contacts</title>
+ <title>Link contacts</title>
+ <p>
+ The way you can link your contacts is as follows:
+ </p>
<steps>
<item>
<p>
- From the <gui>Contact List</gui> window, right-click one of the contact
- that has different accounts, and select
- <gui style="menuitem">Link Contacts...</gui>.
+ Press the tick button to select entries you want to link. This will enable
+ <em>selection mode</em> and you can see a checkbox for each entry.
</p>
</item>
<item>
<p>
- From the left pane in the <gui>Link Contacts</gui> window,
- select the contacts you want to combine.
+ Tick the checkboxes that correspond to the <app>Contacts</app> entries which
+ belong to the same contact.
</p>
</item>
<item>
<p>
- Click <gui style="button">Link</gui>.
+ Press <gui style="button">Link</gui>.
</p>
</item>
</steps>
- <note>
- <p>
- When a meta-contact has been created, the default contact that will be used
- to have a conversation with when you double-click on it, is the contact with
- the highest presence on-line.
- </p>
- </note>
+ <p>
+ Repeat steps 3 and 4 in order to link other contacts.
+ </p>
</section>
- <section id="unlinkg">
- <title>Separating contacts</title>
+ <section id="unlinking">
+ <title>Unlink contacts</title>
+ <p>
+ To unlink a linked contact:
+ </p>
<steps>
<item>
<p>
- From the <gui>Contact List</gui>, right-click the contact
- to separate, and select <gui style="menuitem">Link Contacts...</gui>.
+ Select the contact from your list.
+ </p>
+ </item>
+ <item>
+ <p>
+ Press <gui style="button">Edit</gui> in the top-right corner of <app>Contacts</app>.
+ </p>
+ </item>
+ <item>
+ <p>
+ Press <gui style="button">Linked Contacts</gui>.
+ </p>
+ </item>
+ <item>
+ <p>
+ Press <gui style="button">Remove</gui> to unlink an entry from the linked contact.
</p>
</item>
<item>
<p>
- Click <gui style="button">Unlink</gui>.
+ Press <gui style="button">Close</gui> if you do not want to unlink any more contacts.
</p>
</item>
+ <item>
+ <p>
+ Finally, press <gui style="button">Done</gui> to finish editing.
+ </p>
+ </item>
</steps>
</section>
</page>
diff --git a/help/C/overview.page b/help/C/overview.page
index daa67b844..2ce72a9d0 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -1,4 +1,5 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
type="topic"
id="overview">
@@ -10,11 +11,11 @@
</desc>
<credit type="author">
<name>Aruna S</name>
- <email>aruna.evam@gmail.com</email>
+ <email its:translate="no">aruna.evam@gmail.com</email>
</credit>
<credit type="editor">
<name>Ekaterina Gerasimova</name>
- <email>kittykat3756@gmail.com</email>
+ <email its:translate="no">kittykat3756@gmail.com</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -34,9 +35,9 @@
<table frame="all" shade="cols">
<tr>
- <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
- <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
- <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
+ <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
+ <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
+ <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
</tr>
<tr>
<td><p>Video Conference</p></td>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index 38ca57c43..0ce4a506a 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -1,6 +1,7 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="prob-conn-auth">
+ xmlns:its="http://www.w3.org/2005/11/its"
+ type="topic"
+ id="prob-conn-auth">
<info>
<link type="guide" xref="prob-conn"/>
@@ -15,11 +16,11 @@
<revision pkgversion="2.30" version="0.4" date="2010-02-16" status="review"/>
<credit type="author">
<name>Phil Bull</name>
- <email>philbull@gmail.com</email>
+ <email its:translate="no">philbull@gmail.com</email>
</credit>
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -54,10 +55,8 @@
</p>
</item>
<item>
- <p>
- Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
- icon in the error message.
- </p>
+ <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+ icon in the error message.</p>
</item>
<item>
<p>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 00407a665..f3bdefd35 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -1,6 +1,7 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="prob-conn-name">
+ xmlns:its="http://www.w3.org/2005/11/its"
+ type="topic"
+ id="prob-conn-name">
<info>
<link type="guide" xref="prob-conn"/>
@@ -16,7 +17,7 @@
<revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -40,10 +41,8 @@
<steps>
<item>
- <p>
- Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
- icon in the error message.
- </p>
+ <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+ icon in the error message.</p>
</item>
<item>
<list>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 91d482222..146c0eb7d 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -1,6 +1,7 @@
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
- id="prob-conn-neterror">
+ xmlns:its="http://www.w3.org/2005/11/its"
+ type="topic"
+ id="prob-conn-neterror">
<info>
<link type="guide" xref="prob-conn"/>
@@ -13,11 +14,11 @@
<revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
<credit type="author">
<name>Phil Bull</name>
- <email>philbull@gmail.com</email>
+ <email its:translate="no">philbull@gmail.com</email>
</credit>
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -55,10 +56,8 @@
</p>
</item>
<item>
- <p>
- Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
- icon in the error message.
- </p>
+ <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+ icon in the error message.</p>
</item>
<item>
<p>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
index be63f994d..1212fdb7c 100644
--- a/help/C/status-icons.page
+++ b/help/C/status-icons.page
@@ -1,4 +1,5 @@
<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
xmlns:e="http://projectmallard.org/experimental/"
type="topic" style="concept"
id="status-icons">
@@ -14,11 +15,11 @@
</revision>
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
</credit>
<credit type="author">
<name>Shaun McCance</name>
- <email>shaunm@gnome.org</email>
+ <email its:translate="no">shaunm@gnome.org</email>
</credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
@@ -36,13 +37,13 @@
<terms>
<item>
- <title><media type="image" mime="image/png" src="figures/available.png">Available icon</media>
+ <title><media type="image" mime="image/png" src="figures/available.png" its:translate="no"><span its:translate="yes">Available icon</span></media>
<gui>Available</gui></title>
<p>Use the <em>Available</em> status when you are at your computer and able
to chat with your contacts. You can set a custom message for this status.</p>
</item>
<item>
- <title><media type="image" mime="image/png" src="figures/busy.png">Busy icon</media>
+ <title><media type="image" mime="image/png" src="figures/busy.png" its:translate="no"><span its:translate="yes">Busy icon</span></media>
<gui>Busy</gui></title>
<p>Use the <em>Busy</em> status to let your contacts know that you don’t want
to chat right now. They can still contact you, for instance if they have something
@@ -50,7 +51,7 @@
bubbles and sounds when you are busy. You can set a custom message for this status.</p>
</item>
<item>
- <title><media type="image" mime="image/png" src="figures/away.png">Away icon</media>
+ <title><media type="image" mime="image/png" src="figures/away.png" its:translate="no"><span its:translate="yes">Away icon</span></media>
<gui>Away</gui></title>
<p>Use the <em>Away</em> status when you are going away from your computer.
<app>Empathy</app> automatically sets your status to Away if you do not use
@@ -59,14 +60,14 @@
away. You can set a custom message for this status.</p>
</item>
<item>
- <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media>
+ <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media>
<gui>Invisible</gui></title>
<p>When you set your status to <em>Invisible</em>, you will appear as offline
to your contacts. You will still be connected to your accounts, and you
still see your contacts’ statuses and start conversations with them.</p>
</item>
<item>
- <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media>
+ <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media>
<gui>Offline</gui></title>
<p>Setting your status to <em>Offline</em> disconnects you from all of
your accounts.</p>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index bbd4c6812..0cdd63c1a 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -1,5 +1,6 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
+ xmlns:its="http://www.w3.org/2005/11/its"
type="topic" style="task"
id="video-call">
@@ -18,10 +19,17 @@
</revision>
<revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
<revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
+ <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/>
+
<credit type="author">
<name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
+ <email its:translate="no">milo@ubuntu.com</email>
+ </credit>
+ <credit type="author">
+ <name>Ekaterina Gerasimova</name>
+ <email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
@@ -35,28 +43,24 @@
<steps>
<item>
- <p>From the <gui>Contact List</gui> window, click the
- <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
- icon next to the name of the contact you wish to call and choose <gui style="menuitem">Video Call</gui>.
- </p>
+ <p>Right-click on the contact that you want to call and select
+ <gui style="menuitem">Video Call</gui>.</p>
</item>
<item>
<p>A new window will open. When the connection is established, you will
- see <gui>Connected</gui> at the bottom of the window, along with the
- total conversation time.</p>
+ see the total conversation time at the bottom of the window.</p>
</item>
<item>
- <p>
- To end the conversation, click on <gui style="button">Hang up</gui>.
- </p>
+ <p>To end the conversation, click on the <gui style="button">hang
+ up</gui> button.</p>
</item>
</steps>
+
<note style="tip">
- <p>
- To turn a video conversation into an audio conversation, choose
- <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.
- </p>
+ <p>To turn a video conversation into an audio conversation, choose
+ <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.</p>
</note>
+
<section id="video-meta-contact">
<title>Start a video conversation with a meta-contact</title>
<steps>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 13:14:33 +0800