← Back to branch summary

~ubuntu-branches/ubuntu/saucy/empathy/saucy-updates

« back to all changes in this revision

Viewing changes to help/fi/overview.page

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-05-31 10:44:31 UTC
  • mfrom: (1.1.111) (6.6.55 experimental)
  • Revision ID: package-import@ubuntu.com-20130531104431-w0ec8ntcojx76y61
Tags: 3.8.3-0ubuntu1
* Merge with Debian, remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
help/fi/overview.page
 
1
<?xml version="1.0" encoding="utf-8"?>
 
2
<page xmlns="http://projectmallard.org/1.0/" type="topic" id="overview" xml:lang="fi">
 
3
 
 
4
  <info>
 
5
    <link type="guide" xref="index"/>
 
6
    <revision pkgversion="3.7" version="0.1" date="2012-11-30" status="draft"/>
 
7
    <desc>
 
8
      What instant messaging is and how you can use it.
 
9
    </desc>
 
10
    <credit type="author">
 
11
      <name>Aruna S</name>
 
12
      <email>aruna.evam@gmail.com</email>
 
13
    </credit>
 
14
    <credit type="editor">
 
15
      <name>Ekaterina Gerasimova</name>
 
16
      <email>kittykat3756@gmail.com</email>
 
17
    </credit>
 
18
    <license>
 
19
      <p>Creative Commons Share Alike 3.0</p>
 
20
    </license>
 
21
  </info>
 
22
 
 
23
  <title>Overview of instant messaging</title>
 
24
 
 
25
  <p>
 
26
    Instant messaging, sometimes abbreviated to IM, is a text-based means to
 
27
    communicate instantly over the internet and the local network. While some
 
28
    IM applications work with only one type of account, others, including
 
29
    <link xref="introduction">Empathy</link>, provide IM facilities by using
 
30
    <link xref="add-account">accounts</link> from different service providers.
 
31
    Some of these even support audio and video calling.
 
32
  </p>
 
33
 
 
34
  <table frame="all" shade="cols">
 
35
     <tr>
 
36
       <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150"/></p></td>
 
37
       <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150"/></p></td>
 
38
       <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150"/></p></td>
 
39
     </tr>
 
40
     <tr>
 
41
       <td><p>Video Conference</p></td>
 
42
       <td><p>Group chats</p></td>
 
43
       <td><p>Chat rooms</p></td>
 
44
      </tr>
 
45
  </table>
 
46
 
 
47
  <p>
 
48
    Some instant messaging applications can be used to connect to chat rooms,
 
49
    online places where like-minded people meet to talk. One popular means to
 
50
    connect to several chat rooms is the Internet Relay Chat, also known as
 
51
    <link xref="irc-manage">IRC</link>. IRC provides
 
52
    <link xref="irc-join-room">public</link> chat rooms, which are open to
 
53
    anyone who creates an account on the IRC Server, and private chat rooms,
 
54
    which are <link xref="irc-join-pwd">password protected</link>
 
55
    and open only to a select few.
 
56
  </p>
 
57
 
 
58
</page>