aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS97
-rw-r--r--configure.ac24
-rw-r--r--data/empathy.desktop.in.in2
-rw-r--r--data/org.gnome.Empathy.gschema.xml2
-rw-r--r--data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html5
-rw-r--r--data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html3
-rw-r--r--data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html3
-rw-r--r--data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css5
-rw-r--r--data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html3
-rw-r--r--data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html9
-rw-r--r--help/C/figures/conf_overview.pngbin0 -> 605142 bytes
-rw-r--r--help/C/figures/croom_overview.pngbin0 -> 397448 bytes
-rw-r--r--help/C/figures/video_overview.pngbin0 -> 221887 bytes
-rw-r--r--help/C/overview.page59
-rw-r--r--help/Makefile.am6
-rw-r--r--help/ca/ca.po65
-rw-r--r--help/es/es.po140
-rw-r--r--libempathy-gtk/empathy-cell-renderer-text.c4
-rw-r--r--libempathy-gtk/empathy-chat.c227
-rw-r--r--libempathy-gtk/empathy-individual-widget.c4
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser-dialog.c66
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.c15
-rw-r--r--libempathy-gtk/empathy-notify-manager.c16
-rw-r--r--libempathy-gtk/empathy-notify-manager.h8
-rw-r--r--libempathy-gtk/empathy-roster-contact.c42
-rw-r--r--libempathy-gtk/empathy-theme-adium.c288
-rw-r--r--libempathy-gtk/empathy-theme-adium.h4
-rw-r--r--libempathy-gtk/empathy-webkit-utils.c78
-rw-r--r--libempathy-gtk/empathy-webkit-utils.h17
-rw-r--r--libempathy/empathy-contact.c25
-rw-r--r--libempathy/empathy-utils.c21
-rw-r--r--libempathy/empathy-utils.h3
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/as.po622
-rw-r--r--po/da.po244
-rw-r--r--po/de.po312
-rw-r--r--po/el.po370
-rw-r--r--po/es.po1463
-rw-r--r--po/et.po85
-rw-r--r--po/gl.po381
-rw-r--r--po/he.po931
-rw-r--r--po/id.po309
-rw-r--r--po/it.po454
-rw-r--r--po/kn.po2
-rw-r--r--po/lt.po938
-rw-r--r--po/mr.po2
-rw-r--r--po/nb.po355
-rw-r--r--po/pl.po383
-rw-r--r--po/ru.po650
-rw-r--r--po/sk.po1209
-rw-r--r--po/sl.po1058
-rw-r--r--po/sr.po475
-rw-r--r--po/sr@latin.po475
-rw-r--r--po/ta.po2299
-rw-r--r--po/ug.po478
-rwxr-xr-xrelease.py2
-rw-r--r--src/Makefile.am26
-rw-r--r--src/empathy-accounts-dialog.c2
-rw-r--r--src/empathy-call-observer.c3
-rw-r--r--src/empathy-call-window.c126
-rw-r--r--src/empathy-call-window.ui17
-rw-r--r--src/empathy-call.c31
-rw-r--r--src/empathy-chat-window.c86
-rw-r--r--src/empathy-chat-window.h4
-rw-r--r--src/empathy-chat-window.ui28
-rw-r--r--src/empathy-chat.c8
-rw-r--r--src/empathy-chat.gresource.xml6
-rw-r--r--src/empathy-chat.js92
-rw-r--r--src/empathy-debug-window.c27
-rw-r--r--src/empathy-notifications-approver.c7
-rw-r--r--src/empathy-roster-window-menubar.ui1
-rw-r--r--src/empathy-roster-window.c150
-rw-r--r--src/empathy-roster-window.ui52
-rw-r--r--tools/c-constants-gen.py12
-rw-r--r--tools/glib-client-gen.py18
-rw-r--r--tools/glib-client-marshaller-gen.py20
-rw-r--r--tools/glib-errors-check-gen.py62
-rw-r--r--tools/glib-errors-str-gen.py14
-rw-r--r--tools/glib-ginterface-gen.py22
-rw-r--r--tools/glib-gtypes-generator.py14
-rw-r--r--tools/glib-interfaces-gen.py14
-rw-r--r--tools/gobject-foo.py2
-rw-r--r--tools/libglibcodegen.py4
-rw-r--r--tools/libtpcodegen.py22
-rw-r--r--tools/make-version-script.py32
-rw-r--r--tools/xincludator.py13
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am171
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c22
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c46
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h75
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c6
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h2
-rwxr-xr-xubuntu-online-accounts/cc-plugins/generate-plugins.py224
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/aim.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/groupwise.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/icq.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/irc.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/jabber.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/mxit.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/myspace.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/sametime.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/sip.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/yahoo.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider1
-rw-r--r--ubuntu-online-accounts/cc-plugins/providers/zephyr.provider1
-rw-r--r--ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c59
134 files changed, 8595 insertions, 9251 deletions
diff --git a/NEWS b/NEWS
index b0746af01..1dd09d845 100644
--- a/NEWS
+++ b/NEWS
@@ -1,24 +1,105 @@
-NEW in 3.6.3 (09/01/2013)
+NEW in 3.7.4 (16/01/2013)
============
-This stable release fixes a bunch of annoying bugs and one crasher.
-Distributions shipping GNOME 3.6 should consider upgrading.
+Dependencies:
+ • telepathy-farstream ≥ 0.6.0
+ • WebKitGTK+ ≥ 1.9.1
+ • libaccounts-glib ≥ 1.4 (optional)
Bugs fixed:
+ - Fixed #657634, 'i' button on video preview looks weird (Guillaume Desmottes)
+ - Fixed #670048, Display a message if no contact is displayed because they are offline (Guillaume Desmottes)
+ - Fixed #684357, Improve context menu in chat window (Guillaume Desmottes)
+ - Fixed #687450, Initial window is very small (Guillaume Desmottes)
+ - Fixed #687616, [GNOME goal] Port to Python 3 (Guillaume Desmottes)
+ - Fixed #687629, Empathy shortcut bug Shift + F (Guillaume Desmottes)
+ - Fixed #688132, code generation during build has a race due to unintended concurrency (Guillaume Desmottes)
+ - Fixed #688174, RTL languages (e.g. Hebrew) are no longer aligned to right (Guillaume Desmottes)
+ - Fixed #688860, Clearly label the message in Error presences as from the server (Guillaume Desmottes)
+ - Fixed #690733, Assertion when trying to add contacts with only a SIP account connnected (Guillaume Desmottes)
+ - Fixed #691006, empathy-CRITICAL **: empathy_contact_dup_from_tp_contact: assertion `TP_IS_CONTACT (tp_contact)' failed (Guillaume Desmottes)
+ - Fixed #691043, support notification filtering (Guillaume Desmottes)
- Fixed #691085, Backslash escapes applied in the chat log (Guillaume Desmottes)
- Fixed #691137, Empathy contact list window resizes automatically when connections are lost (Guillaume Desmottes)
- Fixed #691195, Rakia / SIP "Use this account to call landlines and mobile phones" checkbox does nothing (Guillaume Desmottes)
- - Fixed #691006, empathy-CRITICAL **: empathy_contact_dup_from_tp_contact: assertion `TP_IS_CONTACT (tp_contact)' failed (Guillaume Desmottes)
- - Fixed #688132, code generation during build has a race due to unintended concurrency (Debarshi Ray, Guillaume Desmottes)
+ - Fixed #691418, Use a shared plugin for all empathy providers (Alberto Mardegan)
+ - Fixed #691469, UOA: use the new libaccounts-glib APIs (Alberto Mardegan)
+ - Fixed #668464, Use correct +/- buttons (Guillaume Desmottes)
Translations:
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated de Translation (Hendrik Knackstedt)
+ - Updated el Translation (Dimitris Spingos)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
- Updated hi Translation (Rajesh Ranjan)
- - Updated kn Translation (Shankar Prasad)
+ - Updated it Translation (Milo Casagrande)
+ - Updated lt Translation (Aurimas ÄŒernius)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pl Translation (Piotr DrÄ…g)
+ - Updated sl Translation (Matej UrbanÄiÄ)
+ - Updated te Translation (Krishnababu Krothapalli)
+ - Updated ug Translation (Gheyret Kenji)
+
+Documentation translations:
+ - Updated ca Documentation translation (Gil Forcada)
+
+NEW in 3.7.3 (18/12/2012)
+============
+
+Dependencies:
+ • geocode-glib ≥ 0.99.1 (optional)
+
+Bugs fixed:
+ - Fixed #688988, [PATCH] add more protocolname<->displayname (Gabriele Giacone)
+ - Fixed #689056, Port EmpathyContact to geocode-glib >= 0.99.1 (Bastien Nocera)
+ - Fixed #689122, org.gnome.empathy.notifications.notification-focus should default to true (Guillaume Desmottes)
+
+Translations:
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated gl Translation (Fran Diéguez)
- Updated ml Translation (Ani Peter)
- Updated or Translation (ManojKumar Giri)
+ - Updated pl Translation (Piotr DrÄ…g)
+ - Updated ru Translation (Yuri Myasoedov)
+
+Documentation translations:
+ - Updated es Documentation translation (Daniel Mustieles)
+
+NEW in 3.7.2 (22/11/2012)
+============
+Bugs fixed:
+ - Fixed #592995, Debug: tell user about bug report and potential privacy violation (Guillaume Desmottes)
+ - Fixed #681445, Display UOA specific auth error (Xavier Claessens)
+ - Fixed #685793, EmpathyChatWindow should be a GtkWindow (Guillaume Desmottes)
+ - Fixed #685888, Add a debug option to show the GStreamer pipeline (Debarshi Ray)
+ - Fixed #686067, typo in string "developpers" (Guillaume Desmottes)
+ - Fixed #687361, Irc account edit dialog improvements (Michael Wood)
+ - Fixed #687338, Resizeable "edit connection parameters" (Michael Wood)
+ - Fixed #684979, inhibit going idle when doing a call (Guillaume Desmottes)
+ - Fixed #686969, add keywords to the desktop file (Matthias Clasen)
+
+Translations:
+ - Updated da Translation (Ask H. Larsen)
+ - Updated de Translation (Tobias Endrigkeit)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated ga Translation (Seán de Búrca)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated id Translation (Andika Triwidada)
+ - Updated kn Translation (Shankar Prasad)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated mr Translation (Sandeep Sheshrao Shedmake)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated nn Translation (Andreas N)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sk Translation (Pavol KlaÄanský)
+ - Updated sl Translation (Matej UrbanÄiÄ)
- Updated ta Translation (Dr.T.Vasudevan)
- - Updated te Translation (Krishnababu Krothapalli)
- - Updated ug Translation (Gheyret Kenji)
NEW in 3.6.2 (13/11/2012)
============
diff --git a/configure.ac b/configure.ac
index 373bb7a64..f3b866876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [6])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_minor_version], [7])
+m4_define([empathy_micro_version], [4])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
@@ -55,25 +55,28 @@ TELEPATHY_GLIB_REQUIRED=0.19.9
AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_20, [Ignore post 0.20 deprecations])
AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
+AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header])
GSTREAMER_REQUIRED=0.10.32
+TP_FS_REQUIRED=0.6.0
LIBSECRET_REQUIRED=0.5
GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
LIBNOTIFY_REQUIRED=0.7.0
-TELEPATHY_LOGGER=0.2.13
-WEBKIT_REQUIRED=1.3.13
+TELEPATHY_LOGGER=0.8.0
+WEBKIT_REQUIRED=1.9.1
GOA_REQUIRED=3.5.1
# Optional deps
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.12
+GEOCODE_GLIB_REQUIRED=0.99.1
ISO_CODES_REQUIRED=0.35
NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
CHAMPLAIN_REQUIRED=0.12.1
CHEESE_GTK_REQUIRED=3.4.0
-LIBACCOUNTS_REQUIRED=1.1
+LIBACCOUNTS_REQUIRED=1.4
LIBSIGNON_REQUIRED=1.1
MC_PLUGINS_REQUIRED=5.13.1
@@ -119,6 +122,9 @@ LT_INIT
AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
GLIB_GSETTINGS
+
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG gio-2.0 --variable=glib_compile_resources`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
@@ -225,13 +231,13 @@ AC_ARG_ENABLE(gst-1.0,
enable_gst1=$enableval,
enable_gst1=auto)
-# Try to use GStreamer 1.à if available
+# Try to use GStreamer 1.0 if available
have_gst1="no"
if test "x$enable_gst1" != "xno"; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farstream-0.2
- telepathy-farstream >= 0.4.999
+ telepathy-farstream >= $TP_FS_REQUIRED
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
clutter-gst-2.0
@@ -255,7 +261,7 @@ if test "x$have_gst1" != "xyes"; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farstream-0.1
- telepathy-farstream >= 0.2.1
+ telepathy-farstream >= $TP_FS_REQUIRED
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
clutter-gst-1.0 >= 1.5.2
@@ -434,7 +440,7 @@ AC_ARG_ENABLE(geocode,
if test "x$enable_geocode" != "xno"; then
PKG_CHECK_MODULES(GEOCODE,
[
- geocode-glib
+ geocode-glib >= $GEOCODE_GLIB_REQUIRED
], have_geocode="yes", have_geocode="no")
if test "x$have_geocode" = "xyes"; then
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index 7cce2261c..c5dea6f7e 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -4,12 +4,14 @@ _Name=Empathy
_GenericName=IM Client
_X-GNOME-FullName=Empathy Internet Messaging
_Comment=Chat on Google Talk, Facebook, MSN and many other chat services
+_Keywords=chat;talk;im;message;irc;voip;gtalk;facebook;jabber;
Exec=empathy
Icon=empathy
StartupNotify=false
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;InstantMessaging;
+X-GNOME-UsesNotifications=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=empathy
X-GNOME-Bugzilla-Component=General
diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index 528a7c27e..9267cf848 100644
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -144,7 +144,7 @@ present them to the user immediately.</description>
<description>Whether to show popup notifications when away or busy.</description>
</key>
<key name="notifications-focus" type="b">
- <default>false</default>
+ <default>true</default>
<summary>Pop up notifications if the chat isn't focused</summary>
<description>Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused.</description>
</key>
diff --git a/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html b/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
index b2c888a8b..35cf7e0eb 100644
--- a/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+++ b/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
@@ -3,8 +3,9 @@
<img src="%userIconPath%" class="avatar" title="%sender%" />
<span class="sender">%sender%</span>
<span class="timestamp">%time%</span>
- </div>
- <div class="%messageClasses%">
+ </div>
+ <div id="prepend"></div>
+ <div class="%messageClasses%" dir="%messageDirection%">
%message%
</div>
<div id="insert"></div>
diff --git a/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html b/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
index 747caa6d7..44317df45 100644
--- a/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+++ b/data/themes/Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
@@ -1,4 +1,5 @@
-<div class="%messageClasses%">
+<div id="prepend"></div>
+<div class="%messageClasses%" dir="%messageDirection%">
%message%
</div>
<div id="insert"></div>
diff --git a/data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html b/data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html
index 3a1a3d9c9..3eaa3ef93 100644
--- a/data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html
+++ b/data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html
@@ -1,4 +1,5 @@
-<div class="%messageClasses%">
+<div id="prepend"></div>
+<div class="%messageClasses%" dir="%messageDirection%">
<span class="sender">%sender%:</span>
<span class="message">%message%</span>
</div>
diff --git a/data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css b/data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css
index 8493fedbf..1950408f0 100644
--- a/data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css
+++ b/data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css
@@ -60,3 +60,8 @@ div.message.action span.message::before {
::selection {
background: #4a90d9;
}
+
+div.message {
+ padding: 0.3ex 0;
+ line-height: 130%;
+}
diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
index e3a5c63ff..ffef0e1f1 100644
--- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
@@ -5,7 +5,8 @@
</div>
<div class="post">
<div class="post-body">
- <div class="post-contents">
+ <div class="post-contents" dir="%messageDirection%">
+ <div id="prepend"></div>
<p>
%message%
</p>
diff --git a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
index 9982230db..6b49c609a 100644
--- a/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
+++ b/data/themes/PlanetGNOME.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
@@ -1,4 +1,7 @@
-<p>
- %message%
-</p>
+<div id="prepend"></div>
+<div dir="%messageDirection%">
+ <p>
+ %message%
+ </p>
+</dir>
<div id="insert"></div>
diff --git a/help/C/figures/conf_overview.png b/help/C/figures/conf_overview.png
new file mode 100644
index 000000000..7b9c0d89f
--- /dev/null
+++ b/help/C/figures/conf_overview.png
Binary files differ
diff --git a/help/C/figures/croom_overview.png b/help/C/figures/croom_overview.png
new file mode 100644
index 000000000..74079630c
--- /dev/null
+++ b/help/C/figures/croom_overview.png
Binary files differ
diff --git a/help/C/figures/video_overview.png b/help/C/figures/video_overview.png
new file mode 100644
index 000000000..71332bf4f
--- /dev/null
+++ b/help/C/figures/video_overview.png
Binary files differ
diff --git a/help/C/overview.page b/help/C/overview.page
new file mode 100644
index 000000000..daa67b844
--- /dev/null
+++ b/help/C/overview.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="overview">
+
+ <info>
+ <link type="guide" xref="index"/>
+ <revision pkgversion="3.7" version="0.1" date="2012-11-30" status="draft"/>
+ <desc>
+ What instant messaging is and how you can use it.
+ </desc>
+ <credit type="author">
+ <name>Aruna S</name>
+ <email>aruna.evam@gmail.com</email>
+ </credit>
+ <credit type="editor">
+ <name>Ekaterina Gerasimova</name>
+ <email>kittykat3756@gmail.com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+ <title>Overview of instant messaging</title>
+
+ <p>
+ Instant messaging, sometimes abbreviated to IM, is a text-based means to
+ communicate instantly over the internet and the local network. While some
+ IM applications work with only one type of account, others, including
+ <link xref="introduction">Empathy</link>, provide IM facilities by using
+ <link xref="add-account">accounts</link> from different service providers.
+ Some of these even support audio and video calling.
+ </p>
+
+ <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>
+ </tr>
+ <tr>
+ <td><p>Video Conference</p></td>
+ <td><p>Group chats</p></td>
+ <td><p>Chat rooms</p></td>
+ </tr>
+ </table>
+
+ <p>
+ Some instant messaging applications can be used to connect to chat rooms,
+ online places where like-minded people meet to talk. One popular means to
+ connect to several chat rooms is the Internet Relay Chat, also known as
+ <link xref="irc-manage">IRC</link>. IRC provides
+ <link xref="irc-join-room">public</link> chat rooms, which are open to
+ anyone who creates an account on the IRC Server, and private chat rooms,
+ which are <link xref="irc-join-pwd">password protected</link>
+ and open only to a select few.
+ </p>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 678ae6df9..60b9facab 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -12,7 +12,10 @@ HELP_MEDIA = \
figures/gtk-add.png \
figures/gtk-edit.png \
figures/gtk-remove.png \
- figures/offline.png
+ figures/offline.png \
+ figures/croom_overview.png \
+ figures/conf_overview.png \
+ figures/video_overview.png
HELP_FILES = \
account-irc.page \
@@ -46,6 +49,7 @@ HELP_FILES = \
irc-start-conversation.page \
license.page \
link-contacts.page \
+ overview.page \
prev-conv.page \
prob-conn-acctdisabled.page \
prob-conn-auth.page \
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 4ee578a2b..3193c282a 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -112,7 +112,7 @@ msgid ""
"accounts, and it requires the other person to have an application that "
"supports video calls."
msgstr ""
-"Si teniu una càmera web, podeu trucar els vostres contactes i tindre una "
+"Si teniu una càmera web, podeu trucar els contactes i tindre una "
"vídeo conferencia amb ells. Aquesta característica sols funciona amb certs "
"tipus de comptes, i requereix que l'altra persona tingui una aplicació que "
"suporti vídeo trucades."
@@ -134,7 +134,7 @@ msgstr ""
"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la "
"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
"\">vídeo trucada</media> a la vora del nom del contacte que vols trucar i "
-"escull <gui style=\"menuitem\">Vídeo trucada</gui>. Alternativament, feu clic al "
+"escull <gui style=\"menuitem\">Vídeo trucada</gui>. També podeu fer clic al "
"botó dret sobre el contacte i escull <gui style=\"menuitem\">Vídeo trucada</"
"gui>."
@@ -313,7 +313,7 @@ msgid ""
"still see your contacts’ statuses and start conversations with them."
msgstr ""
"Quan poseu l'estat com a <em>Invisible</em>, apareixereu com a desconnectat "
-"per als vostres contactes. Encara estareu connectat als comptes i podreu "
+"per als contactes. Encara estareu connectat als comptes i podreu "
"veure l'estat dels contactes i xatejar-hi."
#: C/status-icons.page:70(gui)
@@ -926,9 +926,8 @@ msgid ""
"you are using a nickname that is already being used by someone else on that "
"particular network."
msgstr ""
-"Aquests tipus d'errades apareixen quan intenteu connectar-vos al vostre "
-"compte d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella "
-"xarxa."
+"Aquests tipus d'errades apareixen quan intenteu connectar-vos a comptes "
+"d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella xarxa."
#: C/prob-conn-name.page:50(p)
msgid "In the <gui>Nickname</gui> text box, type a new nickname."
@@ -1031,11 +1030,11 @@ msgstr ""
#: C/prev-conv.page:8(desc)
msgid "Browse or search your previous conversations."
-msgstr "Navegueu o cerqueu per les vostres converses prèvies."
+msgstr "Navegueu o cerqueu per les converses anteriors."
#: C/prev-conv.page:35(title)
msgid "View previous conversations"
-msgstr "Visualitzeu les converses prèvies"
+msgstr "Visualitzeu les converses anteriors"
#: C/prev-conv.page:39(p)
msgid ""
@@ -1060,8 +1059,8 @@ msgid ""
msgstr ""
"L'<app>Empathy</app> desa automàticament totes les converses que manteniu "
"amb els contactes. Podeu cercar <link xref=\"#search\">per les "
-"converses prèvies</link> o <link xref=\"#browse\">navegar per les "
-"converses prèvies</link> per contacte i data."
+"converses anteriors</link> o <link xref=\"#browse\">navegar per les "
+"converses anteriors</link> per contacte i data."
#: C/prev-conv.page:54(p)
msgid ""
@@ -1069,18 +1068,18 @@ msgid ""
"previous conversations."
msgstr ""
"No us cal estar connectat a Internet per visualitzar i cercar a les "
-"converses prèvies."
+"converses anteriors."
#: C/prev-conv.page:61(title)
msgid "Search previous conversations"
-msgstr "Cerqueu a les converses prèvies"
+msgstr "Cerqueu a les converses anteriors"
#: C/prev-conv.page:63(p)
msgid ""
"You can perform a full-text search through all of your previous "
"conversations."
msgstr ""
-"Podeu utilitzar cerca de texts complets dins les converses prèvies."
+"Podeu utilitzar cerca de texts complets dins les converses anteriors."
#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
msgid ""
@@ -1089,8 +1088,8 @@ msgid ""
"<key>F3</key>."
msgstr ""
"Des de la finestra <gui>Llista de contactes</gui> escolliu "
-"<guiseq><gui>Visualitza</gui><gui>Converses prèvies</gui></guiseq>. "
-"Alternativament, premeu <key>F3</key>."
+"<guiseq><gui>Visualitza</gui><gui>Converses anteriors</gui></guiseq>. "
+"O premeu <key>F3</key>."
#: C/prev-conv.page:71(p)
msgid "Select the <gui>Search</gui> tab."
@@ -1123,14 +1122,14 @@ msgstr ""
#: C/prev-conv.page:89(title)
msgid "Browse previous conversations"
-msgstr "Navegueu per les converses prèvies"
+msgstr "Navegueu per les converses anteriors"
#: C/prev-conv.page:91(p)
msgid ""
"You can browse your previous conversations with your contacts or in chat "
"rooms by date."
msgstr ""
-"Podeu navegar, per data, per les converses prèvies amb els contactes i "
+"Podeu navegar, per data, per les converses anteriors amb els contactes i "
"pels xats a les sales."
#: C/prev-conv.page:100(p)
@@ -1150,7 +1149,7 @@ msgid ""
"Select a contact or chat room to view your previous conversations from. By "
"default the most recent conversation will be shown."
msgstr ""
-"Seleccioneu un contacte o una sala de xat per veure'n les converses prèvies. "
+"Seleccioneu un contacte o una sala de xat per veure'n les converses anteriors. "
"Per defecte es mostrarà la conversa més recent."
#: C/prev-conv.page:111(p)
@@ -1180,7 +1179,7 @@ msgid ""
"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
"Conversations</gui> window will open with that contact already selected."
msgstr ""
-"Podeu veure fàcilment les converses prèvies amb algun dels contactes a la "
+"Podeu veure fàcilment les converses anteriors amb algun dels contactes a la "
"finestra <gui>Llista de contactes</gui>. Feu clic sobre el contacte i "
"escolliu <gui>Visualitza les converses anteriors</gui>. S'obrirà la finestra "
"<gui>Converses anteriors</gui> amb el contacte ja seleccionat."
@@ -1307,7 +1306,7 @@ msgstr "Copiar, distribuir i transmetre el treball."
#: C/license.page:29(em)
msgid "To remix"
-msgstr "Refer"
+msgstr "Fer-ne obres derivades"
#: C/license.page:30(p)
msgid "To adapt the work."
@@ -1452,7 +1451,7 @@ msgstr ""
"L'<app>Empathy</app> no suporta el registre de sobrenoms. Algunes xarxes d'IRC, "
"tanmateix, us enviaran de forma automàtica una <em>contrasenya de servidor</"
"em> al NickServ. En aquestes xarxes, podeu utilitzar la contrasenya d'IRC a "
-"<app>Empathy</app> per identificar-vos amb NickServ. La popular xarxa "
+"l'<app>Empathy</app> per identificar-vos amb NickServ. La popular xarxa "
"FreeNode és coneguda per aquesta característica."
#: C/irc-nick-password.page:46(p)
@@ -2142,7 +2141,7 @@ msgstr "Qui pot veure la informació enviada"
#: C/geolocation-privacy.page:57(p)
msgid "Only your contacts can see your geographical position."
-msgstr "Sols els vostres contactes poden veure la vostra posició geogràfica."
+msgstr "Només els contactes poden veure la vostra posició geogràfica."
#: C/geolocation-privacy.page:63(title)
msgid "What is the privacy mode"
@@ -2183,7 +2182,7 @@ msgstr ""
#: C/geolocation-privacy.page:92(p)
msgid "Only your contacts can see your position."
-msgstr "Sols els contactes poden veure la vostra posició."
+msgstr "Només els contactes poden veure la vostra posició."
#: C/geolocation-not-showing.page:8(desc)
msgid "<app>Empathy</app> does not publish my geographical position."
@@ -2207,7 +2206,7 @@ msgid ""
"In this case, your position will not be published, but you are still able to "
"see the location of your contacts."
msgstr ""
-"En aquest cas, la vostra posició no serà publicada, però podreu veure la "
+"En aquest cas, no es publicarà la vostra posició, però podreu veure la "
"localització dels contactes."
#: C/geolocation-not-showing.page:42(p)
@@ -2443,10 +2442,10 @@ msgid ""
"password, as well as any additional information you need to connect using "
"<app>Empathy</app>."
msgstr ""
-"Aquesta pàgina proporciona informació sobre la creació comptes nous de tipologia "
-"variada. El vostre proveïdor de comptes hauria de donar-vos un nom d'usuari "
-"ID i una contrasenya, així com qualsevol informació addicional que us pugui "
-"fer falta per connectar-vos amb <app>Empathy</app>."
+"Aquesta pàgina proporciona informació sobre la creació de comptes nous de "
+"tipologia variada. El vostre proveïdor de comptes hauria de donar-vos un "
+"nom d'usuari ID i una contrasenya, així com qualsevol informació addicional "
+"que us pugui fer falta per connectar-vos amb l'<app>Empathy</app>."
#: C/create-account.page:47(title)
msgid "Facebook"
@@ -2907,8 +2906,8 @@ msgstr ""
"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la "
"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
"\">vídeo trucada</media> a la vora del nom del contacte que vols trucar i "
-"escull <gui style=\"menuitem\">Vídeo trucada</gui>. Alternativament, prem el "
-"botó dret sobre el contacte i escull <gui style=\"menuitem\">Vídeo trucada</"
+"escull <gui style=\"menuitem\">Vídeo trucada</gui>. També podeu prémer el "
+"botó dret sobre el contacte i seleccionar <gui style=\"menuitem\">Vídeo trucada</"
"gui>."
#: C/audio-call.page:55(p)
@@ -2952,7 +2951,7 @@ msgstr "Afegiu algú a la llista de contactes."
#: C/add-contact.page:33(title)
msgid "Add someone to your list of contacts"
-msgstr "Afegiu algú a la vostra llista de contactes"
+msgstr "Afegiu algú a la llista de contactes"
#: C/add-contact.page:37(p)
msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
@@ -2982,7 +2981,7 @@ msgid ""
"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
"to appear in your contact list."
msgstr ""
-"Al camp <gui>Sobrenom</gui> introduïu el nom del contacte tal com voleu que "
+"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que "
"aparegui a la llista de contactes."
#: C/add-contact.page:53(p)
@@ -3326,7 +3325,7 @@ msgid ""
"will be able to see this when they view your information."
msgstr ""
"Podeu proporcionar el vostre nom real conjuntament amb el sobrenom. Els altres "
-"usuaris podran el podran veure quan vegin la vostra informació."
+"usuaris el podran veure quan vegin la vostra informació."
#: C/account-irc.page:81(gui)
msgid "Quit message"
diff --git a/help/es/es.po b/help/es/es.po
index 3f71cbc9e..8ab4fb60b 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -6,14 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-help.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-17 16:36+0000\n"
-"PO-Revision-Date: 2012-02-17 17:27+0100\n"
+"POT-Creation-Date: 2012-12-01 19:17+0000\n"
+"PO-Revision-Date: 2012-12-02 19:21+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -97,8 +98,8 @@ msgstr "Milo Casagrande"
#: C/irc-join-room.page:20(license/p) C/irc-manage.page:23(license/p)
#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p)
#: C/irc-start-conversation.page:19(license/p)
-#: C/link-contacts.page:19(license/p) C/prev-conv.page:25(license/p)
-#: C/prob-conn-acctdisabled.page:23(license/p)
+#: C/link-contacts.page:19(license/p) C/overview.page:20(license/p)
+#: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p)
#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p)
#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p)
#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p)
@@ -362,8 +363,8 @@ msgid ""
"height=\"16\">Remove</media>."
msgstr ""
"Para quitar una red de la lista seleccione y pulse <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
-"\">Quitar</media>."
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Quitar</media>."
#: C/account-irc.page:115(section/p)
msgid ""
@@ -2476,6 +2477,121 @@ msgstr ""
msgid "Click <gui style=\"button\">Unlink</gui>."
msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:37(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgctxt "_"
+msgid ""
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
+msgstr ""
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:38(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgctxt "_"
+msgid ""
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
+msgstr ""
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:39(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/gtk-remove.png' "
+#| "md5='215e3a325a3dd619874e35c30a018bb6'"
+msgctxt "_"
+msgid ""
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
+msgstr ""
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
+
+#: C/overview.page:8(info/desc)
+msgid "What instant messaging is and how you can use it."
+msgstr "Qué es la mensajería instantánea y cómo puede usarla."
+
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
+msgstr "Aruna S"
+
+#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/overview.page:24(page/title)
+msgid "Overview of instant messaging"
+msgstr "Visión general de la mensajería instantánea"
+
+#: C/overview.page:26(page/p)
+msgid ""
+"Instant messaging, sometimes abbreviated to IM, is a text-based means to "
+"communicate instantly over the internet and the local network. While some IM "
+"applications work with only one type of account, others, including <link "
+"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link "
+"xref=\"add-account\">accounts</link> from different service providers. Some "
+"of these even support audio and video calling."
+msgstr ""
+"La mensajería instantánea, abreviada algunas veces como IM, es una manera de "
+"comunicarse a través de Internet y de una red local usando texto. Aunque "
+"algunas aplicaciones de IM sólo funcionan con un tipo de cuentas otras, "
+"entre las que se incluye <link xref=\"introduction\">Empathy</link>, "
+"proporcionan facilidades de IM usando <link xref=\"add-account\">cuentas</"
+"link> de diferentes proveedores de servicios. Algunos de ellos soportan "
+"incluso llamadas con sonido y vídeo."
+
+#: C/overview.page:42(td/p)
+msgid "Video Conference"
+msgstr "Videoconferencia"
+
+#: C/overview.page:43(td/p)
+#| msgid "Group conversations"
+msgid "Group chats"
+msgstr "Conversaciones en grupo"
+
+#: C/overview.page:44(td/p)
+#| msgid "Favorite rooms"
+msgid "Chat rooms"
+msgstr "Salas de chat"
+
+#: C/overview.page:48(page/p)
+msgid ""
+"Some instant messaging applications can be used to connect to chat rooms, "
+"online places where like-minded people meet to talk. One popular means to "
+"connect to several chat rooms is the Internet Relay Chat, also known as "
+"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room"
+"\">public</link> chat rooms, which are open to anyone who creates an account "
+"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-"
+"pwd\">password protected</link> and open only to a select few."
+msgstr ""
+"Algunas aplicaciones de mensajería instantánea se pueden usar para "
+"conectarse a salas de chat, lugares en línea donde conocer gente con gustos "
+"similares con la que poder hablar. Una manera popular de conectarse a varias "
+"salas de chat es con «Internet Relay Chat», también conocido como <link xref="
+"\"irc-manage\">IRC</link>. IRC proporciona salas de chat <link xref=\"irc-"
+"join-room\">públicas</link> abiertas para todo aquel que se cree una cuenta "
+"en el servidor de IRC, y salas privadas, que están <link xref=\"irc-join-pwd"
+"\">protegidas por contraseña</link> y sólo permiten el acceso a unos pocos."
+
#: C/prev-conv.page:8(info/desc)
msgid "Browse or search your previous conversations."
msgstr "Examinar o buscar en sus conversaciones anteriores"
@@ -2729,8 +2845,8 @@ msgid ""
"An error message which says “<gui>Name in use</gui>†appears in the main "
"window."
msgstr ""
-"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en "
-"uso</gui>»."
+"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre "
+"en uso</gui>»."
#: C/prob-conn-name.page:33(page/title)
msgid "I get a message that says “Name in useâ€"
@@ -3149,10 +3265,6 @@ msgstr ""
msgid "Show your desktop to your contacts."
msgstr "Mostrar su escritorio a sus contactos."
-#: C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
#: C/share-desktop.page:33(page/title)
msgid "Share your desktop"
msgstr "Compartir su escritorio"
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index d52abb485..d96ccc403 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -364,8 +364,8 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
status = empathy_presence_get_default_message (priv->presence_type);
}
- if (!priv->is_group && priv->types != NULL && g_strv_length (priv->types) > 0
- && !tp_strdiff (priv->types[0], "phone")) {
+ if (!priv->is_group &&
+ empathy_client_types_contains_mobile_device (priv->types)) {
on_a_phone = TRUE;
/* We want the phone black. */
if (attr_color)
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 9a12d1f09..1c0e11a3a 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -2,6 +2,7 @@
/*
* Copyright (C) 2002-2007 Imendio AB
* Copyright (C) 2007-2010 Collabora Ltd.
+ * Copyright (C) 2012 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -80,6 +81,17 @@ struct _EmpathyChatPriv {
GSettings *gsettings_ui;
TplLogManager *log_manager;
+ TplLogWalker *log_walker;
+ /* Are we watching for scrolling movements? */
+ gboolean watch_scroll;
+ /* Maximum page size of the chat->view. */
+ guint max_page_size;
+ /* The offset from the lower edge of the chat->view before it
+ * expanded to fit in the newly fetched logs. This is to
+ * restore the chat->view to the page it was on before the
+ * latest batch of logs were inserted. */
+ guint scroll_offset;
+
TpAccountManager *account_manager;
GList *input_history;
GList *input_history_current;
@@ -197,6 +209,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (EmpathyChat, empathy_chat, GTK_TYPE_BOX);
+static gboolean chat_scrollable_connect (gpointer user_data);
static gboolean update_misspelled_words (gpointer data);
static void
@@ -2494,21 +2507,15 @@ static gboolean
chat_log_filter (TplEvent *event,
gpointer user_data)
{
- TpWeakRef *wr = user_data;
- EmpathyChat *chat = tp_weak_ref_dup_object (wr);
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyChatPriv *priv = GET_PRIV (chat);
EmpathyMessage *message;
- EmpathyChatPriv *priv;
const GList *pending;
bool retval = FALSE;
- if (chat == NULL)
- return FALSE;
-
g_return_val_if_fail (TPL_IS_EVENT (event), FALSE);
g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
- priv = GET_PRIV (chat);
-
pending = empathy_tp_chat_get_pending_messages (priv->tp_chat);
message = empathy_message_from_tpl_log_event (event);
@@ -2521,7 +2528,6 @@ chat_log_filter (TplEvent *event,
out:
g_object_unref (message);
- g_object_unref (chat);
return retval;
}
@@ -2548,26 +2554,38 @@ show_pending_messages (EmpathyChat *chat) {
}
+static gboolean
+chat_scrollable_set_value (gpointer user_data)
+{
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ GtkAdjustment *adjustment;
+ guint upper;
+
+ adjustment = gtk_scrollable_get_vadjustment (
+ GTK_SCROLLABLE (chat->view));
+
+ /* Set the chat->view's adjustment back to the value it had
+ * before it grew as a result of new logs being inserted.
+ */
+ upper = (guint) gtk_adjustment_get_upper (adjustment);
+ gtk_adjustment_set_value (adjustment, upper - priv->scroll_offset);
+
+ return G_SOURCE_REMOVE;
+}
+
static void
-got_filtered_messages_cb (GObject *manager,
+got_filtered_messages_cb (GObject *walker,
GAsyncResult *result,
gpointer user_data)
{
GList *l;
GList *messages;
- TpWeakRef *wr = user_data;
- EmpathyChat *chat = tp_weak_ref_dup_object (wr);
- EmpathyChatPriv *priv;
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyChatPriv *priv = GET_PRIV (chat);
GError *error = NULL;
- if (chat == NULL) {
- tp_weak_ref_destroy (wr);
- return;
- }
-
- priv = GET_PRIV (chat);
-
- if (!tpl_log_manager_get_filtered_events_finish (TPL_LOG_MANAGER (manager),
+ if (!tpl_log_walker_get_events_finish (TPL_LOG_WALKER (walker),
result, &messages, &error)) {
DEBUG ("%s. Aborting.", error->message);
empathy_theme_adium_append_event (chat->view,
@@ -2576,7 +2594,7 @@ got_filtered_messages_cb (GObject *manager,
goto out;
}
- for (l = messages; l; l = g_list_next (l)) {
+ for (l = g_list_last (messages); l; l = g_list_previous (l)) {
EmpathyMessage *message;
g_assert (TPL_IS_EVENT (l->data));
@@ -2601,14 +2619,14 @@ got_filtered_messages_cb (GObject *manager,
"sender", empathy_message_get_sender (message),
NULL);
- empathy_theme_adium_append_message (chat->view, syn_msg,
+ empathy_theme_adium_prepend_message (chat->view, syn_msg,
chat_should_highlight (chat, syn_msg));
empathy_theme_adium_edit_message (chat->view, message);
g_object_unref (syn_msg);
} else {
/* append the latest message */
- empathy_theme_adium_append_message (chat->view, message,
+ empathy_theme_adium_prepend_message (chat->view, message,
chat_should_highlight (chat, message));
}
@@ -2617,10 +2635,6 @@ got_filtered_messages_cb (GObject *manager,
g_list_free (messages);
out:
- /* in case of TPL error, skip backlog and show pending messages */
- priv->can_show_pending = TRUE;
- show_pending_messages (chat);
-
/* FIXME: See Bug#610994, we are forcing the ACK of the queue. See comments
* about it in EmpathyChatPriv definition */
priv->retrieving_backlogs = FALSE;
@@ -2629,43 +2643,146 @@ out:
/* Turn back on scrolling */
empathy_theme_adium_scroll (chat->view, TRUE);
+ /* We start watching the scrolling movements only after the first
+ * batch of logs have been fetched. Otherwise, if the
+ * chat->view's page size is too small the scrollbar might hit
+ * the upper edge and trigger another batch of logs to be
+ * fetched.
+ */
+ if (G_UNLIKELY (!priv->watch_scroll &&
+ !tpl_log_walker_is_end (priv->log_walker))) {
+ /* The pending messages need not be shown after the
+ * first batch of logs have been displayed */
+ priv->can_show_pending = TRUE;
+ show_pending_messages (chat);
+
+ priv->watch_scroll = TRUE;
+ g_idle_add_full (G_PRIORITY_LOW, chat_scrollable_connect,
+ g_object_ref (chat), g_object_unref);
+ }
+ else {
+ GtkAdjustment *adjustment;
+ guint upper;
+ guint value;
+
+ /* The chat->view's adjustment won't change unless we
+ * return to the main loop. Save the current offset
+ * from the lower edge (or the upper value of the
+ * adjustment) so that we can restore it later once the
+ * adjustment grows.
+ */
+ adjustment = gtk_scrollable_get_vadjustment (
+ GTK_SCROLLABLE (chat->view));
+ upper = (guint) gtk_adjustment_get_upper (adjustment);
+ value = (guint) gtk_adjustment_get_value (adjustment);
+ priv->scroll_offset = upper - value;
+
+ g_idle_add_full (G_PRIORITY_LOW, chat_scrollable_set_value,
+ g_object_ref (chat), g_object_unref);
+ }
+
g_object_unref (chat);
- tp_weak_ref_destroy (wr);
}
-static void
+static gboolean
chat_add_logs (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- TplEntity *target;
- TpWeakRef *wr;
if (!priv->id) {
- return;
+ return G_SOURCE_REMOVE;
}
/* Turn off scrolling temporarily */
empathy_theme_adium_scroll (chat->view, FALSE);
- /* Add messages from last conversation */
- if (priv->handle_type == TP_HANDLE_TYPE_ROOM)
- target = tpl_entity_new_from_room_id (priv->id);
- else
- target = tpl_entity_new (priv->id, TPL_ENTITY_CONTACT, NULL, NULL);
+ tpl_log_walker_get_events_async (priv->log_walker, 5,
+ got_filtered_messages_cb, g_object_ref (chat));
+
+ return G_SOURCE_REMOVE;
+}
+
+static void
+chat_schedule_logs (EmpathyChat *chat)
+{
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+
+ if (priv->retrieving_backlogs)
+ return;
priv->retrieving_backlogs = TRUE;
- wr = tp_weak_ref_new (chat, NULL, NULL);
- tpl_log_manager_get_filtered_events_async (priv->log_manager,
- priv->account,
- target,
- TPL_EVENT_MASK_TEXT,
- 5,
- chat_log_filter,
- wr,
- got_filtered_messages_cb,
- wr);
+ g_timeout_add_full (G_PRIORITY_LOW, 500, /* ms */
+ (GSourceFunc) chat_add_logs, g_object_ref (chat), g_object_unref);
+}
- g_object_unref (target);
+static void
+chat_view_adjustment_changed_cb (GtkAdjustment *adjustment,
+ gpointer user_data)
+{
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ guint page_size;
+
+ if (tpl_log_walker_is_end (priv->log_walker)) {
+ g_signal_handlers_disconnect_by_func (adjustment,
+ chat_view_adjustment_changed_cb, user_data);
+ return;
+ }
+
+ page_size = (guint) gtk_adjustment_get_page_size (adjustment);
+ if (page_size <= priv->max_page_size)
+ return;
+
+ /* We need to fetch more logs if the page size of the view
+ * increases, so that there is no empty space at the top.
+ */
+ if (G_LIKELY (priv->max_page_size != 0))
+ chat_schedule_logs (chat);
+
+ priv->max_page_size = page_size;
+}
+
+static void
+chat_view_adjustment_value_changed_cb (GtkAdjustment *adjustment,
+ gpointer user_data)
+{
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ guint lower;
+ guint value;
+
+ if (tpl_log_walker_is_end (priv->log_walker)) {
+ g_signal_handlers_disconnect_by_func (adjustment,
+ chat_view_adjustment_value_changed_cb, user_data);
+ return;
+ }
+
+ lower = (guint) gtk_adjustment_get_lower (adjustment);
+ value = (guint) gtk_adjustment_get_value (adjustment);
+ if (value != lower)
+ return;
+
+ /* Request for more logs to be fetched if the user hit the
+ * upper edge of the chat->view.
+ */
+ chat_schedule_logs (chat);
+}
+
+static gboolean
+chat_scrollable_connect (gpointer user_data)
+{
+ EmpathyChat *chat = EMPATHY_CHAT (user_data);
+ GtkAdjustment *adjustment;
+
+ adjustment = gtk_scrollable_get_vadjustment (
+ GTK_SCROLLABLE (chat->view));
+
+ g_signal_connect (adjustment, "changed",
+ G_CALLBACK (chat_view_adjustment_changed_cb), chat);
+ g_signal_connect (adjustment, "value-changed",
+ G_CALLBACK (chat_view_adjustment_value_changed_cb), chat);
+
+ return G_SOURCE_REMOVE;
}
static gint
@@ -3278,6 +3395,7 @@ chat_finalize (GObject *object)
g_object_unref (priv->account_manager);
g_object_unref (priv->log_manager);
+ g_object_unref (priv->log_walker);
if (priv->tp_chat) {
g_signal_handlers_disconnect_by_func (priv->tp_chat,
@@ -3335,6 +3453,7 @@ chat_constructed (GObject *object)
{
EmpathyChat *chat = EMPATHY_CHAT (object);
EmpathyChatPriv *priv = GET_PRIV (chat);
+ TplEntity *target;
if (priv->tp_chat != NULL) {
TpChannel *channel = TP_CHANNEL (priv->tp_chat);
@@ -3347,6 +3466,16 @@ chat_constructed (GObject *object)
supports_avatars);
}
+ /* Add messages from last conversation */
+ if (priv->handle_type == TP_HANDLE_TYPE_ROOM)
+ target = tpl_entity_new_from_room_id (priv->id);
+ else
+ target = tpl_entity_new (priv->id, TPL_ENTITY_CONTACT, NULL, NULL);
+
+ priv->log_walker = tpl_log_manager_walk_filtered_events (priv->log_manager, priv->account, target,
+ TPL_EVENT_MASK_TEXT, chat_log_filter, chat);
+ g_object_unref (target);
+
if (priv->handle_type != TP_HANDLE_TYPE_ROOM) {
/* First display logs from the logger and then display pending messages */
chat_add_logs (chat);
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 735397456..4dab7390c 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -808,9 +808,7 @@ client_types_update (EmpathyIndividualWidget *self)
types = tp_contact_get_client_types (priv->contact);
- if (types != NULL
- && g_strv_length ((gchar **) types) > 0
- && !tp_strdiff (types[0], "phone"))
+ if (empathy_client_types_contains_mobile_device ((GStrv) types))
{
gtk_widget_show (priv->hbox_client_types);
}
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index 755eb584e..5e4cb3583 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -303,7 +303,7 @@ display_irc_network_dialog (EmpathyIrcNetworkChooserDialog *self,
{
GtkWidget *dialog;
- dialog = empathy_irc_network_dialog_show (network, NULL);
+ dialog = empathy_irc_network_dialog_show (network, GTK_WIDGET (self));
g_signal_connect (dialog, "destroy",
G_CALLBACK (irc_network_dialog_destroy_cb), self);
@@ -427,13 +427,7 @@ dialog_response_cb (GtkDialog *dialog,
gint response,
EmpathyIrcNetworkChooserDialog *self)
{
- if (response == GTK_RESPONSE_OK)
- add_network (self);
- else if (response == GTK_RESPONSE_APPLY)
- edit_network (self);
- else if (response == GTK_RESPONSE_REJECT)
- remove_network (self);
- else if (response == RESPONSE_RESET)
+ if (response == RESPONSE_RESET)
reset_networks (self);
}
@@ -515,6 +509,27 @@ dialog_destroy_cb (GtkWidget *widget,
}
static void
+add_clicked_cb (GtkToolButton *button,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ add_network (self);
+}
+
+static void
+remove_clicked_cb (GtkToolButton *button,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ remove_network (self);
+}
+
+static void
+edit_clicked_cb (GtkToolButton *button,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ edit_network (self);
+}
+
+static void
empathy_irc_network_chooser_dialog_constructed (GObject *object)
{
EmpathyIrcNetworkChooserDialog *self = (EmpathyIrcNetworkChooserDialog *) object;
@@ -524,6 +539,9 @@ empathy_irc_network_chooser_dialog_constructed (GObject *object)
GtkWidget *vbox;
GtkTreeViewColumn *column;
GtkWidget *scroll;
+ GtkWidget *toolbar;
+ GtkToolItem *item;
+ GtkStyleContext *context;
g_assert (priv->settings != NULL);
@@ -560,6 +578,35 @@ empathy_irc_network_chooser_dialog_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (scroll), priv->treeview);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 6);
+ /* Treeview toolbar */
+ toolbar = gtk_toolbar_new ();
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
+ gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
+
+ item = gtk_tool_button_new (NULL, "");
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "list-add-symbolic");
+ g_signal_connect (item, "clicked", G_CALLBACK (add_clicked_cb), self);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+ item = gtk_tool_button_new (NULL, "");
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
+ "list-remove-symbolic");
+ g_signal_connect (item, "clicked", G_CALLBACK (remove_clicked_cb), self);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+ item = gtk_tool_button_new (NULL, "");
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
+ "preferences-system-symbolic");
+ g_signal_connect (item, "clicked", G_CALLBACK (edit_clicked_cb), self);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+ context = gtk_widget_get_style_context (scroll);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+
+ context = gtk_widget_get_style_context (toolbar);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
/* Live search */
priv->search = empathy_live_search_new (priv->treeview);
@@ -581,9 +628,6 @@ empathy_irc_network_chooser_dialog_constructed (GObject *object)
/* Add buttons */
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_ADD, GTK_RESPONSE_OK,
- GTK_STOCK_EDIT, GTK_RESPONSE_APPLY,
- GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT,
_("Reset _Networks List"), RESPONSE_RESET,
NULL);
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 8164f6c74..65f0a41bb 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -512,6 +512,8 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
NULL);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
0);
+
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_expand (column, TRUE);
/* port */
@@ -524,11 +526,17 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
NULL);
g_signal_connect (renderer, "edited",
G_CALLBACK (irc_network_dialog_port_edited_cb), dialog);
+
gtk_tree_view_insert_column_with_attributes (
GTK_TREE_VIEW (dialog->treeview_servers),
-1, _("Port"), renderer, "text", COL_PORT,
NULL);
+ column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
+ 1);
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_expand (column, TRUE);
+
/* SSL */
renderer = gtk_cell_renderer_toggle_new ();
g_object_set (renderer, "activatable", TRUE, NULL);
@@ -543,6 +551,11 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
GTK_TREE_VIEW (dialog->treeview_servers));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
+ 2);
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+ gtk_tree_view_column_set_expand (column, TRUE);
/* charset */
totem_subtitle_encoding_init (GTK_COMBO_BOX (dialog->combobox_charset));
@@ -582,5 +595,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
irc_network_dialog_network_update_buttons (dialog);
gtk_widget_show_all (dialog->dialog);
+ gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+
return dialog->dialog;
}
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 250354282..b37c1f59a 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -216,3 +216,19 @@ empathy_notify_manager_notification_is_enabled (EmpathyNotifyManager *self)
return TRUE;
}
+
+NotifyNotification *
+empathy_notify_manager_create_notification (const gchar *summary,
+ const char *body,
+ const gchar *icon)
+{
+ NotifyNotification *notification;
+
+ notification = notify_notification_new (summary, body, icon);
+
+ notify_notification_set_hint (notification,
+ EMPATHY_NOTIFY_MANAGER_CAP_DESKTOP_ENTRY,
+ g_variant_new_string ("empathy"));
+
+ return notification;
+}
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index 0b937e1d5..923ab4a54 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -25,6 +25,8 @@
#include <libempathy/empathy-contact.h>
+#include <libnotify/notification.h>
+
G_BEGIN_DECLS
#define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions"
@@ -37,6 +39,7 @@ G_BEGIN_DECLS
#define EMPATHY_NOTIFY_MANAGER_CAP_ICON_STATIC "icon-static"
#define EMPATHY_NOTIFY_MANAGER_CAP_IMAGE_SVG_XML "image/svg+xml"
#define EMPATHY_NOTIFY_MANAGER_CAP_SOUND "sound"
+#define EMPATHY_NOTIFY_MANAGER_CAP_DESKTOP_ENTRY "desktop-entry"
/* notify-osd specific */
#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND "x-canonical-append"
#define EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_PRIVATE_ICON_ONLY "x-canonical-private-icon-only"
@@ -104,6 +107,11 @@ GdkPixbuf * empathy_notify_manager_get_pixbuf_for_notification (
EmpathyContact *contact,
const char *icon_name);
+NotifyNotification * empathy_notify_manager_create_notification (
+ const gchar *summary,
+ const char *body,
+ const gchar *icon);
+
G_END_DECLS
#endif /* __EMPATHY_NOTIFY_MANAGER_H__ */
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index e72ae4494..7ab808746 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,5 +1,7 @@
#include "config.h"
+#include <glib/gi18n-lib.h>
+
#include "empathy-roster-contact.h"
#include <telepathy-glib/telepathy-glib.h>
@@ -171,25 +173,11 @@ alias_changed_cb (FolksIndividual *individual,
update_alias (self);
}
-static gboolean
-is_phone (FolksIndividual *individual)
-{
- const gchar * const *types;
-
- types = empathy_individual_get_client_types (individual);
- if (types == NULL)
- return FALSE;
-
- if (g_strv_length ((GStrv) types) <= 0)
- return FALSE;
-
- return !tp_strdiff (types[0], "phone");
-}
-
static void
update_presence_msg (EmpathyRosterContact *self)
{
const gchar *msg;
+ GStrv types;
msg = folks_presence_details_get_presence_message (
FOLKS_PRESENCE_DETAILS (self->priv->individual));
@@ -204,7 +192,25 @@ update_presence_msg (EmpathyRosterContact *self)
}
else
{
- gtk_label_set_text (GTK_LABEL (self->priv->presence_msg), msg);
+ FolksPresenceType type;
+
+ type = folks_presence_details_get_presence_type (
+ FOLKS_PRESENCE_DETAILS (self->priv->individual));
+ if (type == FOLKS_PRESENCE_TYPE_ERROR)
+ {
+ gchar *tmp;
+
+ /* Add a prefix explaining that something goes wrong when trying to
+ * fetch contact's presence. */
+ tmp = g_strdup_printf (_("Server cannot find contact: %s"), msg);
+ gtk_label_set_text (GTK_LABEL (self->priv->presence_msg), tmp);
+
+ g_free (tmp);
+ }
+ else
+ {
+ gtk_label_set_text (GTK_LABEL (self->priv->presence_msg), msg);
+ }
gtk_alignment_set (GTK_ALIGNMENT (self->priv->first_line_alig),
0, 0.75, 1, 1);
@@ -213,8 +219,10 @@ update_presence_msg (EmpathyRosterContact *self)
gtk_widget_show (self->priv->presence_msg);
}
+ types = (GStrv) empathy_individual_get_client_types (self->priv->individual);
+
gtk_widget_set_visible (self->priv->phone_icon,
- is_phone (self->priv->individual));
+ empathy_client_types_contains_mobile_device (types));
}
static void
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 37c8698e4..d304c5e19 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2008-2012 Collabora Ltd.
+ * Copyright (C) 2012 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -52,8 +53,11 @@ struct _EmpathyThemeAdiumPriv
{
EmpathyAdiumData *data;
EmpathySmileyManager *smiley_manager;
+ EmpathyContact *first_contact;
EmpathyContact *last_contact;
+ gint64 first_timestamp;
gint64 last_timestamp;
+ gboolean first_is_backlog;
gboolean last_is_backlog;
guint pages_loading;
/* Queue of QueuedItem*s containing an EmpathyMessage or string */
@@ -140,7 +144,8 @@ queue_item (GQueue *queue,
guint type,
EmpathyMessage *msg,
const char *str,
- gboolean should_highlight)
+ gboolean should_highlight,
+ gboolean prepend)
{
QueuedItem *item = g_slice_new0 (QueuedItem);
@@ -150,7 +155,10 @@ queue_item (GQueue *queue,
item->str = g_strdup (str);
item->should_highlight = should_highlight;
- g_queue_push_tail (queue, item);
+ if (prepend)
+ g_queue_push_head (queue, item);
+ else
+ g_queue_push_tail (queue, item);
return item;
}
@@ -164,30 +172,6 @@ free_queued_item (QueuedItem *item)
g_slice_free (QueuedItem, item);
}
-static void
-theme_adium_update_enable_webkit_developer_tools (EmpathyThemeAdium *self)
-{
- WebKitWebView *web_view = WEBKIT_WEB_VIEW (self);
- gboolean enable_webkit_developer_tools;
-
- enable_webkit_developer_tools = g_settings_get_boolean (
- self->priv->gsettings_chat,
- EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS);
-
- g_object_set (G_OBJECT (webkit_web_view_get_settings (web_view)),
- "enable-developer-extras", enable_webkit_developer_tools, NULL);
-}
-
-static void
-theme_adium_notify_enable_webkit_developer_tools_cb (GSettings *gsettings,
- const gchar *key,
- gpointer user_data)
-{
- EmpathyThemeAdium *self = user_data;
-
- theme_adium_update_enable_webkit_developer_tools (self);
-}
-
static gboolean
theme_adium_navigation_policy_decision_requested_cb (WebKitWebView *view,
WebKitWebFrame *web_frame,
@@ -542,9 +526,8 @@ nsdate_to_strftime (EmpathyAdiumData *data, const gchar *nsdate)
return g_string_free (string, FALSE);
}
-
static void
-theme_adium_append_html (EmpathyThemeAdium *self,
+theme_adium_add_html (EmpathyThemeAdium *self,
const gchar *func,
const gchar *html,
const gchar *message,
@@ -555,10 +538,13 @@ theme_adium_append_html (EmpathyThemeAdium *self,
const gchar *message_classes,
gint64 timestamp,
gboolean is_backlog,
- gboolean outgoing)
+ gboolean outgoing,
+ PangoDirection direction)
{
+ GBytes *bytes;
GString *string;
const gchar *cur = NULL;
+ const gchar *js;
gchar *script;
/* Make some search-and-replace in the html code */
@@ -614,9 +600,22 @@ theme_adium_append_html (EmpathyThemeAdium *self,
}
else if (theme_adium_match (&cur, "%messageDirection%"))
{
- /* FIXME: The text direction of the message
- * (either rtl or ltr)
- */
+ switch (direction)
+ {
+ case PANGO_DIRECTION_LTR:
+ case PANGO_DIRECTION_TTB_LTR:
+ case PANGO_DIRECTION_WEAK_LTR:
+ replace = "ltr";
+ break;
+ case PANGO_DIRECTION_RTL:
+ case PANGO_DIRECTION_TTB_RTL:
+ case PANGO_DIRECTION_WEAK_RTL:
+ replace = "rtl";
+ break;
+ case PANGO_DIRECTION_NEUTRAL:
+ default:
+ break;
+ }
}
else if (theme_adium_match (&cur, "%senderDisplayName%"))
{
@@ -735,6 +734,13 @@ theme_adium_append_html (EmpathyThemeAdium *self,
}
g_string_append (string, "\")");
+ bytes = g_resources_lookup_data ("/org/gnome/Empathy/Chat/empathy-chat.js",
+ G_RESOURCE_LOOKUP_FLAGS_NONE,
+ NULL);
+ js = (const gchar *) g_bytes_get_data (bytes, NULL);
+ g_string_prepend (string, js);
+ g_bytes_unref (bytes);
+
script = g_string_free (string, FALSE);
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self), script);
g_free (script);
@@ -742,11 +748,12 @@ theme_adium_append_html (EmpathyThemeAdium *self,
static void
theme_adium_append_event_escaped (EmpathyThemeAdium *self,
- const gchar *escaped)
+ const gchar *escaped,
+ PangoDirection direction)
{
- theme_adium_append_html (self, "appendMessage",
+ theme_adium_add_html (self, "appendMessage",
self->priv->data->status_html, escaped, NULL, NULL, NULL,
- NULL, "event", empathy_time_get_current (), FALSE, FALSE);
+ NULL, "event", empathy_time_get_current (), FALSE, FALSE, direction);
/* There is no last contact */
if (self->priv->last_contact)
@@ -830,10 +837,55 @@ theme_adium_remove_all_focus_marks (EmpathyThemeAdium *self)
theme_adium_remove_focus_marks (self, nodes);
}
-void
-empathy_theme_adium_append_message (EmpathyThemeAdium *self,
+enum
+{
+ ADD_CONSECUTIVE_MSG_SCROLL = 0,
+ ADD_CONSECUTIVE_MSG_NO_SCROLL = 1,
+ ADD_MSG_SCROLL = 2,
+ ADD_MSG_NO_SCROLL = 3
+};
+
+/*
+ * theme_adium_add_message:
+ * @self: The #EmpathyThemeAdium used by the view.
+ * @msg: An #EmpathyMessage that is to be added to the view.
+ * @prev_contact: (out): The #EmpathyContact that sent the previous message.
+ * @prev_timestamp: (out): Timestamp of the previous message.
+ * @prev_is_backlog: (out): Whether the previous message was fetched
+ * from the logs.
+ * @should_highlight: Whether the message should be highlighted. eg.,
+ * if it matches the user's username in multi-user chat.
+ * @js_funcs: An array of JavaScript function names
+ *
+ * Shows @msg in the chat view by adding to @self. Addition is defined
+ * by the JavaScript functions listed in @js_funcs. Common examples
+ * are appending new incoming messages or prepending old messages from
+ * the logs.
+ *
+ * @js_funcs should be an array with exactly 4 entries. The entries
+ * should be the names of JavaScript functions that take the raw HTML
+ * that is to be added to the view as an argument and take the following
+ * actions, in this order:
+ * - add a new consecutive message and scroll to it if needed,
+ * - add a new consecutive message and do not scroll,
+ * - add a new non-consecutive message and scroll to it if needed, and
+ * - add a new non-consecutive message and do not scroll
+ *
+ * A message is considered to be consecutive with the previous one if
+ * all the following conditions are met:
+ * - senders are the same contact,
+ * - last message was recieved recently,
+ * - last message and this message both are/aren't backlog, and
+ * - DisableCombineConsecutive is not set in theme's settings
+ */
+static void
+theme_adium_add_message (EmpathyThemeAdium *self,
EmpathyMessage *msg,
- gboolean should_highlight)
+ EmpathyContact **prev_contact,
+ gint64 *prev_timestamp,
+ gboolean *prev_is_backlog,
+ gboolean should_highlight,
+ const gchar *js_funcs[])
{
EmpathyContact *sender;
TpMessage *tp_msg;
@@ -851,13 +903,8 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
gboolean is_backlog;
gboolean consecutive;
gboolean action;
+ PangoDirection direction;
- if (self->priv->pages_loading != 0)
- {
- queue_item (&self->priv->message_queue, QUEUED_MESSAGE, msg, NULL,
- should_highlight);
- return;
- }
/* Get information */
sender = empathy_message_get_sender (msg);
@@ -920,15 +967,10 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
}
}
- /* We want to join this message with the last one if
- * - senders are the same contact,
- * - last message was recieved recently,
- * - last message and this message both are/aren't backlog, and
- * - DisableCombineConsecutive is not set in theme's settings */
is_backlog = empathy_message_is_backlog (msg);
- consecutive = empathy_contact_equal (self->priv->last_contact, sender) &&
- (timestamp - self->priv->last_timestamp < MESSAGE_JOIN_PERIOD) &&
- (is_backlog == self->priv->last_is_backlog) &&
+ consecutive = empathy_contact_equal (*prev_contact, sender) &&
+ (ABS (timestamp - *prev_timestamp) < MESSAGE_JOIN_PERIOD) &&
+ (is_backlog == *prev_is_backlog) &&
!tp_asv_get_boolean (self->priv->data->info,
"DisableCombineConsecutive", NULL);
@@ -969,7 +1011,7 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
* status - the message is a status change
* event - the message is a notification of something happening
* (for example, encryption being turned on)
- * %status% - See %status% in theme_adium_append_html ()
+ * %status% - See %status% in theme_adium_add_html ()
*/
/* This is slightly a hack, but it's the only way to add
@@ -991,10 +1033,11 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
/* Define javascript function to use */
if (consecutive)
- func = self->priv->allow_scrolling ? "appendNextMessage" :
- "appendNextMessageNoScroll";
+ func = self->priv->allow_scrolling ? js_funcs[ADD_CONSECUTIVE_MSG_SCROLL] :
+ js_funcs[ADD_CONSECUTIVE_MSG_NO_SCROLL];
else
- func = self->priv->allow_scrolling ? "appendMessage" : "appendMessageNoScroll";
+ func = self->priv->allow_scrolling ? js_funcs[ADD_MSG_SCROLL] :
+ js_funcs[ADD_MSG_NO_SCROLL];
if (empathy_contact_is_user (sender))
{
@@ -1024,18 +1067,20 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
self->priv->data->in_content_html;
}
- theme_adium_append_html (self, func, html, body_escaped,
+ direction = pango_find_base_dir (empathy_message_get_body (msg), -1);
+
+ theme_adium_add_html (self, func, html, body_escaped,
avatar_filename, name_escaped, contact_id,
service_name, message_classes->str,
- timestamp, is_backlog, empathy_contact_is_user (sender));
+ timestamp, is_backlog, empathy_contact_is_user (sender), direction);
/* Keep the sender of the last displayed message */
- if (self->priv->last_contact)
- g_object_unref (self->priv->last_contact);
+ if (*prev_contact)
+ g_object_unref (*prev_contact);
- self->priv->last_contact = g_object_ref (sender);
- self->priv->last_timestamp = timestamp;
- self->priv->last_is_backlog = is_backlog;
+ *prev_contact = g_object_ref (sender);
+ *prev_timestamp = timestamp;
+ *prev_is_backlog = is_backlog;
g_free (body_escaped);
g_free (name_escaped);
@@ -1043,19 +1088,43 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
}
void
+empathy_theme_adium_append_message (EmpathyThemeAdium *self,
+ EmpathyMessage *msg,
+ gboolean should_highlight)
+{
+ const gchar *js_funcs[] = { "appendNextMessage",
+ "appendNextMessageNoScroll",
+ "appendMessage",
+ "appendMessageNoScroll" };
+
+ if (self->priv->pages_loading != 0)
+ {
+ queue_item (&self->priv->message_queue, QUEUED_MESSAGE, msg, NULL,
+ should_highlight, FALSE);
+ return;
+ }
+
+ theme_adium_add_message (self, msg, &self->priv->last_contact,
+ &self->priv->last_timestamp, &self->priv->last_is_backlog,
+ should_highlight, js_funcs);
+}
+
+void
empathy_theme_adium_append_event (EmpathyThemeAdium *self,
const gchar *str)
{
gchar *str_escaped;
+ PangoDirection direction;
if (self->priv->pages_loading != 0)
{
- queue_item (&self->priv->message_queue, QUEUED_EVENT, NULL, str, FALSE);
+ queue_item (&self->priv->message_queue, QUEUED_EVENT, NULL, str, FALSE, FALSE);
return;
}
+ direction = pango_find_base_dir (str, -1);
str_escaped = g_markup_escape_text (str, -1);
- theme_adium_append_event_escaped (self, str_escaped);
+ theme_adium_append_event_escaped (self, str_escaped, direction);
g_free (str_escaped);
}
@@ -1064,7 +1133,32 @@ empathy_theme_adium_append_event_markup (EmpathyThemeAdium *self,
const gchar *markup_text,
const gchar *fallback_text)
{
- theme_adium_append_event_escaped (self, markup_text);
+ PangoDirection direction;
+
+ direction = pango_find_base_dir (fallback_text, -1);
+ theme_adium_append_event_escaped (self, markup_text, direction);
+}
+
+void
+empathy_theme_adium_prepend_message (EmpathyThemeAdium *self,
+ EmpathyMessage *msg,
+ gboolean should_highlight)
+{
+ const gchar *js_funcs[] = { "prependPrev",
+ "prependPrev",
+ "prepend",
+ "prepend" };
+
+ if (self->priv->pages_loading != 0)
+ {
+ queue_item (&self->priv->message_queue, QUEUED_MESSAGE, msg, NULL,
+ should_highlight, TRUE);
+ return;
+ }
+
+ theme_adium_add_message (self, msg, &self->priv->first_contact,
+ &self->priv->first_timestamp, &self->priv->first_is_backlog,
+ should_highlight, js_funcs);
}
void
@@ -1080,7 +1174,7 @@ empathy_theme_adium_edit_message (EmpathyThemeAdium *self,
if (self->priv->pages_loading != 0)
{
- queue_item (&self->priv->message_queue, QUEUED_EDIT, message, NULL, FALSE);
+ queue_item (&self->priv->message_queue, QUEUED_EDIT, message, NULL, FALSE, FALSE);
return;
}
@@ -1353,31 +1447,28 @@ empathy_theme_adium_message_acknowledged (EmpathyThemeAdium *self,
}
static gboolean
-theme_adium_button_press_event (GtkWidget *widget,
- GdkEventButton *event)
+theme_adium_context_menu_cb (EmpathyThemeAdium *self,
+ GtkWidget *default_menu,
+ WebKitHitTestResult *hit_test_result,
+ gboolean triggered_with_keyboard,
+ gpointer user_data)
{
- if (event->button == 3)
- {
- gboolean developer_tools_enabled;
+ GtkWidget *menu;
+ EmpathyWebKitMenuFlags flags = EMPATHY_WEBKIT_MENU_CLEAR;
- g_object_get (
- G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (widget))),
- "enable-developer-extras", &developer_tools_enabled, NULL);
+ if (g_settings_get_boolean (self->priv->gsettings_chat,
+ EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS))
+ flags |= EMPATHY_WEBKIT_MENU_INSPECT;
- /* We currently have no way to add an inspector menu
- * item ourselves, so we disable our customized menu
- * if the developer extras are enabled. */
- if (!developer_tools_enabled)
- {
- empathy_webkit_context_menu_for_event (
- WEBKIT_WEB_VIEW (widget), event,
- EMPATHY_WEBKIT_MENU_CLEAR);
- return TRUE;
- }
- }
+ menu = empathy_webkit_create_context_menu (
+ WEBKIT_WEB_VIEW (self), hit_test_result, flags);
+
+ gtk_widget_show_all (menu);
- return GTK_WIDGET_CLASS (
- empathy_theme_adium_parent_class)->button_press_event (widget, event);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3,
+ gtk_get_current_event_time ());
+
+ return TRUE;
}
void
@@ -1454,6 +1545,8 @@ theme_adium_dispose (GObject *object)
self->priv->smiley_manager = NULL;
}
+ g_clear_object (&self->priv->first_contact);
+
if (self->priv->last_contact)
{
g_object_unref (self->priv->last_contact);
@@ -1631,7 +1724,6 @@ static void
empathy_theme_adium_class_init (EmpathyThemeAdiumClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = theme_adium_finalize;
object_class->dispose = theme_adium_dispose;
@@ -1639,8 +1731,6 @@ empathy_theme_adium_class_init (EmpathyThemeAdiumClass *klass)
object_class->get_property = theme_adium_get_property;
object_class->set_property = theme_adium_set_property;
- widget_class->button_press_event = theme_adium_button_press_event;
-
g_object_class_install_property (object_class, PROP_ADIUM_DATA,
g_param_spec_boxed ("adium-data",
"The theme data",
@@ -1680,17 +1770,12 @@ empathy_theme_adium_init (EmpathyThemeAdium *self)
G_CALLBACK (theme_adium_load_finished_cb), NULL);
g_signal_connect (self, "navigation-policy-decision-requested",
G_CALLBACK (theme_adium_navigation_policy_decision_requested_cb), NULL);
+ g_signal_connect (self, "context-menu",
+ G_CALLBACK (theme_adium_context_menu_cb), NULL);
self->priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
self->priv->gsettings_desktop = g_settings_new (
EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA);
-
- g_signal_connect (self->priv->gsettings_chat,
- "changed::" EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS,
- G_CALLBACK (theme_adium_notify_enable_webkit_developer_tools_cb),
- self);
-
- theme_adium_update_enable_webkit_developer_tools (self);
}
EmpathyThemeAdium *
@@ -1739,13 +1824,8 @@ void
empathy_theme_adium_show_inspector (EmpathyThemeAdium *self)
{
WebKitWebView *web_view = WEBKIT_WEB_VIEW (self);
- WebKitWebInspector *inspector;
-
- g_object_set (G_OBJECT (webkit_web_view_get_settings (web_view)),
- "enable-developer-extras", TRUE, NULL);
- inspector = webkit_web_view_get_inspector (web_view);
- webkit_web_inspector_show (inspector);
+ empathy_webkit_show_inspector (web_view);
}
gboolean
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index f1ad48ec8..880667615 100644
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -87,6 +87,10 @@ void empathy_theme_adium_append_event_markup (EmpathyThemeAdium *self,
const gchar *markup_text,
const gchar *fallback_text);
+void empathy_theme_adium_prepend_message (EmpathyThemeAdium *self,
+ EmpathyMessage *msg,
+ gboolean should_highlight);
+
void empathy_theme_adium_edit_message (EmpathyThemeAdium *self,
EmpathyMessage *message);
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index c8c585a9b..d221e5f98 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -161,6 +161,7 @@ empathy_webkit_bind_font_setting (WebKitWebView *webview,
webkit_get_font_family,
NULL,
NULL, NULL);
+
g_settings_bind_with_mapping (gsettings, key,
settings, "default-font-size",
G_SETTINGS_BIND_GET,
@@ -171,11 +172,11 @@ empathy_webkit_bind_font_setting (WebKitWebView *webview,
static void
empathy_webkit_copy_address_cb (GtkMenuItem *menuitem,
- gpointer user_data)
+ gpointer user_data)
{
- WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
- gchar *uri;
- GtkClipboard *clipboard;
+ WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
+ gchar *uri;
+ GtkClipboard *clipboard;
g_object_get (G_OBJECT (hit_test_result),
"link-uri", &uri,
@@ -194,8 +195,8 @@ static void
empathy_webkit_open_address_cb (GtkMenuItem *menuitem,
gpointer user_data)
{
- WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
- gchar *uri;
+ WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
+ gchar *uri;
g_object_get (G_OBJECT (hit_test_result),
"link-uri", &uri,
@@ -207,6 +208,13 @@ empathy_webkit_open_address_cb (GtkMenuItem *menuitem,
}
static void
+empathy_webkit_inspect_cb (GtkMenuItem *menuitem,
+ WebKitWebView *view)
+{
+ empathy_webkit_show_inspector (view);
+}
+
+static void
empathy_webkit_context_menu_selection_done_cb (GtkMenuShell *menu,
gpointer user_data)
{
@@ -215,17 +223,15 @@ empathy_webkit_context_menu_selection_done_cb (GtkMenuShell *menu,
g_object_unref (hit_test_result);
}
-void
-empathy_webkit_context_menu_for_event (WebKitWebView *view,
- GdkEventButton *event,
+GtkWidget *
+empathy_webkit_create_context_menu (WebKitWebView *view,
+ WebKitHitTestResult *hit_test_result,
EmpathyWebKitMenuFlags flags)
{
- WebKitHitTestResult *hit_test_result;
- WebKitHitTestResultContext context;
- GtkWidget *menu;
- GtkWidget *item;
+ WebKitHitTestResultContext context;
+ GtkWidget *menu;
+ GtkWidget *item;
- hit_test_result = webkit_web_view_get_hit_test_result (view, event);
g_object_get (G_OBJECT (hit_test_result),
"context", &context,
NULL);
@@ -289,13 +295,53 @@ empathy_webkit_context_menu_for_event (WebKitWebView *view,
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
}
+ if ((flags & EMPATHY_WEBKIT_MENU_INSPECT) != 0)
+ {
+ /* Separator */
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+ /* Inspector */
+ item = gtk_menu_item_new_with_mnemonic (_("Inspect HTML"));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (empathy_webkit_inspect_cb), view);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ }
+
g_signal_connect (GTK_MENU_SHELL (menu), "selection-done",
G_CALLBACK (empathy_webkit_context_menu_selection_done_cb),
- hit_test_result);
+ g_object_ref (hit_test_result));
+
+ return menu;
+}
+
+void
+empathy_webkit_context_menu_for_event (WebKitWebView *view,
+ GdkEventButton *event,
+ EmpathyWebKitMenuFlags flags)
+{
+ GtkWidget *menu;
+ WebKitHitTestResult *hit_test_result;
+
+ hit_test_result = webkit_web_view_get_hit_test_result (view, event);
+
+ menu = empathy_webkit_create_context_menu (view, hit_test_result, flags);
- /* Display the menu */
gtk_widget_show_all (menu);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
+
+ g_object_unref (hit_test_result);
}
+void
+empathy_webkit_show_inspector (WebKitWebView *view)
+{
+ WebKitWebInspector *inspector;
+
+ g_object_set (G_OBJECT (webkit_web_view_get_settings (view)),
+ "enable-developer-extras", TRUE, NULL);
+
+ inspector = webkit_web_view_get_inspector (view);
+ webkit_web_inspector_show (inspector);
+}
diff --git a/libempathy-gtk/empathy-webkit-utils.h b/libempathy-gtk/empathy-webkit-utils.h
index 322f94c32..034e3bf55 100644
--- a/libempathy-gtk/empathy-webkit-utils.h
+++ b/libempathy-gtk/empathy-webkit-utils.h
@@ -29,13 +29,24 @@ G_BEGIN_DECLS
typedef enum {
EMPATHY_WEBKIT_MENU_CLEAR = 1 << 0,
+ EMPATHY_WEBKIT_MENU_INSPECT = 1 << 1,
} EmpathyWebKitMenuFlags;
-EmpathyStringParser *empathy_webkit_get_string_parser (gboolean smileys);
+EmpathyStringParser * empathy_webkit_get_string_parser (gboolean smileys);
+
void empathy_webkit_bind_font_setting (WebKitWebView *webview,
- GSettings *gsettings, const char *key);
+ GSettings *gsettings,
+ const char *key);
+
+GtkWidget * empathy_webkit_create_context_menu (WebKitWebView *view,
+ WebKitHitTestResult *hit_test_result,
+ EmpathyWebKitMenuFlags flags);
+
void empathy_webkit_context_menu_for_event (WebKitWebView *view,
- GdkEventButton *event, EmpathyWebKitMenuFlags flags);
+ GdkEventButton *event,
+ EmpathyWebKitMenuFlags flags);
+
+void empathy_webkit_show_inspector (WebKitWebView *view);
G_END_DECLS
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 4fe428957..83f59f4c6 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1623,6 +1623,8 @@ geocode_cb (GObject *source,
EmpathyContact *contact = user_data;
EmpathyContactPriv *priv = GET_PRIV (contact);
GError *error = NULL;
+ GList *res;
+ GeocodeLocation *loc;
GHashTable *new_location;
GHashTable *resolved = NULL;
gdouble latitude, longitude;
@@ -1630,26 +1632,27 @@ geocode_cb (GObject *source,
if (priv->location == NULL)
goto out;
- resolved = geocode_object_resolve_finish (GEOCODE_OBJECT (source), result,
+ res = geocode_forward_search_finish (GEOCODE_FORWARD (source), result,
&error);
- if (resolved == NULL)
+ if (res == NULL)
{
DEBUG ("Failed to resolve geocode: %s", error->message);
g_error_free (error);
goto out;
}
- if (!geocode_object_get_coords (resolved, &longitude, &latitude))
- goto out;
+ loc = res->data;
new_location = tp_asv_new (
- EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, latitude,
- EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, longitude,
+ EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, loc->latitude,
+ EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, loc->longitude,
NULL);
- DEBUG ("\t - Latitude: %f", latitude);
- DEBUG ("\t - Longitude: %f", longitude);
+ DEBUG ("\t - Latitude: %f", loc->latitude);
+ DEBUG ("\t - Longitude: %f", loc->longitude);
+
+ g_list_free_full (res, (GDestroyNotify) geocode_location_free);
/* Copy remaning fields. LAT and LON were not defined so we won't overwrite
* the values we just set. */
@@ -1669,7 +1672,7 @@ out:
static void
update_geocode (EmpathyContact *contact)
{
- GeocodeObject *geocode;
+ GeocodeForward *geocode;
GHashTable *location;
location = empathy_contact_get_location (contact);
@@ -1682,11 +1685,11 @@ update_geocode (EmpathyContact *contact)
g_hash_table_lookup (location, EMPATHY_LOCATION_LON) != NULL)
return;
- geocode = geocode_object_new_for_params (location);
+ geocode = geocode_forward_new_for_params (location);
if (geocode == NULL)
return;
- geocode_object_resolve_async (geocode, NULL, geocode_cb,
+ geocode_forward_search_async (geocode, NULL, geocode_cb,
g_object_ref (contact));
g_object_unref (geocode);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index e33bf3af4..191544fbf 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -502,6 +502,13 @@ empathy_protocol_name_to_display_name (const gchar *proto_name)
{ "yahoojp", N_("Yahoo! Japan"), TRUE },
{ "groupwise", "GroupWise", FALSE },
{ "sip", "SIP", FALSE },
+ { "gadugadu", "Gadu-Gadu", FALSE },
+ { "mxit", "Mxit", FALSE },
+ { "myspace", "Myspace", FALSE },
+ { "sametime", "Sametime", FALSE },
+ { "skype-dbus", "Skype (D-BUS)", FALSE },
+ { "skype-x11", "Skype (X11)", FALSE },
+ { "zephyr", "Zephyr", FALSE },
{ NULL, NULL }
};
@@ -1115,6 +1122,20 @@ while_finish:
*can_video_call = can_video;
}
+gboolean
+empathy_client_types_contains_mobile_device (const GStrv types) {
+ int i;
+
+ if (types == NULL)
+ return FALSE;
+
+ for (i = 0; types[i] != NULL; i++)
+ if (!tp_strdiff (types[i], "phone") || !tp_strdiff (types[i], "handheld"))
+ return TRUE;
+
+ return FALSE;
+}
+
static FolksIndividual *
create_individual_from_persona (FolksPersona *persona)
{
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index a310d2b02..3950c5be3 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -115,6 +115,9 @@ void empathy_individual_can_audio_video_call (FolksIndividual *individual,
gboolean *can_video_call,
EmpathyContact **out_contact);
+gboolean empathy_client_types_contains_mobile_device (
+ const GStrv types);
+
FolksIndividual * empathy_create_individual_from_tp_contact (
TpContact *contact);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1be70f6f0..629654048 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -71,6 +71,7 @@ libempathy-gtk/empathy-user-info.c
libempathy-gtk/empathy-webkit-utils.c
libempathy-gtk/totem-subtitle-encoding.c
libempathy-gtk/empathy-roster-model.h
+libempathy-gtk/empathy-roster-contact.c
nautilus-sendto-plugin/empathy-nautilus-sendto.c
diff --git a/po/as.po b/po/as.po
index 650e77793..4be72ae1b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,18 +6,18 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-27 14:50+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-12-26 10:30+0000\n"
+"PO-Revision-Date: 2012-12-27 20:55+0530\n"
"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
+"Language: as_IN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -35,6 +35,10 @@ msgstr "Empathy ইনà§à¦Ÿà¦¾à§°à¦¨à§‡à¦Ÿ বাৰà§à¦¤à¦¾à¦•à§°à¦£"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Google Talk, Facebook, MSN আৰৠবহà§à¦¤à§‹ অনà§à¦¯ চেট সেৱাসমূহত চেট কৰক"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "সংযোগ বà§à¦¯à§±à¦¸à§à¦¥à¦¾à¦ªà¦•à¦¸à¦®à§‚হ বà§à¦¯à§±à¦¹à¦¾à§° কৰক"
@@ -44,7 +48,8 @@ msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-"সà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ বিচà§à¦›à¦¿à¦¨à§à¦¨/পà§à¦¨à§°à¦¸à¦‚যোগ কৰিবলে সংযোগ বà§à¦¯à§±à¦¸à§à¦¥à¦¾à¦ªà¦•à¦¸à¦®à§‚হক বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লাগে নে।"
+"সà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ বিচà§à¦›à¦¿à¦¨à§à¦¨/পà§à¦¨à§°à¦¸à¦‚যোগ কৰিবলে সংযোগ বà§à¦¯à§±à¦¸à§à¦¥à¦¾à¦ªà¦•à¦¸à¦®à§‚হক বà§à¦¯à§±à¦¹à¦¾à§° কৰিব "
+"লাগে নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:3
msgid "Empathy should auto-connect on startup"
@@ -59,7 +64,8 @@ msgid "Empathy should auto-away when idle"
msgstr "Empathy অলস অৱসà§à¦¥à¦¾à¦¤ সà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡-আতৰত হব লাগিব"
#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€ অলস থাকিলে Empathy ঠসà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ আতৰ অৱসà§à¦¥à¦¾à¦¤ যাব লাগে নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:7
@@ -73,15 +79,18 @@ msgstr "সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à§° কৰা সামগà§à§°à§€ সংৰ
#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
#: ../data/org.gnome.Empathy.gschema.xml.h:10
msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "সà§à¦¥à¦¿à§° পৰিষà§à¦•à¦¾à§° কাৰà§à¦¯à§à¦¯à¦¸à¦®à§‚হ চলোৱা হবনে নীৰিকà§à¦·à¦£ কৰিবলে বà§à¦¯à§±à¦¹à§ƒà¦¤ জাদৠসংখà§à¦¯à¦¾"
+msgstr ""
+"সà§à¦¥à¦¿à§° পৰিষà§à¦•à¦¾à§° কাৰà§à¦¯à§à¦¯à¦¸à¦®à§‚হ চলোৱা হবনে নীৰিকà§à¦·à¦£ কৰিবলে বà§à¦¯à§±à¦¹à§ƒà¦¤ জাদৠসংখà§à¦¯à¦¾"
#: ../data/org.gnome.Empathy.gschema.xml.h:11
msgid ""
"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
"should be executed or not. Users should not change this key manually."
msgstr ""
-"empathy-sanity-cleaning.c à¦à¦‡ নমà§à¦¬à§°à¦• পৰিষà§à¦•à¦¾à§° কৰা কাৰà§à¦¯à§à¦¯à¦¸à¦®à§‚হ à¦à¦•à§à¦¸à¦¿à¦•à¦¿à¦‰à¦Ÿ কৰা হবনে "
-"নীৰিকà§à¦·à¦£ কৰিবলে বà§à¦¯à§±à¦¹à¦¾à§° কৰে। বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à¦¸à¦®à§‚হে à¦à¦‡ চাবিক হসà§à¦¤à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ সলনি কৰিব "
+"empathy-sanity-cleaning.c à¦à¦‡ নমà§à¦¬à§°à¦• পৰিষà§à¦•à¦¾à§° কৰা কাৰà§à¦¯à§à¦¯à¦¸à¦®à§‚হ à¦à¦•à§à¦¸à¦¿à¦•à¦¿à¦‰à¦Ÿ কৰা "
+"হবনে "
+"নীৰিকà§à¦·à¦£ কৰিবলে বà§à¦¯à§±à¦¹à¦¾à§° কৰে। বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à¦¸à¦®à§‚হে à¦à¦‡ চাবিক হসà§à¦¤à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ সলনি "
+"কৰিব "
"নালাগে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:12
@@ -111,7 +120,8 @@ msgstr "পà§à§°à¦§à¦¾à¦¨ উইনà§à¦¡à§‹ লà§à¦•à§à§±à¦¾ হ'ব।"
#: ../data/org.gnome.Empathy.gschema.xml.h:18
msgid "Default directory to select an avatar image from"
-msgstr "বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à§° অৱতাৰ আখৰকৰà§à¦¤à¦¾ ছবি নিৰà§à¦§à¦¾à§°à¦£à§° বাবে বà§à¦¯à§±à¦¹à§ƒà¦¤ অবিকলà§à¦ªà¦¿à¦¤ পঞà§à¦œà¦¿à¦•à¦¾"
+msgstr ""
+"বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à§° অৱতাৰ আখৰকৰà§à¦¤à¦¾ ছবি নিৰà§à¦§à¦¾à§°à¦£à§° বাবে বà§à¦¯à§±à¦¹à§ƒà¦¤ অবিকলà§à¦ªà¦¿à¦¤ পঞà§à¦œà¦¿à¦•à¦¾"
#: ../data/org.gnome.Empathy.gschema.xml.h:19
msgid "The last directory that an avatar image was chosen from."
@@ -134,7 +144,8 @@ msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr ""
-"অৱসà§à¦¥à¦¾ সà§à¦¥à¦¾à¦¨à¦¤ আগ'ত ঘটনাসমূহ পà§à§°à¦¦à§°à§à¦¶à¦¨ কৰক। যদি ভà§à¦², সিহতক বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à¦²à§‡ তৎকà§à¦·à¦¨à¦¾à¦¤ "
+"অৱসà§à¦¥à¦¾ সà§à¦¥à¦¾à¦¨à¦¤ আগ'ত ঘটনাসমূহ পà§à§°à¦¦à§°à§à¦¶à¦¨ কৰক। যদি ভà§à¦², সিহতক বà§à¦¯à§±à¦¹à¦¾à§°à¦•à¦¾à§°à§€à¦²à§‡ "
+"তৎকà§à¦·à¦¨à¦¾à¦¤ "
"পà§à§°à§‡à§°à¦£ কৰক।"
#: ../data/org.gnome.Empathy.gschema.xml.h:24
@@ -206,8 +217,10 @@ msgid "Play a sound when a contact logs out"
msgstr "পৰিচিত বà§à¦¯à¦•à§à¦¤à¦¿ পà§à§°à¦¸à§à¦¥à¦¾à¦¨ কৰিলে শবà§à¦¦ বজাওক"
#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "নেটৱাৰà§à¦•à§° পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে à¦à¦Ÿà¦¾ শবà§à¦¦ বজোৱা হব নে।"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"নেটৱাৰà§à¦•à§° পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে à¦à¦Ÿà¦¾ শবà§à¦¦ বজোৱা হব নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:42
msgid "Play a sound when we log in"
@@ -250,7 +263,8 @@ msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr ""
-"à¦à¦Ÿà¦¾ নতà§à¦¨ বাৰà§à¦¤à¦¾ গà§à§°à¦¹à¦£ কৰোতে চেট ইতিমধà§à¦¯à§‡ খোলা থাকিলেও, কিনà§à¦¤à§ মনোনিবেষিত নহয় à¦à¦Ÿà¦¾ "
+"à¦à¦Ÿà¦¾ নতà§à¦¨ বাৰà§à¦¤à¦¾ গà§à§°à¦¹à¦£ কৰোতে চেট ইতিমধà§à¦¯à§‡ খোলা থাকিলেও, কিনà§à¦¤à§ মনোনিবেষিত নহয় "
+"à¦à¦Ÿà¦¾ "
"পপআপ অধিসূচনা দেখà§à§±à¦¾ হব নে। "
#: ../data/org.gnome.Empathy.gschema.xml.h:52
@@ -298,7 +312,8 @@ msgid "Chat window theme variant"
msgstr "চেট উইনà§à¦¡à§‹ থীম অপৰ"
#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid "The theme variant that is used to display the conversation in chat windows."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
msgstr "চেট উইনà§à¦¡à§‹à¦¤ কথোপকথনৰ পà§à§°à¦¦à§°à§à¦¶à¦¨à§° বাবে বà§à¦¯à§±à¦¹à§ƒà¦¤ থীম অপৰ"
#: ../data/org.gnome.Empathy.gschema.xml.h:64
@@ -310,7 +325,8 @@ msgid ""
"Path of the Adium theme to use if the theme used for chat is Adium. "
"Deprecated."
msgstr ""
-"যদি চেটৰ বাবে বà§à¦¯à§±à¦¹à¦¾à§° কৰা থীম Adium হয় তেনà§à¦¤à§‡ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লগিয়া Adium থীমৰ পথ। "
+"যদি চেটৰ বাবে বà§à¦¯à§±à¦¹à¦¾à§° কৰা থীম Adium হয় তেনà§à¦¤à§‡ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লগিয়া Adium থীমৰ "
+"পথ। "
"সà§à¦–লিত।"
#: ../data/org.gnome.Empathy.gschema.xml.h:66
@@ -318,7 +334,8 @@ msgid "Enable WebKit Developer Tools"
msgstr "WebKit উনà§à¦¨à§Ÿà¦¨à¦• সà¦à¦œà§à¦²à¦¿à§° বà§à¦¯à§±à¦¹à¦¾à§° সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰক"
#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit উনà§à¦¨à§Ÿà¦¨à¦• সà¦à¦œà§à¦²à¦¿ যেনে Web Inspector সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰক নে নাই।"
#: ../data/org.gnome.Empathy.gschema.xml.h:68
@@ -330,7 +347,8 @@ msgid ""
"Whether to send the 'composing' or 'paused' chat states. Does not currently "
"affect the 'gone' state."
msgstr ""
-"'composing' অথবা 'paused' চেট অৱসà§à¦¥à¦¾à¦¸à¦®à§‚হ পঠোৱা হব নে। 'gone' অৱসà§à¦¥à¦¾à§° উপৰত পà§à§°à¦­à¦¾à§± "
+"'composing' অথবা 'paused' চেট অৱসà§à¦¥à¦¾à¦¸à¦®à§‚হ পঠোৱা হব নে। 'gone' অৱসà§à¦¥à¦¾à§° উপৰত "
+"পà§à§°à¦­à¦¾à§± "
"নেপেলায়।"
#: ../data/org.gnome.Empathy.gschema.xml.h:70
@@ -346,17 +364,21 @@ msgid "Spell checking languages"
msgstr "ভাষাৰ বাবে বানান পৰীকà§à¦·à¦£"
#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"বà§à¦¯à§±à¦¹à¦¾à§° কৰিবলে বানান নিৰীকà§à¦·à¦• ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
+"বà§à¦¯à§±à¦¹à¦¾à§° কৰিবলে বানান নিৰীকà§à¦·à¦• ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, "
+"nl\")।"
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "বানান পৰীকà§à¦·à¦£ সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰক"
#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "আপà§à¦¨à¦¿ নীৰিকà§à¦·à¦£ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শবà§à¦¦à¦¸à¦®à§‚হ নীৰিকà§à¦·à¦£ কৰা হব নে।"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"আপà§à¦¨à¦¿ নীৰিকà§à¦·à¦£ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শবà§à¦¦à¦¸à¦®à§‚হ নীৰিকà§à¦·à¦£ কৰা হব নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:76
msgid "Nick completed character"
@@ -375,7 +397,8 @@ msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "চেটৰ উইনà§à¦¡à§‹à§° আইকন ৰূপে Empathy দà§à¦¬à¦¾à§°à¦¾ পৰিচয়ৰ অৱতাৰ পà§à§°à§Ÿà§‹à¦— কৰক"
#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Empathy ঠপৰিচয়ৰ অৱতাৰক চেট উইনà§à¦¡à§‹à§° আইকন হিচাপে বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লাগে নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:80
@@ -392,7 +415,8 @@ msgstr "কেমেৰা ডিভাইচ"
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "ভিডিঅ' কলসমূহত বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লগিয়া অবিকলà§à¦ªà¦¿à¦¤ কেমেৰা ডিভাইচ, যেনে /dev/video0।"
+msgstr ""
+"ভিডিঅ' কলসমূহত বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লগিয়া অবিকলà§à¦ªà¦¿à¦¤ কেমেৰা ডিভাইচ, যেনে /dev/video0।"
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
@@ -418,7 +442,9 @@ msgstr "পà§à§°à¦§à¦¾à¦¨ উইনà§à¦¡à§‹ বনà§à¦§ কৰাৰ বাà¦
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
-msgstr "মূখà§à¦¯ উইনà§à¦¡à§‹à¦• শীৰà§à¦·à¦• বাৰৰ 'x' বà§à¦Ÿà¦¾à¦®à§° সৈতে বনà§à¦§ কৰাৰ বাৰà§à¦¤à¦¾ ডাইলগক দেখà§à§±à¦¾ হব নে।"
+msgstr ""
+"মূখà§à¦¯ উইনà§à¦¡à§‹à¦• শীৰà§à¦·à¦• বাৰৰ 'x' বà§à¦Ÿà¦¾à¦®à§° সৈতে বনà§à¦§ কৰাৰ বাৰà§à¦¤à¦¾ ডাইলগক দেখà§à§±à¦¾ হব "
+"নে।"
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
@@ -438,7 +464,8 @@ msgstr "Empathy ঠঅৱসà§à¦¥à¦¾à¦¨ ঠাওৰ কৰিবলে নে
#: ../data/org.gnome.Empathy.gschema.xml.h:94
msgid "Empathy can use the cellular network to guess the location"
-msgstr "চেলà§à¦²à¦¾à§° নেটৱাৰà§à¦• সহযোগে Empathy দà§à¦¬à¦¾à§°à¦¾ ভৌগলিক অৱসà§à¦¥à¦¾à¦¨ গণনা কৰা সমà§à¦­à§± হ'ব"
+msgstr ""
+"চেলà§à¦²à¦¾à§° নেটৱাৰà§à¦• সহযোগে Empathy দà§à¦¬à¦¾à§°à¦¾ ভৌগলিক অৱসà§à¦¥à¦¾à¦¨ গণনা কৰা সমà§à¦­à§± হ'ব"
#: ../data/org.gnome.Empathy.gschema.xml.h:95
msgid "Whether Empathy can use the cellular network to guess the location."
@@ -457,7 +484,8 @@ msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy দà§à¦¬à¦¾à§°à¦¾ ভৌগলিক অৱসà§à¦¥à¦¾à¦¨à§° নিৰà§à¦­à§à¦²à¦¤à¦¾à§° পৰিমাণ হà§à§°à¦¾à¦¸"
#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Empathy ঠগোপনীয়তা কাৰণসমূহৰ বাবে অৱসà§à¦¥à¦¾à¦¨à§° সঠিকতা কমাব লাগে নে।"
#: ../libempathy/empathy-ft-handler.c:733
@@ -689,7 +717,8 @@ msgid "This account is already connected to the server"
msgstr "à¦à¦‡ à¦à¦•à¦¾à¦“নà§à¦Ÿ ইতিমধà§à¦¯à§‡ চাৰà§à¦­à¦¾à§°à§° সৈতে সংযোগিত"
#: ../libempathy/empathy-utils.c:350
-msgid "Connection has been replaced by a new connection using the same resource"
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
msgstr "সংযোগক à¦à¦•à§‡ সমà§à¦ªà¦¦ বà§à¦¯à§±à¦¹à¦¾à§° কৰি à¦à¦Ÿà¦¾ নতà§à¦¨ সংযোগৰে পà§à§°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ কৰা হৈছে"
#: ../libempathy/empathy-utils.c:353
@@ -705,16 +734,19 @@ msgid "Certificate has been revoked"
msgstr "পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° পà§à§°à¦¤à§à¦¯à¦¾à¦¹à¦¾à§° কৰা হৈছে"
#: ../libempathy/empathy-utils.c:359
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
-"পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à§Ÿ à¦à¦Ÿà¦¾ অসà§à§°à¦•à§à¦·à¦¿à¦¤ চিফাৰ à¦à¦²à¦—ৰিথম বà§à¦¯à§±à¦¹à¦¾à§° কৰে অথবা কà§à§°à¦¿à¦ªà§à¦Ÿà§‹à¦—à§à§°à¦¾à¦«à¦¿à§Ÿà¦­à¦¾à§±à§‡ দà§à§°à§à¦¬à¦²"
+"পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à§Ÿ à¦à¦Ÿà¦¾ অসà§à§°à¦•à§à¦·à¦¿à¦¤ চিফাৰ à¦à¦²à¦—ৰিথম বà§à¦¯à§±à¦¹à¦¾à§° কৰে অথবা কà§à§°à¦¿à¦ªà§à¦Ÿà§‹à¦—à§à§°à¦¾à¦«à¦¿à§Ÿà¦­à¦¾à§±à§‡ "
+"দà§à§°à§à¦¬à¦²"
#: ../libempathy/empathy-utils.c:362
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
-"চাৰà§à¦­à¦¾à§° পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à§° দৈৰà§à¦˜, অথবা চাৰà§à¦­à¦¾à§° পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° শৃংখলৰ গভীৰতা, কà§à§°à¦¿à¦ªà§à¦Ÿà§‹à¦—à§à§°à¦¾à¦«à§€ "
+"চাৰà§à¦­à¦¾à§° পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à§° দৈৰà§à¦˜, অথবা চাৰà§à¦­à¦¾à§° পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° শৃংখলৰ গভীৰতা, "
+"কà§à§°à¦¿à¦ªà§à¦Ÿà§‹à¦—à§à§°à¦¾à¦«à§€ "
"লাইবà§à§°à§‡à§°à§€à§Ÿà§‡ পà§à§°à¦£à§Ÿà¦¨ কৰা সীমাসমূহত অতিকà§à§°à¦® কৰে"
#: ../libempathy/empathy-utils.c:366
@@ -734,11 +766,11 @@ msgstr "ওচৰৰ বà§à¦¯à¦•à§à¦¤à¦¿à§°"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:642
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -840,7 +872,7 @@ msgstr "চাৰà§à¦­à¦¾à§°"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "পোৰà§à¦Ÿ"
@@ -974,7 +1006,8 @@ msgid ""
"Most IRC servers don't need a password, so if you're not sure, don't enter a "
"password."
msgstr ""
-"সৰহভাগ IRC চাৰà§à¦­à¦¾à§°à¦¸à¦®à§‚হৰ à¦à¦Ÿà¦¾ পাছৱাৰà§à¦¡à§° পà§à§°à§Ÿà§‹à¦œà¦¨ নহয়, সেয়েহে যদি আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ নহয়, "
+"সৰহভাগ IRC চাৰà§à¦­à¦¾à§°à¦¸à¦®à§‚হৰ à¦à¦Ÿà¦¾ পাছৱাৰà§à¦¡à§° পà§à§°à§Ÿà§‹à¦œà¦¨ নহয়, সেয়েহে যদি আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ "
+"নহয়, "
"à¦à¦Ÿà¦¾ পাছৱাৰà§à¦¡ নসোমাব।"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
@@ -1377,7 +1410,8 @@ msgstr "/j <chat room ID>: à¦à¦Ÿà¦¾ নতà§à¦¨ চেট ৰà§à¦®à¦¤ যোà
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
-msgstr "/part [<chat room ID>] [<reason>]: চেট ৰà§à¦® à¦à§°à¦•, অবিকলà§à¦ªà¦¿à¦¤à¦­à¦¾à§±à§‡ বৰà§à¦¤à¦®à¦¾à¦¨à¦Ÿà§‹"
+msgstr ""
+"/part [<chat room ID>] [<reason>]: চেট ৰà§à¦® à¦à§°à¦•, অবিকলà§à¦ªà¦¿à¦¤à¦­à¦¾à§±à§‡ বৰà§à¦¤à¦®à¦¾à¦¨à¦Ÿà§‹"
#: ../libempathy-gtk/empathy-chat.c:1071
msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1401,7 +1435,8 @@ msgid ""
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-"/say <message>: বৰà§à¦¤à¦®à¦¾à¦¨ কথোপকথনলে <message> পঠাওক। ইয়াক à¦à¦Ÿà¦¾ '/' ৰে আৰমà§à¦­ হোৱা "
+"/say <message>: বৰà§à¦¤à¦®à¦¾à¦¨ কথোপকথনলে <message> পঠাওক। ইয়াক à¦à¦Ÿà¦¾ '/' ৰে আৰমà§à¦­ "
+"হোৱা "
"বাৰà§à¦¤à¦¾ পঠাবলে বà§à¦¯à§±à¦¹à¦¾à§° কৰা হয়। উদাহৰণসà§à¦¬à§°à§‚প: \"/say /join ক à¦à¦Ÿà¦¾ নতà§à¦¨ চেট ৰà§à¦®à¦²à§‡ "
"যোগদান কৰিবলে বà§à¦¯à§±à¦¹à¦¾à§° কৰা হয়\""
@@ -1481,7 +1516,7 @@ msgstr "পà§à§°à§Ÿà§‹à¦— কৰা নহয়"
msgid "unknown"
msgstr "অজà§à¦žà¦¾à¦¤"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "বিষয়:"
@@ -1595,9 +1630,9 @@ msgstr "%s à¦à¦¤à¦¿à§Ÿà¦¾ %s হিচাপে জনাজাত"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "বিচà§à¦›à¦¿à¦¨à§à¦¨"
@@ -1866,7 +1901,9 @@ msgstr "%s পà§à§°à¦¤à¦¿à§°à§‹à¦§ কৰিবনে?"
#: ../libempathy-gtk/empathy-subscription-dialog.c:125
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ নে আপà§à¦¨à¦¿ '%s' ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা পà§à§°à¦¤à¦¿à§°à§‹à¦§ কৰিব বিচাৰে?"
+msgstr ""
+"আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ নে আপà§à¦¨à¦¿ '%s' ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা পà§à§°à¦¤à¦¿à§°à§‹à¦§ কৰিব "
+"বিচাৰে?"
#: ../libempathy-gtk/empathy-individual-dialogs.c:253
msgid "The following identity will be blocked:"
@@ -1913,124 +1950,125 @@ msgstr "পৰিচয় বিৱৰণসমূহ অভিগম কৰিব
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "কল সà§à¦¥à¦¾à¦ªà¦¨à¦¾ কৰিবলে বà§à¦¯à§±à¦¹à¦¾à§° কৰিব লগিয়া à¦à¦•à¦¾à¦“নà§à¦Ÿ বাছক"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "কল"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "মবাইল"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "কৰà§à¦®"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "HOME"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "পৰিচয় পà§à§°à¦¤à¦¿à§°à§‹à¦§ কৰক (_B)"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "মচি পেলাওক আৰৠপà§à§°à¦¤à¦¿à§°à§‹à¦§ কৰক (_B)"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤à§°à§‚পে '%s' ক পৰিচিত তালিকাৰ পৰা আà¦à¦¤à§°à¦¾à¦¬à¦²à§ˆ ইচà§à¦›à§à¦• নে ?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
msgstr ""
-"আপà§à¦¨à¦¿ সà¦à¦šà¦¾à¦•à§‡ সংযà§à¦•à§à¦¤ পৰিচয় '%s' আতৰাব বিচাৰে নে? মন কৰিব যে ই সকলো পৰিচয় যি à¦à¦‡ "
+"আপà§à¦¨à¦¿ সà¦à¦šà¦¾à¦•à§‡ সংযà§à¦•à§à¦¤ পৰিচয় '%s' আতৰাব বিচাৰে নে? মন কৰিব যে ই সকলো পৰিচয় যি "
+"à¦à¦‡ "
"সংযà§à¦•à§à¦¤ পৰিচয় বনায় আতৰাই পেলাব।"
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "পৰিচিত বà§à¦¯à¦•à§à¦¤à¦¿à¦• আà¦à¦¤à§°à§à§±à¦¾ হৈছে"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "আà¦à¦¤à§°à¦¾à¦“ক (_R)"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "চেট (_C)"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "SMS (_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "অডিঅ' কল (_A)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "ভিডিঅ' কল (_V)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "পূৰà§à¦¬à¦¬à§°à§à¦¤à§€ কথোপকথনসমূহ (_P)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "ফাইল পঠিয়াওক"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "মোৰ ডেসà§à¦•à¦Ÿà¦ª অংশীদাৰী কৰক"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "পছনà§à¦¦à§°"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "তথà§à¦¯ (_m)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰক (_E)"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "আপোনাক à¦à¦‡ ৰà§à¦®à¦²à§ˆ আমনà§à¦¤à§à§°à¦£ জনোৱা হৈছে"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "চেট ৰà§à¦®à¦²à§ˆ আমনà§à¦¤à§à§°à¦£ কৰক (_I)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "পৰিচয় যোগ কৰক (_A)…"
@@ -2209,7 +2247,7 @@ msgstr "নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
msgid "new server"
msgstr "নতà§à¦¨ চাৰà§à¦­à¦¾à§°"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2219,8 +2257,10 @@ msgid ""
"same network as you. If you want to use this feature, please check that the "
"details below are correct."
msgstr ""
-"Empathy ঠআপà§à¦¨à¦¿ থকা নেটৱাৰà§à¦•à¦¤ সংযà§à¦•à§à¦¤ থকা মানà§à¦¹à¦¬à§‹à§°à¦• সà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ খোজ কৰি চেট কৰিব "
-"পাৰে। যদি আপà§à¦¨à¦¿ à¦à¦‡ বৈশিষà§à¦Ÿ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব বিচাৰে, অনà§à¦—à§à§°à¦¹ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
+"Empathy ঠআপà§à¦¨à¦¿ থকা নেটৱাৰà§à¦•à¦¤ সংযà§à¦•à§à¦¤ থকা মানà§à¦¹à¦¬à§‹à§°à¦• সà§à¦¬à¦šà¦¾à¦²à¦¿à¦¤à¦­à¦¾à§±à§‡ খোজ কৰি চেট "
+"কৰিব "
+"পাৰে। যদি আপà§à¦¨à¦¿ à¦à¦‡ বৈশিষà§à¦Ÿ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব বিচাৰে, অনà§à¦—à§à§°à¦¹ কৰি তলত থকা বিৱৰণসমূহ "
+"সঠিক "
"আছে নে নীৰিকà§à¦·à¦£ কৰক।"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
@@ -2232,7 +2272,8 @@ msgid ""
"You can change these details later or disable this feature by choosing <span "
"style=\"italic\">Edit → Accounts</span> in the Contact List."
msgstr ""
-"আপà§à¦¨à¦¿ à¦à¦‡ বিৱৰণসমূহ পিছত সলনি অথবা à¦à¦‡ বৈশিষà§à¦Ÿ অসামৰà§à¦¥à¦¬à¦¾à¦¨ কৰিব পাৰিব পৰিচয় তালিকাত "
+"আপà§à¦¨à¦¿ à¦à¦‡ বিৱৰণসমূহ পিছত সলনি অথবা à¦à¦‡ বৈশিষà§à¦Ÿ অসামৰà§à¦¥à¦¬à¦¾à¦¨ কৰিব পাৰিব পৰিচয় "
+"তালিকাত "
"<span style=\"italic\">সমà§à¦ªà¦¾à¦¦à¦¨ → à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ</span> নিৰà§à¦¬à¦¾à¦šà¦¨ কৰি।"
#: ../libempathy-gtk/empathy-log-window.c:622
@@ -2385,12 +2426,12 @@ msgid "Profile"
msgstr "আলেখà§à¦¯"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "চেট"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "ভিডিঅ'"
@@ -2511,7 +2552,8 @@ msgid ""
"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
msgstr ""
"<b>বৰà§à¦¤à¦®à¦¾à¦¨ বাৰà§à¦¤à¦¾: %s</b>\n"
-"<small><i>নতà§à¦¨ বাৰà§à¦¤à¦¾ সংহতি কৰিবলে Enter টিপক অথবা বাতিল কৰিবলে Esc টিপক।</i></"
+"<small><i>নতà§à¦¨ বাৰà§à¦¤à¦¾ সংহতি কৰিবলে Enter টিপক অথবা বাতিল কৰিবলে Esc টিপক।</i>"
+"</"
"small>"
#: ../libempathy-gtk/empathy-presence-chooser.c:393
@@ -2619,12 +2661,12 @@ msgstr "পà§à§°à¦¤à§à¦¯à¦¾à¦–à§à¦¯à¦¾à¦¨ কৰক (_D)"
msgid "_Accept"
msgstr "গà§à§°à¦¹à¦¨ কৰক (_A)"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "বাৰà§à¦¤à¦¾ %s ত সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰা হৈছে"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "সà§à¦¬à¦¾à¦­à¦¾à§±à¦¿à¦•"
@@ -2650,14 +2692,16 @@ msgstr "পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à§° আশা কৰা ফিংগাৰ
#: ../libempathy-gtk/empathy-tls-dialog.c:170
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° দà§à¦¬à¦¾à§°à¦¾ সতা সতà§à¦¯ নিৰূপণ কৰা হসà§à¦Ÿà¦¨à¦¾à¦® চাৰà§à¦­à¦¾à§° নামৰ সৈতে মিল নাখায়।"
+msgstr ""
+"পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° দà§à¦¬à¦¾à§°à¦¾ সতা সতà§à¦¯ নিৰূপণ কৰা হসà§à¦Ÿà¦¨à¦¾à¦® চাৰà§à¦­à¦¾à§° নামৰ সৈতে মিল নাখায়।"
#: ../libempathy-gtk/empathy-tls-dialog.c:174
msgid "The certificate is self-signed."
msgstr "পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° সà§à¦¬-সà§à¦¬à¦¾à¦•à§à¦·à§°à§€à¦¤à¥¤"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr "পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§°à¦• পà§à§°à§‡à§°à¦£à¦•à¦¾à§°à§€ পà§à§°à¦®à¦¾à¦£à¦ªà¦¤à§à§° কতৃপকà§à¦· দà§à¦¬à¦¾à§°à¦¾ পà§à§°à¦¤à§à¦¯à¦¾à¦¹à¦¾à§° কৰা হৈছে।"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2720,7 +2764,8 @@ msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
msgstr ""
-"à¦à¦‡ ফাইল সাà¦à¦šà¦¿à¦¬à¦²à§‡ %s ৰিকà§à¦¤ সà§à¦¥à¦¾à¦¨à§° পà§à§°à§Ÿà§‹à¦œà¦¨, কিনà§à¦¤à§ কেৱল %s উপলবà§à¦§à¥¤ অনà§à¦—à§à§°à¦¹ কৰি অনà§à¦¯ "
+"à¦à¦‡ ফাইল সাà¦à¦šà¦¿à¦¬à¦²à§‡ %s ৰিকà§à¦¤ সà§à¦¥à¦¾à¦¨à§° পà§à§°à§Ÿà§‹à¦œà¦¨, কিনà§à¦¤à§ কেৱল %s উপলবà§à¦§à¥¤ অনà§à¦—à§à§°à¦¹ কৰি "
+"অনà§à¦¯ "
"অৱসà§à¦¥à¦¾à¦¨ বাছক।"
#: ../libempathy-gtk/empathy-ui-utils.c:1302
@@ -2737,15 +2782,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>বà§à¦¯à¦•à§à¦¤à¦¿à¦—ত বিৱৰণসমূহ</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "লিঙà§à¦• দà§à¦¬à¦¾à§°à¦¾ চিহà§à¦¨à¦¿à¦¤ ঠিকনা নকল কৰক (_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "সংযোগ খোলক (_O)"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "HTML পৰিকà§à¦·à¦¾ কৰক"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨ সà§à¦¥à¦¾à¦¨à§€à§Ÿ"
@@ -2914,7 +2964,6 @@ msgid "Vietnamese"
msgstr "ভিয়েতনামিছ"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "উচà§à¦š পৰিচয়সমূহ"
@@ -2922,6 +2971,14 @@ msgstr "উচà§à¦š পৰিচয়সমূহ"
msgid "Ungrouped"
msgstr "দলীয় নহয়"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+#| msgid "Select a contact"
+msgid "Server cannot find contact: %s"
+msgstr "চাৰà§à¦­à¦¾à§°à§‡ পৰিচয় বিচাৰি নাপায়: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "কোনো তà§à§°à§à¦Ÿà¦¿ বাৰà§à¦¤à¦¾ নাই"
@@ -2937,9 +2994,12 @@ msgid ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"Empathy à¦à¦Ÿà¦¾ বিনামà§à¦²à¦¿à§Ÿà¦¾ চফà§à¦Ÿà§±à§‡à§°; আপà§à¦¨à¦¿ Free Software Foundation ৰ দà§à¦¬à¦¾à§°à¦¾ পà§à§°à¦•à¦¾à¦¶à¦¿à¦¤ "
-"GNU General Public License ৰ চà§à¦•à§à¦¤à¦¿à¦¸à¦®à§‚হৰ অনà§à¦¤à§°à§à¦—ত ইয়াক পà§à¦¨à§° বিলাব পাৰিব অথবা সলনি "
-"কৰিব পাৰিব; হৈতো লাইচেঞà§à¦šà§° সংসà§à¦•à§°à¦£ ২, অথবা (আপà§à¦¨à¦¾à§° বিকলà§à¦ªà¦¤) যিকোনো পৰৱৰà§à¦¤à§€ সংসà§à¦•à§°à¦£à¥¤"
+"Empathy à¦à¦Ÿà¦¾ বিনামà§à¦²à¦¿à§Ÿà¦¾ চফà§à¦Ÿà§±à§‡à§°; আপà§à¦¨à¦¿ Free Software Foundation ৰ দà§à¦¬à¦¾à§°à¦¾ "
+"পà§à§°à¦•à¦¾à¦¶à¦¿à¦¤ "
+"GNU General Public License ৰ চà§à¦•à§à¦¤à¦¿à¦¸à¦®à§‚হৰ অনà§à¦¤à§°à§à¦—ত ইয়াক পà§à¦¨à§° বিলাব পাৰিব অথবা "
+"সলনি "
+"কৰিব পাৰিব; হৈতো লাইচেঞà§à¦šà§° সংসà§à¦•à§°à¦£ ২, অথবা (আপà§à¦¨à¦¾à§° বিকলà§à¦ªà¦¤) যিকোনো পৰৱৰà§à¦¤à§€ "
+"সংসà§à¦•à§°à¦£à¥¤"
#: ../src/empathy-about-dialog.c:85
msgid ""
@@ -2948,8 +3008,10 @@ msgid ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
msgstr ""
-"Empathy à¦à¦‡à¦Ÿà§‹ আশাত বিলোৱা হৈছে যে ই বà§à¦¯à§±à¦¹à¦¾à§°à¦¯à§‹à¦—à§à¦¯ হ'ব, কিনà§à¦¤à§ কোনো ৱাৰেনà§à¦Ÿà¦¿ নথকাকৈ; "
-"বà§à¦¯à§±à¦¸à¦¾à§Ÿà§€à¦• অথবা কোনো à¦à¦Ÿà¦¾ বিশেষ কাৰণৰ যোগà§à¦¯à¦¤à¦¾à§° বাবে বà§à¦œà§à§±à¦¾ ৱাৰেনà§à¦Ÿà¦¿ নথকাকৈ। অধিক "
+"Empathy à¦à¦‡à¦Ÿà§‹ আশাত বিলোৱা হৈছে যে ই বà§à¦¯à§±à¦¹à¦¾à§°à¦¯à§‹à¦—à§à¦¯ হ'ব, কিনà§à¦¤à§ কোনো ৱাৰেনà§à¦Ÿà¦¿ "
+"নথকাকৈ; "
+"বà§à¦¯à§±à¦¸à¦¾à§Ÿà§€à¦• অথবা কোনো à¦à¦Ÿà¦¾ বিশেষ কাৰণৰ যোগà§à¦¯à¦¤à¦¾à§° বাবে বà§à¦œà§à§±à¦¾ ৱাৰেনà§à¦Ÿà¦¿ নথকাকৈ। "
+"অধিক "
"যানিবলৈ GNU General Public License চাওক।"
#: ../src/empathy-about-dialog.c:89
@@ -2969,23 +3031,28 @@ msgstr "GNOME ৰ সৈতে বà§à¦¯à§±à¦¹à¦¾à§°à¦¯à§‹à¦—à§à¦¯ তৎকà§
#: ../src/empathy-about-dialog.c:115
msgid "translator-credits"
msgstr ""
-"অমিতাকà§à¦· ফà§à¦•à¦¨ (aphukan@fedoraproject.org), নীলমদà§à¦¯à§à¦¤à¦¿ গোসà§à¦¬à¦¾à¦®à§€ (ngoswami@redhat."
+"অমিতাকà§à¦· ফà§à¦•à¦¨ (aphukan@fedoraproject.org), নীলমদà§à¦¯à§à¦¤à¦¿ গোসà§à¦¬à¦¾à¦®à§€ "
+"(ngoswami@redhat."
"com)"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
-"কোনো ডাইলগ পà§à§°à¦¦à§°à§à¦¶à¦¨ নকৰিব; যিকোনো কাম কৰক (উদাহৰনসà§à¦¬à§°à§‚প, ইমপোৰà§à¦Ÿ কৰা) আৰৠপà§à§°à¦¸à§à¦¥à¦¾à¦¨ "
+"কোনো ডাইলগ পà§à§°à¦¦à§°à§à¦¶à¦¨ নকৰিব; যিকোনো কাম কৰক (উদাহৰনসà§à¦¬à§°à§‚প, ইমপোৰà§à¦Ÿ কৰা) আৰৠ"
+"পà§à§°à¦¸à§à¦¥à¦¾à¦¨ "
"কৰক"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "কোনো ডাইলগ পà§à§°à¦¦à§°à§à¦¶à¦¨ নকৰিব যেতিয়ালৈকে সিহত \"কাষৰীয়া মানà§à¦¹\"à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ নহয়"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"কোনো ডাইলগ পà§à§°à¦¦à§°à§à¦¶à¦¨ নকৰিব যেতিয়ালৈকে সিহত \"কাষৰীয়া মানà§à¦¹\"à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ নহয়"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-"আৰমà§à¦­à¦£à¦¿à¦¤ পà§à§°à¦¦à¦¾à¦¨ কৰা à¦à¦•à¦¾à¦“নà§à¦Ÿ (উদাহৰনসà§à¦¬à§°à§‚প, gabble/jabber/foo_40example_2eorg0) "
+"আৰমà§à¦­à¦£à¦¿à¦¤ পà§à§°à¦¦à¦¾à¦¨ কৰা à¦à¦•à¦¾à¦“নà§à¦Ÿ (উদাহৰনসà§à¦¬à§°à§‚প, "
+"gabble/jabber/foo_40example_2eorg0) "
"নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
#: ../src/empathy-accounts.c:192
@@ -3013,7 +3080,7 @@ msgstr "আপোনাৰ %s à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¤ অসংৰকà§à¦·à§€à
msgid "Your new account has not been saved yet."
msgstr "আপোনাৰ নতà§à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿ à¦à¦¤à¦¿à§Ÿà¦¾à¦“ সংৰকà§à¦·à¦£ কৰা হোৱা নাই"
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "সংযোগ কৰা হৈ আছে…"
@@ -3041,8 +3108,10 @@ msgid ""
"backend. Please install telepathy-haze and restart your session to migrate "
"the account."
msgstr ""
-"à¦à¦‡ à¦à¦•à¦¾à¦“নà§à¦Ÿ অসামৰà§à¦¥à¦¬à¦¾à¦¨ কৰা হৈছে কাৰণ ই à¦à¦Ÿà¦¾ পà§à§°à¦¨à¦¿, অসমৰà§à¦¥à¦¿à¦¤ বেকà¦à¦£à§à¦¡à§° উপৰত নিৰà§à¦­à§°à¦¶à§€à¦²à¥¤ "
-"আপোনাৰ à¦à¦•à¦¾à¦“নà§à¦Ÿ পà§à§°à¦¬à§à§°à¦œà¦¨ কৰিবলে অনà§à¦—à§à§°à¦¹ কৰি telepathy-haze ইনসà§à¦Ÿà¦² কৰক আৰৠআপোনাৰ "
+"à¦à¦‡ à¦à¦•à¦¾à¦“নà§à¦Ÿ অসামৰà§à¦¥à¦¬à¦¾à¦¨ কৰা হৈছে কাৰণ ই à¦à¦Ÿà¦¾ পà§à§°à¦¨à¦¿, অসমৰà§à¦¥à¦¿à¦¤ বেকà¦à¦£à§à¦¡à§° উপৰত "
+"নিৰà§à¦­à§°à¦¶à§€à¦²à¥¤ "
+"আপোনাৰ à¦à¦•à¦¾à¦“নà§à¦Ÿ পà§à§°à¦¬à§à§°à¦œà¦¨ কৰিবলে অনà§à¦—à§à§°à¦¹ কৰি telepathy-haze ইনসà§à¦Ÿà¦² কৰক আৰৠ"
+"আপোনাৰ "
"অধিবেশন পà§à¦¨à§°à¦¾à¦®à§à¦­ কৰক।"
#: ../src/empathy-accounts-dialog.c:502
@@ -3053,20 +3122,20 @@ msgstr "অফলাইন — à¦à¦•à¦¾à¦“নà§à¦Ÿ অসামৰà§à¦¥à¦¬à¦¾
msgid "Edit Connection Parameters"
msgstr "সংযোগ পà§à§°à¦¾à¦šà¦²à¦¸à¦®à§‚হ সমà§à¦ªà¦¾à¦¦à¦¨ কৰক"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "সংযোগ পà§à§°à¦¾à¦šà¦²à¦¸à¦®à§‚হ সমà§à¦ªà¦¾à¦¦à¦¨ কৰক (_E)..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "আপà§à¦¨à¦¿ %s ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "ই চাৰà§à¦­à¦¾à§°à¦¤ আপোনাৰ à¦à¦•à¦¾à¦“নà§à¦Ÿà¦• আতৰাই নিদিয়ে।"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3075,24 +3144,24 @@ msgstr ""
"আতৰোৱা হব। আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ নে আপà§à¦¨à¦¿ আগবাà§à¦¿à¦¬ বিচাৰে?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "সামৰà§à¦¥à¦¬à¦¾à¦¨ (_E)"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "পà§à¦¨à¦ƒ নামকৰণ কৰক"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "বাদ দিয়ক (_S)"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "সংযোগ কৰক (_C)"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3101,7 +3170,7 @@ msgstr ""
"আতৰোৱা হব। আপà§à¦¨à¦¿ নিশà§à¦šà¦¿à¦¤ নে আপà§à¦¨à¦¿ আগবাà§à¦¿à¦¬ বিচাৰে?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "বাৰà§à¦¤à¦¾ আৰৠVoIP à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ"
@@ -3118,7 +3187,8 @@ msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr ""
-"নতà§à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿ যোগ কৰাৰ বাবে, পà§à§°à¦¥à¦®à§‡ বà§à¦¯à§±à¦¹à¦¾à§°à¦¯à§‹à¦—à§à¦¯ পà§à§°à¦¤à¦¿ পà§à§°à¦Ÿà§‹à¦•à¦²à§° বাবে à¦à¦Ÿà¦¾ বেক লৈনà§à¦¡ "
+"নতà§à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿ যোগ কৰাৰ বাবে, পà§à§°à¦¥à¦®à§‡ বà§à¦¯à§±à¦¹à¦¾à§°à¦¯à§‹à¦—à§à¦¯ পà§à§°à¦¤à¦¿ পà§à§°à¦Ÿà§‹à¦•à¦²à§° বাবে à¦à¦Ÿà¦¾ বেক "
+"লৈনà§à¦¡ "
"সংসà§à¦¥à¦¾à¦ªà¦¨ কৰা আৱশà§à¦¯à¦•à¥¤"
#: ../src/empathy-accounts-dialog.ui.h:6
@@ -3161,46 +3231,51 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "à¦à¦Ÿà¦¾ কলত"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy অডিঅ'/ভিডিঅ' কà§à¦²à¦¾à¦à¦¨à§à¦Ÿ"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy অডিঅ'/ভিডিঅ' কà§à¦²à¦¾à¦à¦¨à§à¦Ÿ"
#: ../src/empathy-call-observer.c:119
#, c-format
msgid "%s just tried to call you, but you were in another call."
-msgstr "%s - à¦à¦‡à¦®à¦¾à¦¤à§à§° আপোনাক কল কৰাৰ চেষà§à¦Ÿà¦¾ কৰিছিল, কিনà§à¦¤à§ আপà§à¦¨à¦¿ অনà§à¦¯ à¦à¦Ÿà¦¾ কলত আছিল।"
+msgstr ""
+"%s - à¦à¦‡à¦®à¦¾à¦¤à§à§° আপোনাক কল কৰাৰ চেষà§à¦Ÿà¦¾ কৰিছিল, কিনà§à¦¤à§ আপà§à¦¨à¦¿ অনà§à¦¯ à¦à¦Ÿà¦¾ কলত আছিল।"
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "আগমনকৰà§à¦¤à¦¾ কল"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "%s ৰ পৰা আগ'ত ভিডিঅ' কল"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "%sৰ পৰা আগমনকৰà§à¦¤à¦¾ কল"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "নাকচ কৰক"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3208,74 +3283,76 @@ msgstr "উতà§à¦¤à§°"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "%s ৰ সৈতে কল"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "মেচিনে দেখা দৰে IP ঠিকনা"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "ইনà§à¦Ÿà¦¾à§°à¦¨à§‡à¦Ÿà¦¤ à¦à¦Ÿà¦¾ চাৰà§à¦­à¦¾à§°à§‡ দেখা দৰে IP ঠিকনা"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "অনà§à¦¯ কাষে দেখা ধৰণে সমনীয়াৰ IP ঠিকনা"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "à¦à¦Ÿà¦¾ পà§à§°à§‡à§°à¦£ চাৰà§à¦­à¦¾à§°à§° IP ঠিকনা"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "মালà§à¦Ÿà¦¿à¦•à¦¾à¦¸à§à¦Ÿ দলৰ IP ঠিকনা"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "অজà§à¦žà¦¾à¦¤"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "হলà§à¦¡à¦¤ আছে"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "মিউট"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "অবধি"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "কাৰিকৰী বিৱৰণসমূহ"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-msgstr "%s ৰ চফà§à¦Ÿà§±à§‡à§°à§‡ আপোনাৰ কমপিউটাৰে সমৰà§à¦¥à¦¨ কৰা কোনো অডিঅ' বিনà§à¦¯à¦¾à¦¸ বà§à¦œà¦¿ নাপায়"
+msgstr ""
+"%s ৰ চফà§à¦Ÿà§±à§‡à§°à§‡ আপোনাৰ কমপিউটাৰে সমৰà§à¦¥à¦¨ কৰা কোনো অডিঅ' বিনà§à¦¯à¦¾à¦¸ বà§à¦œà¦¿ নাপায়"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-msgstr "%s ৰ চফà§à¦Ÿà§±à§‡à§°à§‡ আপোনাৰ কমপিউটাৰে সমৰà§à¦¥à¦¨ কৰা কোনো ভিডিঅ' বিনà§à¦¯à¦¾à¦¸ বà§à¦œà¦¿ নাপায়"
+msgstr ""
+"%s ৰ চফà§à¦Ÿà§±à§‡à§°à§‡ আপোনাৰ কমপিউটাৰে সমৰà§à¦¥à¦¨ কৰা কোনো ভিডিঅ' বিনà§à¦¯à¦¾à¦¸ বà§à¦œà¦¿ নাপায়"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3284,54 +3361,57 @@ msgstr ""
"%s লে à¦à¦Ÿà¦¾ সংযোগ সà§à¦¥à¦¾à¦ªà¦¨ কৰিব নোৱাৰে। আপোনা লোকৰ à¦à¦œà¦¨ হয়তো à¦à¦¨à§‡ নেটৱাৰà§à¦•à¦¤ আছে যি "
"পà§à§°à¦¤à§à¦¯à¦•à§à¦· সংযোগসমূহৰ অনà§à¦®à¦¤à¦¿ নিদিয়ে।"
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "নেটৱাৰà§à¦•à¦¤ à¦à¦Ÿà¦¾ বà§à¦¯à§°à§à¦¥à¦¤à¦¾ হৈছিল"
-#: ../src/empathy-call-window.c:3039
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3124
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
msgstr "à¦à¦‡ কলৰ বাবে পà§à§°à§Ÿà§‹à¦œà¦¨à§€à§Ÿ অডিঅ' বিনà§à¦¯à¦¾à¦¸à¦¸à¦®à§‚হ আপোনাৰ কমপিউটাৰত ইনসà§à¦Ÿà¦² নাই"
-#: ../src/empathy-call-window.c:3042
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3127
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
msgstr "à¦à¦‡ কলৰ বাবে ভিডিঅ' বিনà§à¦¯à¦¾à¦¸à¦¸à¦®à§‚হ আপোনাৰ কমপিউটাৰত ইনসà§à¦Ÿà¦² নাই"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
msgstr ""
-"কিবা অপà§à§°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤ à¦à¦Ÿà¦¾ Telepathy উপাদানত ঘটিছে। অনà§à¦—à§à§°à¦¹ কৰি <a href=\"%s\">à¦à¦‡ বাগ "
+"কিবা অপà§à§°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤ à¦à¦Ÿà¦¾ Telepathy উপাদানত ঘটিছে। অনà§à¦—à§à§°à¦¹ কৰি <a href=\"%s\">à¦à¦‡ "
+"বাগ "
"সংবাদন কৰক</a> আৰৠসহায় মেনà§à§° 'ডিবাগ' উইনà§à¦¡à§‹à§° পৰা সংগà§à§°à¦¹ কৰা লগসমূহ à¦à¦Ÿà¦¾à¦š কৰক।"
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "কল ইঞà§à¦œà§€à¦¨à¦¤ à¦à¦Ÿà¦¾ বà§à¦¯à§°à§à¦¥à¦¤à¦¾ হৈছিল"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "সà§à¦Ÿà§à§°à¦¿à¦®à§° অনà§à¦¤ পোৱা গল"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "অডিঅ' সà§à¦Ÿà§à§°à¦¿à¦® সà§à¦¥à¦¾à¦ªà¦¨à¦¾ কৰিব নোৱাৰি"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "ভিডিঅ' সà§à¦Ÿà§à§°à¦¿à¦® সà§à¦¥à¦¾à¦ªà¦¨à¦¾ কৰিব নোৱাৰি"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "আপোনাৰ বৰà§à¦¤à¦®à¦¾à¦¨ বেলেঞà§à¦š হল %s।"
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "কà§à¦·à¦®à¦¾ কৰিব, আপোনাৰ সেই কলৰ বাবে পৰà§à¦¯à¦¾à¦ªà§à¦¤ দেন নাই।"
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "টপ আপ"
@@ -3368,78 +3448,86 @@ msgid "_Debug"
msgstr "ডিবাগ কৰক (_D)"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "GStreamer (_G)"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "টেলিপেথী (_T)"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "কেমেৰা সà§à¦¬à¦¾à¦ª কৰক"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "মোক সৰৠকৰক"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "মোক ডাঙৰ কৰক"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "কেমেৰা অসামৰà§à¦¥à¦¬à¦¾à¦¨ কৰক"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "বিচà§à¦›à¦¿à¦¨à§à¦¨ কৰক"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨ কল হেঙআপ কৰক"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "ভিডিঅ' কল "
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "à¦à¦Ÿà¦¾ ভিডিঅ' কল আৰমà§à¦­ কৰক"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "à¦à¦Ÿà¦¾ অডিঅ' কল আৰমà§à¦­ কৰক"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "ডায়েলপেড দেখà§à§±à¦¾à¦“ক"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "ডায়েলপেড পà§à§°à¦¦à§°à§à¦¶à¦¨ কৰক"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "কডেক à¦à¦¨à¦•'ড কৰা হৈ আছে:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "দূৰৱৰà§à¦¤à§€ পà§à§°à¦¾à§°à§à¦¥à§€:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "সà§à¦¥à¦¾à¦¨à§€à§Ÿ পà§à§°à¦¾à§°à§à¦¥à§€:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "অডিঅ'"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- Empathy চেট কà§à¦²à¦¾à¦à¦¨à§à¦Ÿ"
@@ -3459,11 +3547,11 @@ msgstr "সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ-সংযোগ"
msgid "Manage Favorite Rooms"
msgstr "পছনà§à¦¦à§° ৰà§à¦® পৰিচয়লনা কৰক"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিব নে?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3472,7 +3560,7 @@ msgstr ""
"à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিলে %s অৱশিষà§à¦Ÿ থাকিব। আপà§à¦¨à¦¿ ইয়াক পà§à¦¨à§° অংশগà§à§°à¦¹à¦£ নকৰিলে ততোধিক "
"বাৰà§à¦¤à¦¾à¦¸à¦®à§‚হ নাপাব।"
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3481,71 +3569,73 @@ msgid_plural ""
"Closing this window will leave %u chat rooms. You will not receive any "
"further messages until you rejoin them."
msgstr[0] ""
-"à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিলে à¦à¦Ÿà¦¾ চেট ৰà§à¦® বাদ দিয়া হব। আপà§à¦¨à¦¿ ইয়াক পà§à¦¨à§° অংশগà§à§°à¦¹à¦£ নকৰা লৈকে "
+"à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিলে à¦à¦Ÿà¦¾ চেট ৰà§à¦® বাদ দিয়া হব। আপà§à¦¨à¦¿ ইয়াক পà§à¦¨à§° অংশগà§à§°à¦¹à¦£ নকৰা "
+"লৈকে "
"কোনো ততোধিক বাৰà§à¦¤à¦¾ নাপাব।"
msgstr[1] ""
-"à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিলে %u চেট ৰà§à¦®à¦¸à¦®à§‚হ বাদ দিয়া হব। আপà§à¦¨à¦¿ ইহতক পà§à¦¨à§° অংশগà§à§°à¦¹à¦£ নকৰা লৈকে "
+"à¦à¦‡ উইনà§à¦¡à§‹ বনà§à¦§ কৰিলে %u চেট ৰà§à¦®à¦¸à¦®à§‚হ বাদ দিয়া হব। আপà§à¦¨à¦¿ ইহতক পà§à¦¨à§° অংশগà§à§°à¦¹à¦£ "
+"নকৰা লৈকে "
"কোনো ততোধিক বাৰà§à¦¤à¦¾ নাপাব।"
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "%s à¦à§°à¦¿à¦¬ নে?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr "আপà§à¦¨à¦¿ à¦à¦‡ চেট ৰà§à¦® পà§à¦¨à§°à¦…ংশগà§à§°à¦¹à¦£ নকৰালৈকে কোনো ততোধিক বাৰà§à¦¤à¦¾ নাপাব।"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "উইনà§à¦¡à§‹ বনà§à¦§ কৰক"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "ৰà§à¦® à¦à§°à¦¿ দিওক"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d পà§à¦¾ হোৱা নাই)"
msgstr[1] "%s (%d পà§à¦¾ হোৱা নাই)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (আৰৠ%u অনà§à¦¯)"
msgstr[1] "%s (আৰৠ%u অনà§à¦¯)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d অনà§à¦¯à§° পৰা পà§à¦¾ হোৱা নাই)"
msgstr[1] "%s (%d অনà§à¦¯à§° পৰা পà§à¦¾ হোৱা নাই)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d সকলোৰ পৰা পà§à¦¾ হোৱা নাই)"
msgstr[1] "%s (%d সকলোৰ পৰা পà§à¦¾ হোৱা নাই)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "%d বাৰà§à¦¤à¦¾ পঠোৱা হৈ আছে"
msgstr[1] "%d বাৰà§à¦¤à¦¾à¦¸à¦®à§‚হ পঠোৱা হৈ আছে"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "বাৰà§à¦¤à¦¾ লিখা হৈছে।"
@@ -3637,63 +3727,83 @@ msgstr "পেইসà§à¦Ÿà¦¬à¦¿à¦¨ পà§à§°à¦¤à¦¿à¦•à§à§°à¦¿à§Ÿà¦¾"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "তথà§à¦¯ à¦à¦Ÿà¦¾ পেইসà§à¦Ÿà§° বাবে অতি ডাঙৰ। অনà§à¦—à§à§°à¦¹ কৰি লগসমূহ ফাইলত সংৰকà§à¦·à¦£ কৰক।"
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "ডিবাগ উইনà§à¦¡à§‹"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "পেইসà§à¦Ÿà¦¬à¦¿à¦¨à¦²à§‡ পঠাওক"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "সà§à¦¥à¦—িত কৰক"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "সà§à¦¤à§° "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "ডিবাগ"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "তথà§à¦¯"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "বাৰà§à¦¤à¦¾"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "সতৰà§à¦•à¦¬à¦¾à§°à§à¦¤à¦¾"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "গà§à§°à§à¦¤à§à¦¬à¦ªà§‚ৰà§à¦£"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "তà§à§°à§à¦Ÿà¦¿"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"যদিও আপà§à¦¨à¦¿ পাছৱাৰà§à¦¡ পà§à§°à¦¦à§°à§à¦¶à¦¨ নকৰে, লগসমূহে সংবেদà§à¦¯ তথà§à¦¯ অনà§à¦¤à§°à§à¦­à§à¦•à§à¦¤ কৰিব পাৰে "
+"যেনে "
+"আপোনাৰ পৰিচয়সমূহৰ তালিকা অথবা আপà§à¦¨à¦¿ শেহতীয়াভাৱে পঠোৱা অথবা গà§à§°à¦¹à¦£ কৰা "
+"বাৰà§à¦¤à¦¾à¦¸à¦®à§‚হ।\n"
+"যদি আপà§à¦¨à¦¿ à¦à¦¨à§‡à¦§à§°à¦£à§° তথà§à¦¯ à¦à¦Ÿà¦¾ ৰাজহà§à§±à¦¾ বাগ সংবাদত উপলবà§à¦§ থকাটো নিবিচাৰে, আপà§à¦¨à¦¿ "
+"বাগ "
+"সংবাদন কৰোতে <a href=\"https://bugzilla.gnome.org/enter_bug.cgi? "
+"product=empathy\">বাগ সংবাদ</a> ত উনà§à¦¨à¦¤ ফিলà§à¦¡à¦¸à¦®à§‚হ পà§à§°à¦¦à§°à§à¦¶à¦¨ কৰি আপোনাৰ বাগৰ "
+"দৃশà§à¦¯à¦®à¦¾à¦¨à¦¤à¦¾ Empathy উনà§à¦¨à§Ÿà¦¨à¦•à¦¾à§°à§€à¦¸à¦•à¦²à¦²à§‡ সীমিত ৰাখিব পাৰে।"
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "সময়"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "ডোমেইন"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "শà§à§°à§‡à¦£à§€"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "সà§à¦¤à§°"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3758,7 +3868,7 @@ msgstr "আপোনাক %s ত যোগদান দিবলে আমনà§
msgid "Incoming file transfer from %s"
msgstr "%s দà§à¦¬à¦¾à§°à¦¾ পà§à§°à§°à¦¿à¦¤ ফাইল আগত"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "পাছৱাৰà§à¦¡à§° পà§à§°à§Ÿà§‹à¦œà¦¨"
@@ -3880,7 +3990,8 @@ msgstr "ফাইল সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à§°"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "সমাপà§à¦¤, বাতিল আৰৠবিফল ফাইল সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à§°à§° তথà§à¦¯ à¦à¦‡ তালিকাৰ পৰা আà¦à¦¤à§°à§à§±à¦¾ হ'ব"
+msgstr ""
+"সমাপà§à¦¤, বাতিল আৰৠবিফল ফাইল সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à§°à§° তথà§à¦¯ à¦à¦‡ তালিকাৰ পৰা আà¦à¦¤à§°à§à§±à¦¾ হ'ব"
#: ../src/empathy-import-dialog.c:76
msgid "_Import"
@@ -3964,9 +4075,11 @@ msgid "Join Room"
msgstr "ৰà§à¦®à¦¤ যোগ দিয়ক"
#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
msgstr ""
-"ইয়াত যোগদান কৰিবলে ৰà§à¦®à§° নাম সà§à¦®à§à§±à¦¾à¦“ক অথবা তালিকাত থকা à¦à¦Ÿà¦¾ বা অধিক ৰà§à¦®à¦¸à¦®à§‚হত কà§à¦²à¦¿à¦• "
+"ইয়াত যোগদান কৰিবলে ৰà§à¦®à§° নাম সà§à¦®à§à§±à¦¾à¦“ক অথবা তালিকাত থকা à¦à¦Ÿà¦¾ বা অধিক ৰà§à¦®à¦¸à¦®à§‚হত "
+"কà§à¦²à¦¿à¦• "
"কৰক।"
#: ../src/empathy-new-chatroom-dialog.ui.h:2
@@ -3978,7 +4091,8 @@ msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account&apos;s server"
msgstr ""
-"ৰà§à¦®à¦• হসà§à¦Ÿ কৰা চাৰà§à¦­à¦¾à§° সà§à¦®à§à§±à¦¾à¦“ক, অথবা ইয়াক ৰিকà§à¦¤ à¦à§°à¦• যদি ৰà§à¦® বৰà§à¦¤à¦®à¦¾à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿ&apos;s "
+"ৰà§à¦®à¦• হসà§à¦Ÿ কৰা চাৰà§à¦­à¦¾à§° সà§à¦®à§à§±à¦¾à¦“ক, অথবা ইয়াক ৰিকà§à¦¤ à¦à§°à¦• যদি ৰà§à¦® বৰà§à¦¤à¦®à¦¾à¦¨ "
+"à¦à¦•à¦¾à¦“নà§à¦Ÿ&apos;s "
"চাৰà§à¦­à¦¾à§°à¦¤ আছে"
#: ../src/empathy-new-chatroom-dialog.ui.h:4
@@ -3986,7 +4100,8 @@ msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account's server"
msgstr ""
-"ৰà§à¦®à¦• হসà§à¦Ÿ কৰা চাৰà§à¦­à¦¾à§° সà§à¦®à§à§±à¦¾à¦“ক, অথবা ইয়াক ৰিকà§à¦¤ à¦à§°à¦• যদি ৰà§à¦® বৰà§à¦¤à¦®à¦¾à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿà§° চাৰà§à¦­à¦¾à§°à¦¤ "
+"ৰà§à¦®à¦• হসà§à¦Ÿ কৰা চাৰà§à¦­à¦¾à§° সà§à¦®à§à§±à¦¾à¦“ক, অথবা ইয়াক ৰিকà§à¦¤ à¦à§°à¦• যদি ৰà§à¦® বৰà§à¦¤à¦®à¦¾à¦¨ à¦à¦•à¦¾à¦“নà§à¦Ÿà§° "
+"চাৰà§à¦­à¦¾à§°à¦¤ "
"আছে"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
@@ -4110,7 +4225,7 @@ msgstr "দলসমূহ দেখà§à§±à¦¾à¦“ক"
msgid "Show account balances"
msgstr "à¦à¦•à¦¾à¦“নà§à¦Ÿ বেলেঞà§à¦šà¦¸à¦®à§‚হ দেখà§à§±à¦¾à¦“ক"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2202
msgid "Contact List"
msgstr "পৰিচিত বà§à¦¯à¦•à§à¦¤à¦¿à§° তালিকা"
@@ -4160,7 +4275,8 @@ msgstr "বাবল দà§à¦¬à¦¾à§°à¦¾ সূচনাপà§à§°à¦¦à¦¾à¦¨ সা
#: ../src/empathy-preferences.ui.h:17
msgid "Disable notifications when _away or busy"
-msgstr "অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤ অথবা বà§à¦¯à¦¸à§à¦¤ থাকিলে সূচনাপà§à§°à¦¦à¦¾à¦¨à§° বà§à¦¯à§±à¦¸à§à¦¥à¦¾ নিষà§à¦•à§à§°à¦¿à§Ÿ কৰা হ'ব (_a)"
+msgstr ""
+"অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤ অথবা বà§à¦¯à¦¸à§à¦¤ থাকিলে সূচনাপà§à§°à¦¦à¦¾à¦¨à§° বà§à¦¯à§±à¦¸à§à¦¥à¦¾ নিষà§à¦•à§à§°à¦¿à§Ÿ কৰা হ'ব (_a)"
#: ../src/empathy-preferences.ui.h:18
msgid "Enable notifications when the _chat is not focused"
@@ -4205,9 +4321,12 @@ msgid ""
"hear strange noises or glitches during calls, try turning echo cancellation "
"off and restarting the call."
msgstr ""
-"পà§à§°à¦¤à¦¿à¦§à§à¦¬à¦¨à¦¿ বাতিল কৰায় আপোনাৰ কনà§à¦ à¦• অনà§à¦¯ বà§à¦¯à¦•à§à¦¤à¦¿à§Ÿà§‡ সà§à¦ªà¦·à§à¦Ÿ শà§à¦¨à¦¿à¦¬à¦²à§‡ সহায় কৰে, কিনà§à¦¤à§ "
-"কিছà§à¦®à¦¾à¦¨ কমপিউটাৰত সমসà§à¦¯à¦¾ সৃষà§à¦Ÿà¦¿ কৰিব পাৰে। যদি আপà§à¦¨à¦¿ অথবা অনà§à¦¯ মানà§à¦¹à¦œà¦¨à§‡ কলৰ সমূয়ত "
-"অদà§à¦­à§à¦¤ শবà§à¦¦ বা খেৰখেৰনি শà§à¦¨à§‡, পà§à§°à¦¤à¦¿à¦§à§à¦¬à¦¨à¦¿ বাতিল কৰা বনà§à¦§ কৰি কল পà§à¦¨à§°à¦¾à¦®à§à¦­ কৰি চাওক।"
+"পà§à§°à¦¤à¦¿à¦§à§à¦¬à¦¨à¦¿ বাতিল কৰায় আপোনাৰ কনà§à¦ à¦• অনà§à¦¯ বà§à¦¯à¦•à§à¦¤à¦¿à§Ÿà§‡ সà§à¦ªà¦·à§à¦Ÿ শà§à¦¨à¦¿à¦¬à¦²à§‡ সহায় কৰে, "
+"কিনà§à¦¤à§ "
+"কিছà§à¦®à¦¾à¦¨ কমপিউটাৰত সমসà§à¦¯à¦¾ সৃষà§à¦Ÿà¦¿ কৰিব পাৰে। যদি আপà§à¦¨à¦¿ অথবা অনà§à¦¯ মানà§à¦¹à¦œà¦¨à§‡ কলৰ "
+"সমূয়ত "
+"অদà§à¦­à§à¦¤ শবà§à¦¦ বা খেৰখেৰনি শà§à¦¨à§‡, পà§à§°à¦¤à¦¿à¦§à§à¦¬à¦¨à¦¿ বাতিল কৰা বনà§à¦§ কৰি কল পà§à¦¨à§°à¦¾à¦®à§à¦­ কৰি "
+"চাওক।"
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
@@ -4219,7 +4338,8 @@ msgid ""
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
-"কমোৱা অৱসà§à¦¥à¦¾à¦¨ সঠিকতায় বà§à¦œà¦¾à§Ÿ যে আপোনাৰ শহৰ, ৰাজà§à¦¯ আৰৠদেশৰ বাহিৰে আৰৠà¦à¦•à§‹ পà§à§°à¦•à¦¾à¦¶ "
+"কমোৱা অৱসà§à¦¥à¦¾à¦¨ সঠিকতায় বà§à¦œà¦¾à§Ÿ যে আপোনাৰ শহৰ, ৰাজà§à¦¯ আৰৠদেশৰ বাহিৰে আৰৠà¦à¦•à§‹ "
+"পà§à§°à¦•à¦¾à¦¶ "
"কৰা নহব। GPS অকà§à¦·à¦¸à¦®à§‚হ ই দশমিক লৈকে সঠিক হব।"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
@@ -4275,64 +4395,88 @@ msgstr "অপৰ:"
msgid "Themes"
msgstr "থীমসমূহ"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "পাছৱাৰà§à¦¡ পà§à§°à¦¦à¦¾à¦¨ কৰক"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "বিচà§à¦›à¦¿à¦¨à§à¦¨ কৰক"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:464
msgid "You need to setup an account to see contacts here."
msgstr "আপà§à¦¨à¦¿ ইয়াত পৰিচয়সমূহ চাবলে à¦à¦Ÿà¦¾ à¦à¦•à¦¾à¦“নà§à¦Ÿ সংসà§à¦¥à¦¾à¦ªà¦¨ কৰিব লাগিব।"
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:540
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
-"কà§à¦·à¦®à¦¾ কৰিব, %s à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব নোৱাৰি যেতিয়ালৈকে %s চফà§à¦Ÿà§±à§‡à§° বà§à¦¯à§±à¦¹à¦¾à§° কৰা "
+"কà§à¦·à¦®à¦¾ কৰিব, %s à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ বà§à¦¯à§±à¦¹à¦¾à§° কৰিব নোৱাৰি যেতিয়ালৈকে %s চফà§à¦Ÿà§±à§‡à§° বà§à¦¯à§±à¦¹à¦¾à§° "
+"কৰা "
"নহয়।"
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:640
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:644
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:659
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s à¦à¦•à¦¾à¦“নà§à¦Ÿà§° অনà§à¦®à¦¤à¦¿à§° পà§à§°à§Ÿà§‹à¦œà¦¨"
+
+#: ../src/empathy-roster-window.c:670
+msgid "Online Accounts"
+msgstr "অনলাইন à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ"
+
+#: ../src/empathy-roster-window.c:717
msgid "Update software..."
msgstr "চফà§à¦Ÿà§±à§‡à§° আপডেইট কৰক..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:723
msgid "Reconnect"
msgstr "পà§à¦¨à§° সংযোগ কৰক"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:727
msgid "Edit Account"
msgstr "à¦à¦•à¦¾à¦“নà§à¦Ÿ সমà§à¦ªà¦¾à¦¦à¦¨ কৰক"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:732
msgid "Close"
msgstr "বনà§à¦§ কৰক"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:869
msgid "Top up account"
msgstr "টপ আপ à¦à¦•à¦¾à¦“নà§à¦Ÿ"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1551
msgid "You need to enable one of your accounts to see contacts here."
-msgstr "আপà§à¦¨à¦¿ পৰিচয়সমূহ ইয়াত চাবলে আপোনাৰ à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হৰ à¦à¦Ÿà¦¾ সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰিব লাগিব।"
+msgstr ""
+"আপà§à¦¨à¦¿ পৰিচয়সমূহ ইয়াত চাবলে আপোনাৰ à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হৰ à¦à¦Ÿà¦¾ সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰিব লাগিব।"
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1559
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "আপà§à¦¨à¦¿ পৰিচয়সমূহ ইয়াত চাবলে %s সামৰà§à¦¥à¦¬à¦¾à¦¨ কৰিব লাগিব।"
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1637
msgid "Change your presence to see contacts here"
msgstr "ইয়াত পৰিচয়সমূহ চাবলে আপোনাৰ উপসà§à¦¥à¦¿à¦¤à¦¿ সলনি কৰক"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1646
msgid "No match found"
msgstr "কোনো মিল পোৱা নগল"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1653
+msgid "You haven't added any contact yet"
+msgstr "আপà§à¦¨à¦¿ কোনো পৰিচয় যোগ কৰা নাই"
+
+#: ../src/empathy-roster-window.c:1656
msgid "No online contacts"
msgstr "কোনো অনলাইন পৰিচয় নাই"
@@ -4409,6 +4553,16 @@ msgstr "à¦à¦•à¦¾à¦“নà§à¦Ÿ সংহতিসমূহ"
msgid "Go _Online"
msgstr "অনলাইন হওক (_O)"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "অফলাইন পৰিচয়সমূহ দেখà§à§±à¦¾à¦“ক (_O)"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "পৰিচয় যোগ কৰক (_A)..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "নতà§à¦¨ কথোপকথন (_N)…"
@@ -4653,9 +4807,6 @@ msgstr "আপোনাৰ IM à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ অনà§à¦•à¦²à
#~ msgid "Socket type not supported"
#~ msgstr "ছ'কেটৰ ধৰন সমৰà§à¦¥à¦¿à¦¤ নহয়"
-#~ msgid "My Web Accounts"
-#~ msgstr "মোৰ ৱেব à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ"
-
#~ msgid "The account %s is edited via %s."
#~ msgstr "à¦à¦•à¦¾à¦“নà§à¦Ÿ %s ক %s ৰে সমà§à¦ªà¦¾à¦¦à¦¨ কৰা হৈছে।"
@@ -4681,9 +4832,6 @@ msgstr "আপোনাৰ IM à¦à¦•à¦¾à¦“নà§à¦Ÿà¦¸à¦®à§‚হ অনà§à¦•à¦²à
#~ msgid "_Edit"
#~ msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰক (_E)"
-#~ msgid "Select a contact"
-#~ msgstr "à¦à¦Ÿà¦¾ পৰিচয় নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
-
#~ msgid "Select contacts to link"
#~ msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
diff --git a/po/da.po b/po/da.po
index 15455b38f..f4a7720da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -802,7 +802,7 @@ msgstr "Folk i nærheden"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "Google Talk"
@@ -1556,7 +1556,7 @@ msgstr "ikke implementeret"
msgid "unknown"
msgstr "ukendt"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Emne:"
@@ -1670,9 +1670,9 @@ msgstr "%s har nu navnet %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1525
+#: ../src/empathy-call-window.c:1575 ../src/empathy-call-window.c:2629
+#: ../src/empathy-call-window.c:2935 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Frakoblet"
@@ -2002,7 +2002,7 @@ msgstr "Vælg konto der skal bruges til at lave dette opkald"
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Opkald"
@@ -2100,7 +2100,7 @@ msgstr "_Redigér"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Inviterer dig til dette rum"
@@ -2464,12 +2464,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Chat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -3261,11 +3261,11 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:195
msgid "- Empathy Audio/Video Client"
msgstr "- Audio/video-klienten Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:219
msgid "Empathy Audio/Video Client"
msgstr "Audio/video-klienten Empathy"
@@ -3281,27 +3281,27 @@ msgstr ""
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Indkommende opkald"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Indkommende videoopkald fra %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Indkommende opkald fra %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1552
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Afvis"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1553
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3309,60 +3309,60 @@ msgstr "Besvar"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1920
#, c-format
msgid "Call with %s"
msgstr "Opkald til %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2172
msgid "The IP address as seen by the machine"
msgstr "IP-adressen som den ses af maskinen"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2174
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adressen som den ses af en server på internettet"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2176
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adressen for modparten(peer), som den ses på den anden side"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2178
msgid "The IP address of a relay server"
msgstr "IP-adressen for en videresendelsesserver"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2180
msgid "The IP address of the multicast group"
msgstr "IP-adressen for multicastgruppen"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582
+#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Ukendt"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2933
msgid "On hold"
msgstr "I kø"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2937
msgid "Mute"
msgstr "Stilhed"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2939
msgid "Duration"
msgstr "Varighed"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2942
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3038
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3077
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3370,7 +3370,7 @@ msgid ""
msgstr ""
"%ss software forstår ingen af de lydformater, din computer understøtter"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3082
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3378,7 +3378,7 @@ msgid ""
msgstr ""
"%ss software forstår ingen af de videoformater, din computer understøtter"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3088
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3387,25 +3387,25 @@ msgstr ""
"Kan ikke oprette forbindelse til %s. En af jer er måske på et netværk, der "
"ikke tillader direkte forbindelser."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3094
msgid "There was a failure on the network"
msgstr "Der opstod en fejl på netværket"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3098
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformaterne, der kræves til dette opkald, er ikke installeret på din "
"computer"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3101
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformaterne, der kræves til dette opkald, er ikke installeret på din "
"computer"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3113
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3416,32 +3416,32 @@ msgstr ""
"a> venligst denne fejl og vedhæft logfiler fra fejlfindingsvinduet i menuen "
"Hjælp."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3122
msgid "There was a failure in the call engine"
msgstr "Der opstod en fejl i opkaldsmotoren"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3125
msgid "The end of the stream was reached"
msgstr "Afslutningen af strømmen blev nået"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3165
msgid "Can't establish audio stream"
msgstr "Kan ikke oprette lydstrøm"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3175
msgid "Can't establish video stream"
msgstr "Kan ikke oprette videostrøm"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3212
#, c-format
msgid "Your current balance is %s."
msgstr "Din nuværende saldo er %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3216
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Beklager, du har ikke nok på din konto til det opkald."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3218
msgid "Top Up"
msgstr "Fyld op"
@@ -3478,74 +3478,82 @@ msgid "_Debug"
msgstr "_Fejlfind"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Ombyt kamera"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimér mig"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maksimér mig"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Deaktivér kamera"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Læg på"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Afslut det nuværende opkald"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Videoopkald"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Start et videoopkald"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Start et lydopkald"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Vis opkaldspanel"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Vis opkaldspanelet"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Slå videotransmission til/fra"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Slå lydtransmission til/fra"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Indkodningscodec:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Afkodningscodec:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Fjern kandidat:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Lokal kandidat:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Lyd"
@@ -3569,11 +3577,11 @@ msgstr "Auto-tilslut"
msgid "Manage Favorite Rooms"
msgstr "Håndtér yndlingsrum"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Luk dette vindue?"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3582,7 +3590,7 @@ msgstr ""
"Lukkes dette vindue, vil du forlade %s. Du vil ikke modtage yderligere "
"beskeder, før du igen deltager."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3597,12 +3605,12 @@ msgstr[1] ""
"Lukkes dette vindue vil du forlade %u chatrum. Du vil ikke modtage "
"yderligere beskeder før du igen deltager."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Forlad %s?"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3610,54 +3618,54 @@ msgstr ""
"Du vil ikke modtage yderligere beskeder fra dette chatrum, før du igen "
"deltager i det."
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Luk vindue"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Forlad rum"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulæst)"
msgstr[1] "%s (%d ulæste)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u anden)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulæst fra andre)"
msgstr[1] "%s (%d ulæste fra andre)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulæst fra alle)"
msgstr[1] "%s (%d ulæste fra alle)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sender %d besked"
msgstr[1] "Sender %d beskeder"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Skriver en besked."
@@ -3750,63 +3758,74 @@ msgid "Data too large for a single paste. Please save logs to file."
msgstr ""
"Data er for stor til en enkelt indsættelse. Gem venligst logge til fil."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Fejlfindingsvindue"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Send til pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Niveau "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Fejlfind"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Besked"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Advarsel"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Kritisk"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Fejl"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensible information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developpers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Tidspunkt"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domæne"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Niveau"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4256,7 +4275,7 @@ msgstr "Vis grupper"
msgid "Show account balances"
msgstr "Vis kontosaldoer"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "Kontaktliste"
@@ -4441,45 +4460,65 @@ msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Beklager, %s-konti kan ikke benyttes før din %s-software er blevet opdateret."
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:617
+msgid "Windows Live"
+msgstr ""
+
+#: ../src/empathy-roster-window.c:621
+#, fuzzy
+msgid "Facebook"
+msgstr "Facebook-chat"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:636
+#, c-format
+msgid "%s account requires authorisation"
+msgstr ""
+
+#: ../src/empathy-roster-window.c:647
+#, fuzzy
+msgid "Online Accounts"
+msgstr "Mine Webkonti"
+
+#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "Updatér software..."
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "Tilslut igen"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "Redigér kontoen"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "Luk"
-#: ../src/empathy-roster-window.c:787
+#: ../src/empathy-roster-window.c:846
msgid "Top up account"
msgstr "Fyld kontosaldo op"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Du skal aktivere en af dine konti for at kunne se kontakter her."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1536
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Du skal aktivere %s for at kunne se kontakter her."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1614
msgid "Change your presence to see contacts here"
msgstr "Ændr din tilstedeværelse for at se kontakter her"
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1623
msgid "No match found"
msgstr "Ingen træffere fundet"
-#: ../src/empathy-roster-window.c:1569
+#: ../src/empathy-roster-window.c:1628
msgid "No online contacts"
msgstr "Ingen kontakter online"
@@ -4809,9 +4848,6 @@ msgstr "Integrér dine IM-konti"
#~ msgid "Socket type not supported"
#~ msgstr "Sokkeltype understøttet ikke"
-#~ msgid "My Web Accounts"
-#~ msgstr "Mine Webkonti"
-
#~ msgid "The account %s is edited via %s."
#~ msgstr "Kontoen %s redigeres via %s."
diff --git a/po/de.po b/po/de.po
index f777adaa9..3adc982e5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,15 +12,16 @@
# Wolfgang Stöggl <c72578@yahoo.de>, 2011, 2012.
# Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2011.
# Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
+# Hendrik Knackstedt <hendrik.knackstedt@t-online.de>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-10-22 19:35+0000\n"
+"POT-Creation-Date: 2012-12-03 11:09+0000\n"
"PO-Revision-Date: 2012-10-24 21:04+0100\n"
-"Last-Translator: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
+"Last-Translator: Hendrik Knackstedt <hendrik.knackstedt@t-online.de>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -47,6 +48,10 @@ msgstr "Empathy Internet-Sofortnachrichtendienst"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Chat auf Google Talk, Facebook, MSN und vielen anderen Chat-Diensten"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;gespräch;im;nachrichten;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Verbindungsverwaltung verwenden"
@@ -815,11 +820,11 @@ msgstr "Personen in der Nähe"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook-Chat"
@@ -921,7 +926,7 @@ msgstr "Server"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Port"
@@ -1570,7 +1575,7 @@ msgstr "Nicht implementiert"
msgid "unknown"
msgstr "Unbekannt"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Thema:"
@@ -1684,9 +1689,9 @@ msgstr "%s ist jetzt bekannt als %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2573
-#: ../src/empathy-call-window.c:2879 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Getrennt"
@@ -2015,7 +2020,7 @@ msgstr "Konto für den Anruf wählen"
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Anrufen"
@@ -2115,7 +2120,7 @@ msgstr "_Bearbeiten"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Sie werden in diesen Chatraum eingeladen"
@@ -2302,7 +2307,7 @@ msgstr "Auswählen"
msgid "new server"
msgstr "neuer Server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2483,12 +2488,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Chat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -3041,10 +3046,10 @@ msgid ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"Empathy ist freie Software, Sie können sie weitergeben und/oder verändern "
-"solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
-"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
+"Empathy ist freie Software, Sie können es weitergeben und/oder verändern "
+"solange Sie sich an die Regeln der »GNU General Public License« halten, so "
+"wie sie von der Free Software Foundation festgelegt wurden; entweder in "
+"Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder neueren Lizenz."
#: ../src/empathy-about-dialog.c:85
msgid ""
@@ -3054,10 +3059,10 @@ msgid ""
"details."
msgstr ""
"Empathy wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
-"jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der "
-"VERKAUFBARKEIT oder der NUTZBARKEIT FÃœR EINEN SPEZIELLEN ZWECK. Schauen Sie "
-"für weitere Informationen bitte in der GNU General Public License (GNU GPL) "
-"nach."
+"jedoch OHNE JEGLICHE GARANTIE, sogar ohne eine implizite Garantie der "
+"VERKAUFBARKEIT oder der VERWENDBARKEIT FÃœR EINEN SPEZIELLEN ZWECK. Schauen "
+"Sie für weitere Informationen bitte in der »GNU General Public License« (GNU "
+"GPL) nach."
#: ../src/empathy-about-dialog.c:89
msgid ""
@@ -3065,8 +3070,8 @@ msgid ""
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr ""
-"Mit Empathy sollten Sie außerdem eine Kopie der GNU General Public License "
-"erhalten haben. Wenn dem nicht so ist, so schreiben Sie bitte an die Free "
+"Mit Empathy sollten Sie außerdem eine Kopie der »GNU General Public License« "
+"erhalten haben. Wenn dem nicht so ist, schreiben Sie bitte an die Free "
"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
"02110-1301, USA."
@@ -3129,7 +3134,7 @@ msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto »%s« vorhanden."
msgid "Your new account has not been saved yet."
msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Verbindung wird aufgebaut …"
@@ -3169,20 +3174,20 @@ msgstr "Abgemeldet — Konto ist deaktiviert"
msgid "Edit Connection Parameters"
msgstr "Verbindungsparameter bearbeiten"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "V_erbindungsparameter bearbeiten …"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Möchten Sie %s wirklich von Ihrem Rechner entfernen?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3192,24 +3197,24 @@ msgstr ""
"fortfahren möchten?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "A_ktiviert"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Umbenennen"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "Ü_berspringen"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Verbinden"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3219,7 +3224,7 @@ msgstr ""
"fortfahren möchten?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Sofortnachrichten- und VoIP-Konten"
@@ -3280,11 +3285,15 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "Im Gespräch"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy Audio/Video-Client"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy Audio/Video-Client"
@@ -3296,31 +3305,31 @@ msgstr ""
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Eingehender Anruf"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Eingehender Video-Anruf von %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Eingehender Anruf von %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Abweisen"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3328,61 +3337,61 @@ msgstr "Antworten"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Mit %s anrufen"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "Die von der Maschine gesehene IP-Adresse"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "Die von einem Server im Internet gesehene IP-Adresse"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr ""
"Die IP-Adresse des Kommunikationspartners, wie von der anderen Seite gesehen"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "Die IP-Adresse eines Relay-Servers"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "Die IP-Adresse der Multicast-Gruppe"
-#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
-#: ../src/empathy-call-window.c:2527 ../src/empathy-call-window.c:2528
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Unbekannt"
-#: ../src/empathy-call-window.c:2877
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "In Warteschleife"
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "Stumm"
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "Dauer"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2886
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "Technische Details"
-#: ../src/empathy-call-window.c:3021
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3391,7 +3400,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Audioformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:3026
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3400,7 +3409,7 @@ msgstr ""
"Die Software von %s unterstützt keines der Videoformate, die von Ihrem "
"Rechner unterstützt werden"
-#: ../src/empathy-call-window.c:3032
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3409,25 +3418,25 @@ msgstr ""
"Mit %s kann keine Verbindung hergestellt werden. Eventuell verhindert das "
"Netzwerk des Gegenüber oder Ihres direkte Verbindungen."
-#: ../src/empathy-call-window.c:3038
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Es gab im Netzwerk einen Fehler"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3124
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem "
"Rechner installiert"
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-call-window.c:3127
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem "
"Rechner installiert"
-#: ../src/empathy-call-window.c:3057
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3438,32 +3447,32 @@ msgstr ""
"\">berichten Sie diesen Fehler</a> und fügen Sie die Protokollmeldungen aus "
"dem Fenster »Fehlerdiagnose« im Menü »Hilfe« anbei."
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "Es gab einen Fehler im Anrufsystem"
-#: ../src/empathy-call-window.c:3069
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Das Ende des Datenstroms wurde erreicht"
-#: ../src/empathy-call-window.c:3109
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "Es kann kein Audio-Strom aufgebaut werden"
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "Es kann kein Video-Strom aufgebaut werden"
-#: ../src/empathy-call-window.c:3156
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "Ihr aktuelles Guthaben beträgt %s."
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Sie haben nicht genügend Guthaben, um diesen Anruf zu tätigen"
-#: ../src/empathy-call-window.c:3162
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Aufladen"
@@ -3500,74 +3509,82 @@ msgid "_Debug"
msgstr "Fehler_diagnose"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Kamera tauschen"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimieren"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maximieren"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Kamera deaktivieren"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Auflegen"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Den aktuellen Anruf auflegen"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Videoanruf"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Einen Video-Anruf starten"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Einen Audio-Anruf starten"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Wählfeld anzeigen"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
-msgstr "Das Wählefeld anzeigen"
+msgstr "Das Wählfeld anzeigen"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Videoübertragung ein-/ausschalten"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Tonübertragung ein-/ausschalten"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Codec zum Enkodieren:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Codec zum Dekodieren:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Entfernter Kandidat:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Lokaler Kandidat:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Audio"
@@ -3591,11 +3608,11 @@ msgstr "Auto-Verbinden"
msgid "Manage Favorite Rooms"
msgstr "Raumfavoriten verwalten"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Dieses Fenster schließen?"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3604,7 +3621,7 @@ msgstr ""
"Durch Schließen dieses Fenster verlassen Sie %s. Sie erhalten keine weiteren "
"Nachrichten, bevor Sie sich nicht erneut anmelden."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3619,12 +3636,12 @@ msgstr[1] ""
"Durch Schließen dieses Fenster verlassen Sie %u Chaträume. Sie erhalten "
"keine weiteren Nachrichten, bis Sie diese erneut betreten."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "%s verlassen?"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3632,54 +3649,54 @@ msgstr ""
"Sie erhalten keine weiteren Nachrichten aus diesem Chatraum, bis Sie ihn "
"erneut betreten."
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Fenster schließen"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Raum verlassen"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ungelesen)"
msgstr[1] "%s (%d ungelesen)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (und %u weitere)"
msgstr[1] "%s (und %u weitere)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d von anderen ungelesen)"
msgstr[1] "%s (%d von anderen ungelesen)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d von allen nicht gelesen)"
msgstr[1] "%s (%d von allen nicht gelesene)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "%d Nachricht wird gesendet"
msgstr[1] "%d Nachrichten werden gesendet"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Schreibt eine Nachricht."
@@ -3773,63 +3790,82 @@ msgstr ""
"Die Daten sind für einen einzigen Einfügevorgang zu groß. Bitte speichern "
"Sie das Protokoll in einer Datei."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Fehlerdiagnosefenster"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "An Pastebin senden"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Stufe"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Fehlerdiagnose"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Nachricht"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Warnung"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Kritisch"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Fehler"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Obwohl sie keine Passwörter anzeigen, können Protokolle sensible "
+"Informationen enthalten, wie eine Liste Ihrer Kontakte oder die Nachrichten, "
+"die Sie zuletzt verschickt oder empfangen haben.\n"
+"Falls Sie diese Informationen nicht in einem öffentlichen Fehlerbericht "
+"wiederfinden möchten, können Sie diesen nur für die Empathy-Entwickler "
+"sichtbar machen, wenn Sie Ihn einreichen, indem Sie die erweiterten Felder "
+"im <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy"
+"\">Fehlerbericht</a> einblenden."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Zeit"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domäne"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategorie"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Stufe"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4253,7 +4289,7 @@ msgstr "Gruppen anzeigen"
msgid "Show account balances"
msgstr "Kontenguthaben anzeigen"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "Kontaktliste"
@@ -4440,47 +4476,65 @@ msgstr ""
"Verzeihung, %s Kontakte können nicht benutzt werden, bis Ihre %s-Software "
"aktualisiert wird."
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:617
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:621
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:636
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "Das %s-Konto benötigt eine Legitimierung"
+
+#: ../src/empathy-roster-window.c:647
+msgid "Online Accounts"
+msgstr "Online-Konten"
+
+#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "Software aktualisieren …"
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "Erneut verbinden"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "Konto bearbeiten"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "Schließen"
-#: ../src/empathy-roster-window.c:787
+#: ../src/empathy-roster-window.c:846
msgid "Top up account"
msgstr "Guthaben dieses Kontos aufladen"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
msgstr ""
"Sie müssen eines Ihrer Konten aktivieren, um hier Kontakte anzeigen zu "
"können."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1536
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Sie müssen %s aktivieren, um hier Kontakte anzeigen zu können."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1614
msgid "Change your presence to see contacts here"
msgstr "Ändern Sie Ihre Sichtbarkeit, um hier die Kontakte zu sehen"
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1623
msgid "No match found"
msgstr "Keine Ãœbereinstimmung gefunden"
-#: ../src/empathy-roster-window.c:1569
+#: ../src/empathy-roster-window.c:1628
msgid "No online contacts"
msgstr "Keine Online-Kontakte"
diff --git a/po/el.po b/po/el.po
index 95d6b9d0c..278ab7efa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,22 +9,23 @@
# Michael Kotsarinis <mk73628@gmail.com>, 2011.
# Simos Xenitellis <simos@gnome.org>, 2010, 2011.
# George Stefanakis <george.stefanakis@gmail.com>, 2011.
-#
+# Dimitris Spingos (ΔημήτÏης Σπίγγος) <dmtrs32@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: empathy.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-10-02 10:05+0200\n"
-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
-"Language-Team: Greek <team@gnome.gr>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-11-05 20:00+0000\n"
+"PO-Revision-Date: 2012-12-23 19:09+0300\n"
+"Last-Translator: Dimitris Spingos (ΔημήτÏης Σπίγγος) <dmtrs32@gmail.com>\n"
+"Language-Team: team@gnome.gr\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Virtaal 0.5.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -46,6 +47,10 @@ msgstr ""
"Συζητήστε στα Google Talk, Facebook, MSN και σε πολλές άλλες υπηÏεσίες "
"συζητήσεων"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "συνομιλία·συζήτηση·im·μήνυμα·irc·voip·gtalk·facebook·jabber·"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Îα χÏησιμοποιοÏνται οι εφαÏμογές διαχείÏισης συνδέσεων"
@@ -798,7 +803,7 @@ msgstr "Γειτονικά άτομα"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "Google Talk"
@@ -904,7 +909,7 @@ msgstr "ΕξυπηÏετητής"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "ΘÏÏα"
@@ -1551,7 +1556,7 @@ msgstr "δεν υποστηÏίζεται"
msgid "unknown"
msgstr "άγνωστο"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Θέμα:"
@@ -1665,9 +1670,9 @@ msgstr "Ο/Η %s ονομάζεται πλέον %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2648
+#: ../src/empathy-call-window.c:2954 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Εκτός σÏνδεσης"
@@ -1987,47 +1992,47 @@ msgstr ""
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Επιλέξτε το λογαÏιασμό Ï€Ïος χÏήση για Ï€Ïαγματοποίηση κλήσης"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Κλήση"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Κινητό τηλέφωνο"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "ΕÏγασία"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "ΑΡΧΗ"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "Îœ_πλοκάÏισμα επαφής"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "ΔιαγÏαφή και μ_πλοκάÏισμα"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "ΣίγουÏα θέλετε να διαγÏάψετε την επαφή '%s';"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2036,75 +2041,75 @@ msgstr ""
"Θέλετε Ï€Ïάγματι να αφαιÏέσετε τη μετα-επαφή '%s'; Σημειώστε ότι αυτό θα "
"αφαιÏέσει όλες τις επαφές που απαÏτίζουν αυτή τη μετα-επαφή."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "ΔιαγÏαφή επαφής"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_ΔιαγÏαφή"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Συζήτηση"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Φωνητική κλήση"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Βιντεοκλήση"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_ΠÏοηγοÏμενες συζητήσεις"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Αποστολή αÏχείου"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Κοινή χÏήση της επιφάνειας εÏγασίας μου"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Αγαπημένο"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "ΠληÏοφο_Ïίες"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_ΕπεξεÏγασία"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "ΠÏόσκληση στο δωμάτιο"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_ΠÏόσκληση στο δωμάτιο συζήτησης"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "ΠÏοσ_θήκη επαφής…"
@@ -2283,7 +2288,7 @@ msgstr "Επιλογή"
msgid "new server"
msgstr "νέος εξυπηÏετητής"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2463,12 +2468,12 @@ msgid "Profile"
msgstr "ΠÏοφίλ"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Συζήτηση"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Βίντεο"
@@ -2996,7 +3001,6 @@ msgid "Vietnamese"
msgstr "Βιετναμέζικα"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "ΚοÏυφαίες επαφές"
@@ -3055,10 +3059,11 @@ msgstr "Αποστολέας άμεσων μηνυμάτων για το GNOME"
msgid "translator-credits"
msgstr ""
"Ελληνική μεταφÏαστική ομάδα GNOME\n"
-"ΧÏήστος ΤÏοχαλάκης <yatiohi@ideopolis.gr>\n"
-"ΔημήτÏης Γλέζος <dimitris@glezos.com>\n"
-"Îίκος Αγιαννιώτης <nickagian@gmail.com>\n"
-"Τζένη ΠετοÏμενου <epetoumenou@gmail.com>\n"
+" ΔημήτÏης Σπίγγος <dmtrs32@gmail.com>\n"
+" ΧÏήστος ΤÏοχαλάκης <yatiohi@ideopolis.gr>\n"
+" ΔημήτÏης Γλέζος <dimitris@glezos.com>\n"
+" Îίκος Αγιαννιώτης <nickagian@gmail.com>\n"
+" Τζένη ΠετοÏμενου <epetoumenou@gmail.com>\n"
"\n"
"Για πεÏισσότεÏα δείτε http://www.gnome.gr/"
@@ -3104,7 +3109,7 @@ msgstr "ΥπάÏχουν μη αποθηκευμένες αλλαγές στο Î
msgid "Your new account has not been saved yet."
msgstr "Ο νέος λογαÏιασμός δεν έχει αποθηκευτεί ακόμη."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Γίνεται σÏνδεση…"
@@ -3144,20 +3149,20 @@ msgstr "Εκτός σÏνδεσης — απενεÏγοποιημένος λοÎ
msgid "Edit Connection Parameters"
msgstr "ΕπεξεÏγασία παÏαμέτÏων της σÏνδεσης"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_ΕπεξεÏγασία παÏαμέτÏων της σÏνδεσης"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Θέλετε να διαγÏάψετε το '%s' από τον υπολογιστή;"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Ο λογαÏιασμός σας δε θα διαγÏαφεί από τον εξυπηÏετητή."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3166,24 +3171,24 @@ msgstr ""
"οι αλλαγές σας. ΣίγουÏα θέλετε να συνεχίσετε;"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_ΕνεÏγοποιημένο"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Μετονομασία"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "ΠαÏάλει_ψη"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "ΣÏν_δεση"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3192,7 +3197,7 @@ msgstr ""
"οι αλλαγές σας. ΣίγουÏα θέλετε να συνεχίσετε;"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "ΛογαÏιασμοί μηνυμάτων και τηλεφωνίας"
@@ -3253,11 +3258,16 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "Σε μια κλήση"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- ΣÏστημα εικόνας/ήχου Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "ΣÏστημα εικόνας/ήχου Empathy"
@@ -3268,31 +3278,31 @@ msgstr "Λάβατε κλήση από %s αλλά ήσασταν σε άλλη
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "ΕισεÏχόμενη κλήση"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "ΕισεÏχόμενη βιντεοκλήση από: %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "ΕισεÏχόμενη κλήση από: %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "ΑπόÏÏιψη"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3300,60 +3310,60 @@ msgstr "Απάντηση"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Κλήση: %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "Η διεÏθυνση IP όπως τη βλέπει το μηχάνημα"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "Η διεÏθυνση IP όπως τη βλέπει ένας διακομιστής στο διαδίκτυο"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "Η διεÏθυνση IP της ομότιμης σÏνδεσης όπως τη βλέπει η άλλη πλευÏά"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "Η διεÏθυνση IP ενός διακομιστή συζητήσεων"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "Η διεÏθυνση IP μιας ομάδας πολλαπλής αναμετάδοσης (multicast)"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Άγνωστο"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2952
msgid "On hold"
msgstr "Σε αναμονή"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2956
msgid "Mute"
msgstr "Σίγαση"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2958
msgid "Duration"
msgstr "ΔιάÏκεια"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2961
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3057
msgid "Technical Details"
msgstr "Τεχνικές λεπτομέÏειες"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3096
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3362,7 +3372,7 @@ msgstr ""
"Το λογισμικό του %s δεν υποστηÏίζει καμία από τις μοÏφές ήχου που "
"υποστηÏίζει ο υπολογιστής σας"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3101
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3371,7 +3381,7 @@ msgstr ""
"Το λογισμικό του %s δεν υποστηÏίζει καμία από τις μοÏφές βίντεο που "
"υποστηÏίζει ο υπολογιστής σας"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3107
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3380,25 +3390,25 @@ msgstr ""
"Αδυναμία σÏνδεσης με %s. Ένας από εσάς μποÏεί να χÏησιμοποιεί δίκτυο που δεν "
"επιτÏέπει άμεσες συνδέσεις."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3113
msgid "There was a failure on the network"
msgstr "ΠαÏουσιάστηκε κώλυμα στο δίκτυο"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3117
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Δεν είναι εγκατεστημένη η υποστήÏιξη για τις μοÏφές ήχου που απαιτεί αυτή η "
"κλήση"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3120
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Δεν είναι εγκατεστημένη η υποστήÏιξη για τις μοÏφές βίντεο που απαιτεί αυτή "
"η κλήση"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3132
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3409,32 +3419,32 @@ msgstr ""
"ΠαÏακαλώ, κάνετε <a href=\"%s\">αναφοÏά του σφάλματος</a>, επισυνάπτοντας "
"τις καταγÏαφές από το παÏάθυÏο 'Αποσφαλμάτωση' του Î¼ÎµÎ½Î¿Ï Î’Î¿Î®Î¸ÎµÎ¹Î±."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3141
msgid "There was a failure in the call engine"
msgstr "Αποτυχία του Î¼Î·Ï‡Î±Î½Î¹ÏƒÎ¼Î¿Ï ÎºÎ»Î®ÏƒÎ·Ï‚"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3144
msgid "The end of the stream was reached"
msgstr "Έχει φθάσει στο τέλος της Ïοής"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3184
msgid "Can't establish audio stream"
msgstr "Αδυναμία δημιουÏγίας Ïοής ήχου"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3194
msgid "Can't establish video stream"
msgstr "Αδυναμία δημιουÏγίας Ïοής βίντεο"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3231
#, c-format
msgid "Your current balance is %s."
msgstr "Το Ï„Ïέχον υπόλοιπο είναι %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3235
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Συγγνώμη, δεν έχετε αÏκετές μονάδες γι' αυτή τη κλήση."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3237
msgid "Top Up"
msgstr "Γέμισμα"
@@ -3471,78 +3481,86 @@ msgid "_Debug"
msgstr "Αποσφα_λμάτωση"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Αλλαγή κάμεÏας"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Ελαχιστοποίηση"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Μεγιστοποίηση"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "ΑπενεÏγοποίηση κάμεÏας"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "ΤεÏματισμός κλήσης"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "ΤεÏματισμός Ï„Ïέχουσας κλήσης"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Βιντεοκλήση"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "ΈναÏξη βιντεοκλήσης"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "ΈναÏξη φωνητικής κλήσης"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "ΠÏοβολή του καντÏάν τηλ/νου"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Εμφάνισε το καντÏάν τηλ/νου"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Εναλλαγή της αποστολής βίντεο"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Εναλλαγή της δυνατότητας αποστολής ήχου"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Κωδικοποιητής κωδικοποίησης:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Κωδικοποιητής Αποκωδικοποίησης:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "ΑπομακÏυσμένος υποψήφιος:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Τοπικός υποψήφιος:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Ήχος"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- ΠÏόγÏαμμα συζητήσεων Empathy"
@@ -3562,11 +3580,11 @@ msgstr "Αυτόματη ΣÏνδεση"
msgid "Manage Favorite Rooms"
msgstr "ΔιαχείÏιση αγαπημένων δωματίων"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Κλείσιμο του παÏαθÏÏου;"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3575,7 +3593,7 @@ msgstr ""
"Κλείνοντας αυτό το παÏάθυÏο θα εγκαταλείψετε το %s. Δεν θα λαμβάνετε "
"πεÏαιτέÏω μηνÏματα μέχÏι να επανέλθετε."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3590,12 +3608,12 @@ msgstr[1] ""
"Κλείνοντας αυτό το παÏάθυÏο θα εγκαταλείψετε %u δωμάτια. Δεν θα λαμβάνετε "
"πεÏαιτέÏω μηνÏματα μέχÏι να επανέλθετε."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Εγκατάλειψη %s;"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3603,54 +3621,54 @@ msgstr ""
"Δεν θα λάβετε πεÏαιτέÏω μηνÏματα από αυτό το δωμάτιο συνομιλίας μέχÏι να "
"επανέλθετε."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Κλείσιμο παÏαθÏÏου"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Εγκατάλειψη δωματίου"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d μη αναγνωσμένο)"
msgstr[1] "%s (%d μη αναγνωσμένα)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (και %u άλλο)"
msgstr[1] "%s (και %u άλλα)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d μη αναγνωσμένο από άλλους)"
msgstr[1] "%s (%d μη αναγνωσμένα από άλλους)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d μη αναγνωσμένο από κανένα)"
msgstr[1] "%s (%d μη αναγνωσμένα από κανένα)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Αποστολή %d μηνÏματος"
msgstr[1] "Αποστολή %d μηνυμάτων"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "ΓÏάφει μήνυμα."
@@ -3744,63 +3762,83 @@ msgstr ""
"ΠάÏα πολλά δεδομένα για Ï€Ïοσθήκη στο Ï€ÏόχειÏο. ΠαÏακαλοÏμε αποθηκεÏσετε τα "
"αÏχεία καταγÏαφής σε αÏχείο."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "ΠαÏάθυÏο αποσφαλμάτωσης"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Αποστολή στο pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "ΠαÏση"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Επίπεδο"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Αποσφαλμάτωση"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "ΠληÏοφοÏίες"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Μήνυμα"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "ΠÏοειδοποίηση"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "ΚÏίσιμο"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Σφάλμα"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Ακόμα κι αν δεν εμφανίζουν κωδικοÏÏ‚ Ï€Ïόσβασης, οι καταγÏαφές μποÏεί να "
+"πεÏιέχουν ευαίσθητες πληÏοφοÏίες όπως τη λίστα των επαφών σας ή τα μηνÏματα "
+"που στείλατε ή δεχτήκατε Ï€Ïόσφατα.\n"
+"Εάν δεν θέλετε να δείτε τέτοιες πληÏοφοÏίες διαθέσιμες σε μια δημόσια "
+"αναφοÏά σφάλματος, μποÏείτε να επιλέξετε να πεÏιοÏίσετε την οÏατότητα του "
+"σφάλματός σας στους Ï€ÏογÏαμματιστές του Empathy, όταν το αναφέÏετε "
+"εμφανίζοντας τα Ï€ÏοχωÏημένα πεδία στην <a "
+"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">αναφοÏά "
+"σφάλματος</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "ÎÏα"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Τομέας"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "ΚατηγοÏία"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Επίπεδο"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4221,7 +4259,7 @@ msgstr "Εμφάνιση ομάδων"
msgid "Show account balances"
msgstr "ΠÏοβολή υπολοίπου του λογαÏιασμοÏ"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "Λίστα επαφών"
@@ -4396,57 +4434,77 @@ msgstr "Δώστε συνθηματικό"
msgid "Disconnect"
msgstr "ΑποσÏνδεση"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:441
msgid "You need to setup an account to see contacts here."
msgstr "ΠÏέπει να Ïυθμίσετε ένα λογαÏιασμό για να δείτε τις επαφές σας εδώ."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:517
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Συγνώμη, οι λογ/μοι %s δεν μποÏοÏν να χÏησιμοποιηθοÏν έως ότου ενημεÏωθεί το "
"λογισμικό %s."
+#: ../src/empathy-roster-window.c:617
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:621
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
#: ../src/empathy-roster-window.c:636
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "ο λογαÏιασμός %s απαιτεί εξουσιοδότηση"
+
+#: ../src/empathy-roster-window.c:647
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "Διαδικτυακοί λογαÏιασμοί"
+
+#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "ΕνημέÏωση λογισμικοÏ..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "ΕπανασÏνδεση"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "ΕπεξεÏγασία λογαÏιασμοÏ"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "Κλείσιμο"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:846
msgid "Top up account"
msgstr "ΠÏοσθήκη πίστωσης λογαÏιασμοÏ"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
msgstr ""
"ΠÏέπει να ενεÏγοποιήσετε ένα λογαÏιασμό για να δείτε τις επαφές σας εδώ."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1536
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "ΠÏέπει να ενεÏγοποιήσετε το %s για να δείτε τις επαφές σας εδώ."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1614
msgid "Change your presence to see contacts here"
msgstr "Αλλάξτε την κατάστασης σας για να δείτε τις επαφές εδώ"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1623
msgid "No match found"
msgstr "Δε βÏέθηκε αντιστοιχία"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1628
msgid "No online contacts"
msgstr "Καμία επαφή εντός σÏνδεσης"
diff --git a/po/es.po b/po/es.po
index ea322b6a8..184e36090 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,16 +9,16 @@ msgstr ""
"Project-Id-Version: empathy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-30 12:27+0200\n"
+"POT-Creation-Date: 2012-12-26 11:21+0000\n"
+"PO-Revision-Date: 2012-12-26 12:21+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"Language-Team: Español <gnome-es-list@gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -36,6 +36,11 @@ msgstr "Mensajería instantánea Empathy"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;hablar;im;mensajería instantánea;mensaje;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Se deberían usar gestores de conexión"
@@ -369,8 +374,8 @@ msgid ""
"Whether to send the 'composing' or 'paused' chat states. Does not currently "
"affect the 'gone' state."
msgstr ""
-"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta "
-"al estado «ausente»."
+"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al "
+"estado «ausente»."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
@@ -801,11 +806,11 @@ msgstr "Gente cerca"
msgid "Yahoo! Japan"
msgstr "Yahoo Japón"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:642
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Chat de Facebook"
@@ -907,7 +912,7 @@ msgstr "Servidor"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Puerto"
@@ -1471,8 +1476,8 @@ msgid ""
"join a new chat room\""
msgstr ""
"/say <mensaje>: enviar un <mensaje> a la conversación actual. Esto se usa "
-"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se "
-"usa para unirse a una sala de chat nueva»"
+"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
+"para unirse a una sala de chat nueva»"
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
@@ -1552,7 +1557,7 @@ msgstr "no implementado"
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Tema:"
@@ -1666,9 +1671,9 @@ msgstr "Ahora %s se llama %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Desconectado"
@@ -1985,47 +1990,47 @@ msgstr "Instale gnome-contacts para acceder a los detalles de los contactos."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Seleccionar la cuenta que usar para realizar la llamada"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Llamar"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Móvil"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Trabajo"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "Casa"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Bloquear contacto"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Eliminar y _bloquear"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "¿Realmente quiere quitar el contacto «%s»?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2034,75 +2039,75 @@ msgstr ""
"¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
"quitará todos los contactos que componen este contacto enlazado."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Quitando el contacto"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Quitar"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Chat"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Llamada de vo_z"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "Llamada de _vídeo"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "Conversaciones an_teriores"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Enviar archivo"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Compartir mi escritorio"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Favorita"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Invitar a sala de chat"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "_Añadir contacto…"
@@ -2281,7 +2286,7 @@ msgstr "Seleccionar"
msgid "new server"
msgstr "servidor nuevo"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2460,12 +2465,12 @@ msgid "Profile"
msgstr "Perfil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Chat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Vídeo"
@@ -2694,12 +2699,12 @@ msgstr "_Rechazar"
msgid "_Accept"
msgstr "_Aceptar"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "Mensaje editado a las %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "Normal"
@@ -2816,15 +2821,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Detalles personales</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Abrir enlace"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Inspeccionar HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Configuración regional actual"
@@ -2993,7 +3003,6 @@ msgid "Vietnamese"
msgstr "Vietnamita"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "Contactos favoritos"
@@ -3001,6 +3010,13 @@ msgstr "Contactos favoritos"
msgid "Ungrouped"
msgstr "Sin grupo"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "El servidor no puede encontrar el contacto: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Sin mensaje de eeror"
@@ -3094,7 +3110,7 @@ msgstr "Existen modificaciones sin guardar en su cuenta %s."
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Conectando…"
@@ -3134,20 +3150,20 @@ msgstr "Desconectado: cuenta desactivada"
msgid "Edit Connection Parameters"
msgstr "Editar los parámetros de la conexión"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Editar los parámetros de la conexión…"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "¿Quiere quitar %s de su equipo?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Esto no quitará su cuenta del servidor."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3156,24 +3172,24 @@ msgstr ""
"¿Seguro que quiere continuar?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Activada"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Renombrar"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Omitir"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Conectar"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3182,7 +3198,7 @@ msgstr ""
"¿Seguro que quiere continuar?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Cuentas de mensajería y Voz IP"
@@ -3243,11 +3259,15 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "En una llamada"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr ": Cliente de sonido/vídeo Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Cliente de sonido/vídeo Empathy"
@@ -3258,31 +3278,31 @@ msgstr "%s intentó llamarle, pero estaba en otra llamada."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "Información"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Llamada de vídeo entrante de %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Rechazar"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3290,60 +3310,60 @@ msgstr "Responder"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Llamada con %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "La dirección IP como la ve la máquina"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "La dirección IP como la ve el servidor de Internet"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "La dirección IP del par como la ve la otra parte"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "La dirección IP del grupo multicast"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Desconocido"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "En espera"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "Silenciar"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "DuracioÌn"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s: %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3352,7 +3372,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3361,7 +3381,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3370,25 +3390,25 @@ msgstr ""
"No se puede establecer una conexión con %s. Uno de los dos puede estar en "
"una red que no acepta conexiones directas."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3124
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de sonido necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3127
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de vídeo necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3399,32 +3419,32 @@ msgstr ""
"\">Informe de este error</a> y añada los registros obtenidos de la ventana "
"de «Depuración» en el menú de Ayuda."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "su balance actual es %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "No tiene crédito suficiente para hacer esta llamada."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Recargar"
@@ -3461,78 +3481,86 @@ msgid "_Debug"
msgstr "_Depurar"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Intercambiar cámara"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimizarme"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maximizarme"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Desactivar cámara"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Colgar"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Colgar la llamada actual"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Llamada de vídeo"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Iniciar una llamada de vídeo"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Iniciar una llamada de voz"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Mostrar teclado de llamada"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Mostrar el teclado de llamada"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Conmutar la transmisión de vídeo"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Conmutar la transmisión de voz"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Códec de codificación:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Códec de decodificación:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Candidato remoto:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Candidato local:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Sonido"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr ": Cliente de chat Empathy"
@@ -3552,11 +3580,11 @@ msgstr "Autoconectar"
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "¿Cerrar esta ventana?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3565,7 +3593,7 @@ msgstr ""
"Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que "
"se una de nuevo."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3580,65 +3608,65 @@ msgstr[1] ""
"Cerrar esta ventana hará que abandone %u salas de chat. No recibirá más "
"mensajes hasta que se una a ellas de nuevo."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "¿Cerrar %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Cerrar la ventana"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Abandonar la sala"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d sin leer)"
msgstr[1] "%s (%d sin leer)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (y otra)"
msgstr[1] "%s (y otras %u)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d sin leer de otros)"
msgstr[1] "%s (%d sin leer de otros)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d sin leer de todos)"
msgstr[1] "%s (%d sin leer de todos)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Enviando %d mensaje"
msgstr[1] "Enviando %d mensajes"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Tecleando un mensaje."
@@ -3732,63 +3760,82 @@ msgstr ""
"Datos demasiado largos para un pegado sencillo. Guarde el registro en un "
"archivo."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Depurar ventana"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Enviar a pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pausar"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Depurar"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Mensaje"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Advertencia"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Aunque no muestren contraseñas, los archivos de registro pueden contener "
+"información sensible como su lista de contactos o sus mensajes enviados o "
+"recibidos recientemente.\n"
+"Si no quiere que esta información esté disponible públicamente en un informe "
+"de error, puede elegir limitar la visibilidad de su informe a los "
+"desarrolladores de Empathy al enviar el informe, mostrando los campos "
+"avanzados del <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy\">informe de error</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3855,7 +3902,7 @@ msgstr "Le han invitado a unirse a %s"
msgid "Incoming file transfer from %s"
msgstr "Transferencia de archivo entrante de %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Se requiere una contraseña"
@@ -4210,7 +4257,7 @@ msgstr "Mostrar grupos"
msgid "Show account balances"
msgstr "Mostrar los balances de las cuentas"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2202
msgid "Contact List"
msgstr "Lista de contactos"
@@ -4377,64 +4424,86 @@ msgstr "Variante:"
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Escriba su contraseña"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:464
msgid "You need to setup an account to see contacts here."
msgstr "Debe configurar una cuenta para ver contactos aquí."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:540
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Las cuentas de %s no se pueden usar hasta que no se haya actualizado su "
"software de %s."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:640
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:644
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:659
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "La cuenta de %s requiere autorización"
+
+#: ../src/empathy-roster-window.c:670
+msgid "Online Accounts"
+msgstr "Cuentas en liÌnea"
+
+#: ../src/empathy-roster-window.c:717
msgid "Update software..."
msgstr "Actualizar software…"
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:723
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:727
msgid "Edit Account"
msgstr "Editar cuenta"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:732
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:869
msgid "Top up account"
msgstr "Recargar cuenta"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1551
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Debe activar una de sus cuentas para ver contactos aquí."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1559
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Debe activar %s para ver contactos aquiÌ."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1637
msgid "Change your presence to see contacts here"
msgstr "Cambie su presencia para ver contactos aquí"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1646
msgid "No match found"
msgstr "No se encontró ninguna coincidencia"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1653
+msgid "You haven't added any contact yet"
+msgstr "TodaviÌa no ha añadido ningún contacto"
+
+#: ../src/empathy-roster-window.c:1656
msgid "No online contacts"
msgstr "No hay contactos no conectados"
@@ -4511,6 +4580,16 @@ msgstr "Configuración de la cuenta"
msgid "Go _Online"
msgstr "Mostrarse _conectado"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "Mostrar contactos _desconectados"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Añadir contacto…"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "Conversación _nueva…"
@@ -4540,1067 +4619,3 @@ msgstr "Editar las opciones de la cuenta %s"
#: ../ubuntu-online-accounts/empathy.application.in.h:1
msgid "Integrate your IM accounts"
msgstr "Importar sus cuentas de mensajería instantánea"
-
-#~ msgid "Manage Messaging and VoIP accounts"
-#~ msgstr "Gestionar las cuentas de mensajería y Voz IP"
-
-#~ msgid "Failed to retrieve your personal information from the server."
-#~ msgstr "Falló al recuperar su información personal del servidor."
-
-#~ msgid "_Block User"
-#~ msgstr "_Bloquear usuario"
-
-#~ msgid "Decide _Later"
-#~ msgstr "Decidir _luego"
-
-#~ msgid "%A %B %d %Y"
-#~ msgstr "%A %d %B %Y"
-
-#~ msgid "Classic"
-#~ msgstr "Clásico"
-
-#~ msgid "Simple"
-#~ msgstr "Simple"
-
-#~ msgid "Clean"
-#~ msgstr "Limpio"
-
-#~ msgid "Blue"
-#~ msgstr "Azul"
-
-#~ msgid "Show avatars"
-#~ msgstr "Mostrar avatares"
-
-#~ msgid ""
-#~ "Whether to show avatars for contacts in the contact list and chat windows."
-#~ msgstr ""
-#~ "Indica si se deben mostrar los avatares para los contactos en la lista de "
-#~ "contactos y ventanas de chat."
-
-#~ msgid "Show protocols"
-#~ msgstr "Mostrar protocolos"
-
-#~ msgid "Whether to show protocols for contacts in the contact list."
-#~ msgstr ""
-#~ "Indica si se deben mostrar los protocolos para los contactos en la lista "
-#~ "de contactos."
-
-#~ msgid "Compact contact list"
-#~ msgstr "Lista compacta de contactos"
-
-#~ msgid "Whether to show the contact list in compact mode."
-#~ msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-
-#~ msgid "Contact list sort criterion"
-#~ msgstr "Criterio de ordenación de la lista de contactos"
-
-#~ msgid ""
-#~ "Which criterion to use when sorting the contact list. Default is to sort "
-#~ "by the contact's state with the value \"state\". A value of \"name\" will "
-#~ "sort the contact list by name."
-#~ msgstr ""
-#~ "Qué criterio usar al ordenar la lista de contactos. El predeterminado es "
-#~ "ordenar por el estado del contacto con el valor «state» (estado). Un "
-#~ "valor «nombre» (nombre) ordenará la lista por el nombre."
-
-#~ msgid "Send Video"
-#~ msgstr "Enviar vídeo"
-
-#~ msgid "Send Audio"
-#~ msgstr "Enviar voz"
-
-#~ msgid "Show protocol in avatar"
-#~ msgstr "Mostrar protocolo en el avatar"
-
-#~ msgid "Sort contacts by:"
-#~ msgstr "Ordenar contactos por:"
-
-#~ msgid "status"
-#~ msgstr "estado"
-
-#~ msgid "name"
-#~ msgstr "nombre"
-
-#~ msgid "Network:"
-#~ msgstr "Red:"
-
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
-#~ msgid "Contact Map View"
-#~ msgstr "Vista del mapa de contactos"
-
-#~ msgid "Top up %s (%s)..."
-#~ msgstr "Recargar %s (%s)…"
-
-#~ msgid "Top Up..."
-#~ msgstr "Recargar…"
-
-#~ msgid "_Offline Contacts"
-#~ msgstr "Contactos _desconectados"
-
-#~ msgid "Show P_rotocols"
-#~ msgstr "Mostrar p_rotocolos"
-
-#~ msgid "Credit Balance"
-#~ msgstr "Crédito"
-
-#~ msgid "Contacts on a _Map"
-#~ msgstr "Contactos en el _mapa"
-
-#~ msgid "Find in Contact _List"
-#~ msgstr "_Buscar en la lista de contactos"
-
-#~ msgid "Sort by _Name"
-#~ msgstr "Ordenar por _nombre"
-
-#~ msgid "Sort by _Status"
-#~ msgstr "Ordenar por es_tado"
-
-#~ msgid "Normal Size With _Avatars"
-#~ msgstr "Tamaño normal con _avatares"
-
-#~ msgid "N_ormal Size"
-#~ msgstr "Tamaño n_ormal"
-
-#~ msgid "_Compact Size"
-#~ msgstr "Tamaño _compacto"
-
-#~ msgid "_Join…"
-#~ msgstr "_Unirse…"
-
-#~ msgid "Appearance"
-#~ msgstr "Apariencia"
-
-#~ msgid "“%s†is not a valid contact ID"
-#~ msgstr "%s no es un identificador de contacto válido"
-
-#~ msgid "Could not start room listing"
-#~ msgstr "No se pudo iniciar la lista de la sala"
-
-#~ msgid "Could not stop room listing"
-#~ msgstr "No se pudo parar la lista de la sala"
-
-#~ msgid "Contrast"
-#~ msgstr "Contraste"
-
-#~ msgid "Brightness"
-#~ msgstr "Brillo"
-
-#~ msgid "Gamma"
-#~ msgstr "Gamma"
-
-#~ msgid "Volume"
-#~ msgstr "Volumen"
-
-#~ msgid "_Sidebar"
-#~ msgstr "Barra _lateral"
-
-#~ msgid "Audio input"
-#~ msgstr "Entrada de voz"
-
-#~ msgid "Video input"
-#~ msgstr "Entrada de vídeo"
-
-#~ msgid "Dialpad"
-#~ msgstr "Teclado de llamada"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgctxt "codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Connected — %d:%02dm"
-#~ msgstr "Conectado — %d:%02dm"
-
-#~ msgid "Redial"
-#~ msgstr "Volver a llamar"
-
-#~ msgid "V_ideo"
-#~ msgstr "Ví_deo"
-
-#~ msgid "Video Off"
-#~ msgstr "Vídeo apagado"
-
-#~ msgid "Video Preview"
-#~ msgstr "Vista preliminar del vídeo"
-
-#~ msgid "Video On"
-#~ msgstr "Vídeo encendido"
-
-#~ msgid "Call the contact again"
-#~ msgstr "Llamar de nuevo al contacto"
-
-#~ msgid "Camera Off"
-#~ msgstr "Cámara apagada"
-
-#~ msgid "Disable camera and stop sending video"
-#~ msgstr "Desactivar la cámara y dejar de enviar vídeo"
-
-#~ msgid "Preview"
-#~ msgstr "Vista previa"
-
-#~ msgid "Enable camera but don't send video"
-#~ msgstr "Activar la cámara pero no enviar vídeo"
-
-#~ msgid "Camera On"
-#~ msgstr "Cámara encendida"
-
-#~ msgid "Enable camera and send video"
-#~ msgstr "Activar la cámara y enviar vídeo"
-
-#~ msgid "_Enable"
-#~ msgstr "_Activar"
-
-#~ msgid "_Disable"
-#~ msgstr "_Desactivar"
-
-#~ msgid "There was an error while importing the accounts."
-#~ msgstr "Hubo un error al importar las cuentas."
-
-#~ msgid "There was an error while parsing the account details."
-#~ msgstr "Hubo un error al analizar los detalles de la cuenta."
-
-#~ msgid "There was an error while creating the account."
-#~ msgstr "Hubo un error al crear la cuenta."
-
-#~ msgid "There was an error."
-#~ msgstr "Hubo un error."
-
-#~ msgid "The error message was: %s"
-#~ msgstr "El mensaje de error fue: %s"
-
-#~ msgid ""
-#~ "You can either go back and try to enter your accounts' details again or "
-#~ "quit this assistant and add accounts later from the Edit menu."
-#~ msgstr ""
-#~ "Puede volver atrás e intentar introducir los detalles de su cuenta de "
-#~ "nuevo o salir de este asistente y añadir cuentas posteriormente desde el "
-#~ "menú Editar."
-
-#~ msgid "An error occurred"
-#~ msgstr "Ocurrió un error"
-
-#~ msgid "Do you have any other chat accounts you want to set up?"
-#~ msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-
-#~ msgid "What kind of chat account do you want to create?"
-#~ msgstr "¿Qué tipo de cuenta quiere crear?"
-
-#~ msgid "Do you want to create other chat accounts?"
-#~ msgstr "¿Quiere crear otras cuentas de chat?"
-
-#~ msgid "Enter the details for the new account"
-#~ msgstr "Introducir los detalles para la cuenta nueva"
-
-#~ msgid ""
-#~ "With Empathy you can chat with people online nearby and with friends and "
-#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
-#~ "programs. With a microphone or a webcam you can also have audio or video "
-#~ "calls."
-#~ msgstr ""
-#~ "Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
-#~ "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
-#~ "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
-
-#~ msgid "Do you have an account you've been using with another chat program?"
-#~ msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-
-#~ msgid "Yes, import my account details from "
-#~ msgstr "Sí, importar los detalles de mi cuenta desde "
-
-#~ msgid "Yes, I'll enter my account details now"
-#~ msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-
-#~ msgid "No, I want a new account"
-#~ msgstr "No, quiero crear una cuenta nueva"
-
-#~ msgid "No, I just want to see people online nearby for now"
-#~ msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-
-#~ msgid "Select the accounts you want to import:"
-#~ msgstr "Seleccione las cuentas que quiere importar:"
-
-#~ msgid "No, that's all for now"
-#~ msgstr "No, eso es todo por ahora"
-
-#~ msgid "Edit->Accounts"
-#~ msgstr "Editar->Cuentas"
-
-#~ msgid "I do _not want to enable this feature for now"
-#~ msgstr "_No quiero activar esta característica por ahora"
-
-#~ msgid ""
-#~ "You won't be able to chat with people connected to your local network, as "
-#~ "telepathy-salut is not installed. If you want to enable this feature, "
-#~ "please install the telepathy-salut package and create a People Nearby "
-#~ "account from the Accounts dialog"
-#~ msgstr ""
-#~ "No podrá chatear con las personas conectadas en su red local, ya que "
-#~ "telepathy-salut no está instalado. Si quiere activar esta característica "
-#~ "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde "
-#~ "el diálogo Cuentas."
-
-#~ msgid "telepathy-salut not installed"
-#~ msgstr "telepathy-salut no está instalado"
-
-#~ msgid "Messaging and VoIP Accounts Assistant"
-#~ msgstr "Asistente de cuentas de mensajería y Voz IP"
-
-#~ msgid "Welcome to Empathy"
-#~ msgstr "Bienvenido a Empathy"
-
-#~ msgid "Please enter personal details"
-#~ msgstr "Introduzca los detalles personales"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protocolo:"
-
-#~ msgid "Select contacts to link"
-#~ msgstr "Seleccionar contactos para enlazar"
-
-#~ msgid "New contact preview"
-#~ msgstr "Vista previa del contacto nuevo"
-
-#~ msgid "Contacts selected in the list on the left will be linked together."
-#~ msgstr ""
-#~ "Se enlazarán entre sí los contactos seleccionados en la lista de la "
-#~ "izquierda."
-
-#~ msgctxt "Link individual (contextual menu)"
-#~ msgid "_Link Contacts…"
-#~ msgstr "_Enlazar contactos…"
-
-#~ msgid "Link Contacts"
-#~ msgstr "Enlazar contactos"
-
-#~ msgctxt "Unlink individual (button)"
-#~ msgid "_Unlink…"
-#~ msgstr "_Desenlazar…"
-
-#~ msgid ""
-#~ "Completely split the displayed linked contacts into the separate contacts."
-#~ msgstr ""
-#~ "Separar completamente los contactos enlazados mostrados en contactos "
-#~ "separados."
-
-#~ msgid "_Link"
-#~ msgstr "_Enlazar"
-
-#~ msgid "Unlink linked contacts '%s'?"
-#~ msgstr "¿Desenlazar los contactos enlazados «%s»?"
-
-#~ msgid ""
-#~ "Are you sure you want to unlink these linked contacts? This will "
-#~ "completely split the linked contacts into separate contacts."
-#~ msgstr ""
-#~ "¿Está seguro de querer desenlazar estos contactos enlazados? Esto "
-#~ "separará completamente los contactos enlazados en contactos separados."
-
-#~ msgctxt "Unlink individual (button)"
-#~ msgid "_Unlink"
-#~ msgstr "_Desenlazar"
-
-#~ msgid "_Open new chats in separate windows"
-#~ msgstr "_Abrir charlas nuevas en ventanas separadas"
-
-#~ msgid "Personal Information"
-#~ msgstr "Información personal"
-
-#~ msgid "_Personal Information"
-#~ msgstr "Información p_ersonal"
-
-#~ msgid "Socket type not supported"
-#~ msgstr "El tipo de socket no está soportado"
-
-#~ msgid "My Web Accounts"
-#~ msgstr "Mis cuentas web"
-
-#~ msgid "The account %s is edited via %s."
-#~ msgstr "La cuenta %s se edita a través de %s."
-
-#~ msgid "The account %s cannot be edited in Empathy."
-#~ msgstr "No se puede editar la cuenta %s en Empathy."
-
-#~ msgid "Launch My Web Accounts"
-#~ msgstr "Lanzar My Web Accounts"
-
-#~ msgid "Edit %s"
-#~ msgstr "Editar %s"
-
-#~ msgid "Ca_ncel"
-#~ msgstr "Ca_ncelar"
-
-#~ msgctxt "Edit contact (contextual menu)"
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid ""
-#~ "You are about to create a new account, which will discard\n"
-#~ "your changes. Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "Va a crear una cuenta nueva que descartará sus cambios.\n"
-#~ "¿Seguro que quiere continuar?"
-
-#~ msgid "Call volume"
-#~ msgstr "Volumen de la llamada"
-
-#~ msgid "Call volume, as a percentage."
-#~ msgstr "Volumen de la llamada, como porcentaje"
-
-#~ msgid "Set your presence and current status"
-#~ msgstr "Establecer su presencia y estado actual"
-
-#~ msgid "Input level:"
-#~ msgstr "Nivel de entrada:"
-
-#~ msgid "Input volume:"
-#~ msgstr "Volumen de entrada:"
-
-#~ msgid "Contact ID:"
-#~ msgstr "ID del contacto:"
-
-#~ msgid "Favorite People"
-#~ msgstr "Gente favorita"
-
-#~ msgid "C_hat"
-#~ msgstr "C_hat"
-
-#~ msgid "Send _Video"
-#~ msgstr "Enviar _vídeo"
-
-#~ msgid "C_all"
-#~ msgstr "_Llamar"
-
-#~ msgid "Select a contact"
-#~ msgstr "Seleccionar un contacto"
-
-#~ msgid "The selected contact cannot receive files."
-#~ msgstr "El contacto seleccionado no puede recibir archivos."
-
-#~ msgid "The selected contact is offline."
-#~ msgstr "El contacto seleccionado está desconectado."
-
-#~ msgid "Empathy has migrated butterfly logs"
-#~ msgstr "Empathy ha migrado los registros de butterfly"
-
-#~ msgid "Whether Empathy has migrated butterfly logs."
-#~ msgstr "Indica si Empathy ha migrado los registros de butterfly."
-
-#~ msgctxt "encoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgctxt "encoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgctxt "decoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgctxt "decoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Find Next"
-#~ msgstr "Buscar siguiente"
-
-#~ msgid "Find Previous"
-#~ msgstr "Buscar anterior"
-
-#~ msgid "Show and edit accounts"
-#~ msgstr "Mostrar y editar cuentas"
-
-#~ msgid "Call with %d participants"
-#~ msgstr "Llamada con %d participantes"
-
-#~ msgid "_Dialpad"
-#~ msgstr "_Teclado de llamada"
-
-#~ msgid "Enter Custom Message"
-#~ msgstr "Introducir mensaje personalizado"
-
-#~ msgid "Save _New Status Message"
-#~ msgstr "Guardar mensaje de estado _nuevo"
-
-#~ msgid "Saved Status Messages"
-#~ msgstr "Mensajes de estado guardados"
-
-#~ msgid "All"
-#~ msgstr "Todo"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Conversations"
-#~ msgstr "Conversaciones"
-
-#~ msgid "Previous Conversations"
-#~ msgstr "Conversaciones anteriores"
-
-#~ msgid "_For:"
-#~ msgstr "_Para:"
-
-#~ msgid "%s is now offline."
-#~ msgstr "Ahora %s está desconectado."
-
-#~ msgid "%s is now online."
-#~ msgstr "Ahora %s está conectado."
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Add _New Preset"
-#~ msgstr "Añadir esta_do guardado"
-
-#~ msgid "Saved Presets"
-#~ msgstr "Estados guardados"
-
-#~ msgid "Subscription requested by %s"
-#~ msgstr "Petición de suscripción de %s"
-
-#~ msgid "The hash of the received file and the sent one do not match"
-#~ msgstr "El «hash» del archivo recibido y del enviado no coinciden"
-
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy le ha preguntado acerca de importar cuentas"
-
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr ""
-#~ "Indica si Empathy ha preguntado acerca de importar cuentas de otros "
-#~ "programas."
-
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "Usar _Yahoo! Japan"
-
-#~ msgctxt "Link individual (contextual menu)"
-#~ msgid "_Link…"
-#~ msgstr "_Enlazar…"
-
-#~ msgid "_Character set:"
-#~ msgstr "Conjunto de _caracteres:"
-
-#~ msgid "_E-mail address:"
-#~ msgstr "Dirección de correo-_e:"
-
-#~ msgid "_Nickname:"
-#~ msgstr "_Apodo:"
-
-#~ msgid "<b>Location</b>, "
-#~ msgstr "<b>Ubicación</b>, "
-
-#~ msgid "page 1"
-#~ msgstr "paÌgina 1"
-
-#~ msgid "page 3"
-#~ msgstr "paÌgina 3"
-
-#~ msgid "Your contact list is empty"
-#~ msgstr "Su lista de contactos está vacía"
-
-#~ msgid "Send and receive messages"
-#~ msgstr "Envíe y reciba mensajes instantáneos"
-
-#~ msgid "Select a destination"
-#~ msgstr "Seleccionar un destino"
-
-#~ msgid "Important Room"
-#~ msgstr "Sala importante"
-
-#~ msgid "MC 4 accounts have been imported"
-#~ msgstr "Se han importado las cuentas MC 4"
-
-#~ msgid "MC 4 accounts have been imported."
-#~ msgstr "Se han importado las cuentas MC 4."
-
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "Falló al reconectar a este chat"
-
-#~ msgid "%s account"
-#~ msgstr "Cuenta %s"
-
-#~ msgid "Hostname of the proxy for outbound requests."
-#~ msgstr "Nombre del equipo proxy para solicitudes salientes."
-
-#~ msgid ""
-#~ "Look up the DNS SRV record at the service's domain for the host name of a "
-#~ "STUN server."
-#~ msgstr ""
-#~ "Buscar el registro DNS SRV en el dominio del servicio para el nombre del "
-#~ "equipo del servidor STUN."
-
-#~ msgid "Port of the proxy for outbound requests."
-#~ msgstr "Puerto del proxy para solicitudes salientes."
-
-#~ msgid ""
-#~ "The username for SIP authentication, if different from the SIP URI\n"
-#~ "username."
-#~ msgstr ""
-#~ "El nombre de usuario para la autenticación SIP si es diferente del\n"
-#~ "nombre de usuario para el URI SIP."
-
-#~ msgid ""
-#~ "Update the registration binding if the external address for the client is "
-#~ "discovered to be different from the local binding."
-#~ msgstr ""
-#~ "Actualizar la vinculación del registro si se descubre que la dirección "
-#~ "externa para el cliente es diferente de la vinculación local."
-
-#~ msgid ""
-#~ "Use the loose routing behavior and the Route header as recommended in RFC "
-#~ "3261."
-#~ msgstr ""
-#~ "Usar comportamiento de enrutado impreciso y la cabecera de enrutado como "
-#~ "se recomienda en el RFC 3261."
-
-#~ msgid "_Add&#x2026;"
-#~ msgstr "_Añadir&#x2026;"
-
-#~ msgid "_Import&#x2026;"
-#~ msgstr "_Importar&#x2026;"
-
-#~ msgid "Whether the Salut account has been created on the first Empathy run."
-#~ msgstr ""
-#~ "Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez "
-#~ "Empathy."
-
-#~ msgid " Accounts"
-#~ msgstr " Cuentas"
-
-#~ msgid ""
-#~ "Try to import any recognized accounts and display an assistant if that "
-#~ "fails"
-#~ msgstr ""
-#~ "Intentar importar cualquier cuenta reconocida y mostrar un mensaje si "
-#~ "falla"
-
-#~ msgid "The error message was: <span style=\"italic\">%s</span>"
-#~ msgstr "El mensaje de error fue: <span style=\"italic\">%s</span>"
-
-#~ msgid "Hidden"
-#~ msgstr "Oculto"
-
-#~ msgid "%s is offering you an invitation"
-#~ msgstr "%s le está ofreciendo una invitación"
-
-#~ msgid "An external application will be started to handle it."
-#~ msgstr "Se iniciará una aplicación externa para manejarla."
-
-#~ msgid "You don't have the needed external application to handle it."
-#~ msgstr "No tiene la aplicación externa necesaria para manejarla."
-
-#~ msgid "Unable to start application for service %s: %s"
-#~ msgstr "No se pudo iniciar la aplicación para el servicio %s: %s"
-
-#~ msgid ""
-#~ "An invitation was offered for service %s, but you don't have the "
-#~ "application necessary to handle it"
-#~ msgstr ""
-#~ "Se le ha ofrecido una invitación para el servicio %s pero no tiene la "
-#~ "aplicación necesaria para manejarla"
-
-#~ msgid "<b>Location</b>"
-#~ msgstr "<b>Ubicación</b>"
-
-#~ msgid "Email:"
-#~ msgstr "Correo-e:"
-
-#~ msgid "Custom Message..."
-#~ msgstr "Mensaje personalizado…"
-
-#~ msgid "Edit Custom Messages..."
-#~ msgstr "Editar mensajes personalizados…"
-
-#~ msgid "Custom messages..."
-#~ msgstr "Mensajes personalizados…"
-
-#~ msgid "_Add..."
-#~ msgstr "_Añadir…"
-
-#~ msgid "_Import..."
-#~ msgstr "_Importar…"
-
-#~ msgid "Add new"
-#~ msgstr "Añadir nueva"
-
-#~ msgid "Cr_eate"
-#~ msgstr "Cr_ear"
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "_Usar una cuenta ya existente"
-
-#~ msgid "No error specified"
-#~ msgstr "No se especificó el error"
-
-#~ msgid "Unknown error"
-#~ msgstr "Error desconocido"
-
-#~ msgid "_Preferences"
-#~ msgstr "Prefere_ncias"
-
-#~ msgid "_View Previous Conversations"
-#~ msgstr "_Ver conversaciones previas"
-
-#~ msgid ""
-#~ "You are about to remove your %s account!\n"
-#~ "Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "Va a eliminar su cuenta %s\n"
-#~ "¿Seguro que quiere continuar?"
-
-#~ msgid ""
-#~ "Any associated conversations and chat rooms will NOT be removed if you "
-#~ "decide to proceed.\n"
-#~ "\n"
-#~ "Should you decide to add the account back at a later time, they will "
-#~ "still be available."
-#~ msgstr ""
-#~ "Cualquier conversación o sala de chat asociada NO se eliminará si decide "
-#~ "continuar.\n"
-#~ "\n"
-#~ "Si decidiera volver a añadir la cuenta más tarde, estarán aún disponibles."
-
-#~ msgid "Conversations (%d)"
-#~ msgstr "Conversaciones (%d)"
-
-#~ msgid "Can't set an empty display name"
-#~ msgstr "No se puede establecer ningún nombre para mostrar"
-
-#~ msgid "Unsupported command"
-#~ msgstr "Comando no soportado"
-
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
-#~ msgstr ""
-#~ "El contacto que mostrar en la miniaplicación. Si se deja vacío no se "
-#~ "mostrará ningún contacto."
-
-#~ msgid "The contact's avatar token. Empty means contact has no avatar."
-#~ msgstr ""
-#~ "El avatar del contacto. Si se deja vacío no se mostrará ningún avatar."
-
-#~ msgid "Talk!"
-#~ msgstr "Hablar"
-
-#~ msgid "_Information"
-#~ msgstr "_Información"
-
-#~ msgid "Please configure a contact."
-#~ msgstr "Configure un contacto."
-
-#~ msgid "Select contact..."
-#~ msgstr "Seleccione un contacto…"
-
-#~ msgid "Presence"
-#~ msgstr "Presencia"
-
-#~ msgid "Set your own presence"
-#~ msgstr "Establezca su propia presencia"
-
-#~ msgid "Contact Informations"
-#~ msgstr "Información del contacto"
-
-#~ msgid "Allow _GPS usage"
-#~ msgstr "Permitir el uso de _GPS"
-
-#~ msgid "Allow _cellphone usage"
-#~ msgstr "Permitir el uso de teléfono _móvil"
-
-#~ msgid "Allow _network usage"
-#~ msgstr "Permitir el uso de la _red"
-
-#~ msgid "Geoclue Settings"
-#~ msgstr "Configuración de Geoclue"
-
-#~ msgid "Add Account"
-#~ msgstr "Añadir cuenta"
-
-#~ msgid "Gmail"
-#~ msgstr "Gmail"
-
-#~ msgid "Import Accounts..."
-#~ msgstr "Importar cuentas…"
-
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
-
-#~ msgid "gtk-add"
-#~ msgstr "gtk-add"
-
-#~ msgid "gtk-remove"
-#~ msgstr "gtk-remove"
-
-#~ msgid "gtk-leave-fullscreen"
-#~ msgstr "gtk-leave-fullscreen"
-
-#~ msgid "- Empathy Instant Messenger"
-#~ msgstr "- Mensajería instantánea Empathy"
-
-#~ 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"
-
-#~ msgid "Show _avatars"
-#~ msgstr "Mostrar _avatares"
-
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Mostrar lista de contactos co_mpacta"
-
-#~ msgid "Adium"
-#~ msgstr "Adium"
-
-#~ msgid "Adium theme to use:"
-#~ msgstr "Tema adium que usar:"
-
-#~ msgid "Not a valid adium theme"
-#~ msgstr "No es un tema adium válido"
-
-#~ msgid "<b>Network</b>"
-#~ msgstr "<b>Red</b>"
-
-#~ msgid "<b>Servers</b>"
-#~ msgstr "<b>Servidores</b>"
-
-#~ msgid "<b>Contact</b>"
-#~ msgstr "<b>Contacto</b>"
-
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>Grupos</b>"
-
-#~ msgid "<b>Add Account</b>"
-#~ msgstr "<b>Añadir cuenta</b>"
-
-#~ msgid "New message from %s"
-#~ msgstr "Nuevo mensaje de %s"
-
-#~ msgid "File transfers"
-#~ msgstr "Transferencias de archivos"
-
-#~ msgid "<b>Contact List</b>"
-#~ msgstr "<b>Lista de contactos</b>"
-
-#~ msgid "Sélectionner un dossier"
-#~ msgstr "Seleccionar una carpeta"
-
-#~ msgctxt "file size"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "\"%s\" receiving from %s"
-#~ msgstr "«%s» recibiendo de %s"
-
-#~ msgid "\"%s\" sending to %s"
-#~ msgstr "«%s» enviando a %s"
-
-#~ msgid "File transfer canceled: %s"
-#~ msgstr "Transferencia de archivo cancelada: %s"
-
-#~ msgctxt "remaining time"
-#~ msgid "Stalled"
-#~ msgstr "Parado"
-
-#~ msgctxt "remaining time"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Cannot save file to this location"
-#~ msgstr "No se puede guardar el archivo en esta ubicación"
-
-#~ msgid "Save file as..."
-#~ msgstr "Guardar archivo como…"
-
-#~ msgid "unknown size"
-#~ msgstr "tamaño desconocido"
-
-#~ msgid "Do you want to accept the file \"%s\" (%s)?"
-#~ msgstr "¿Quiere aceptar el archivo «%s» (%s)?"
-
-#~ msgid "Show _File Transfers"
-#~ msgstr "Mostrar transferencias de _archivos"
-
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "Me gustaría añadirte a mi lista de contactos."
-
-#~ msgid "Sorry, I don't want you in my contact list anymore."
-#~ msgstr "Lo siento, no te quiero en mi lista de contactos."
-
-#~ msgctxt "menu item"
-#~ msgid "_Call"
-#~ msgstr "_Llamar"
-
-#~ msgid "_Check Word Spelling..."
-#~ msgstr "_Comprobar ortografía…"
-
-#~ msgid "Suggestions for the word"
-#~ msgstr "Sugerencias para la palabra"
-
-#~ msgid "Spell Checker"
-#~ msgstr "Corrector ortográfico"
-
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Sugerencias para la palabra:"
-
-#~ msgid "Forget password and clear the entry."
-#~ msgstr "Olvidar la contraseña y limpiar la entrada."
-
-#~ 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 "Invitation _message:"
-#~ msgstr "_Mensaje de invitación:"
-
-#~ 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 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"
-
-#~ msgid "End this call?"
-#~ msgstr "¿Finalizar esta llamada?"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "Cerrar esta ventana finalizará la llamada en progreso."
-
-#~ msgid "Readying"
-#~ msgstr "Preparándose"
-
-#~ msgid "Ringing"
-#~ msgstr "Llamando"
-
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "Llamada de %s rechazada porque ya hay una llamada en curso."
-
-#~ msgid "#"
-#~ msgstr "#"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>Teclado numérico</b>"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "Activar ventana emergente cuando un contacto está disponible"
-
-#~ msgid "Whether or not to show a popup when a contact becomes available."
-#~ msgstr ""
-#~ "Indica si se debe mostrar una ventana emergente cuando un contacto vuelva "
-#~ "a estar disponible."
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "Invitation Error"
-#~ msgstr "Error en la invitación"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "Activar sonido cuando se esté ocupado"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>Sonido</b>"
-
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>Visual</b>"
-
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "Activar sonidos cuando se esté _ocupado"
-
-#~ msgid "Configure Telepathy account settings"
-#~ msgstr "Configurar los ajustes de la cuenta Telepathy"
-
-#~ msgid ""
-#~ "To add a new account, you can click on the 'Add' button and a new entry "
-#~ "will be created for you to start configuring."
-#~ msgstr ""
-#~ "Para añadir una cuenta nueva, pulse en el botón 'Añadir' y se creará una "
-#~ "entrada nueva para que la configure."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Si no quiere añadir una cuenta, simplemente pulse en la cuenta que quiere "
-#~ "configurar en la lista de la izquierda."
-
-#~ msgid "<b>No Accounts Configured</b>"
-#~ msgstr "<b>No hay ninguna cuenta configurada</b>"
diff --git a/po/et.po b/po/et.po
index 8da3f88a2..6c5af2277 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: empathy MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-10-18 09:11+0000\n"
-"PO-Revision-Date: 2012-10-21 03:54+0300\n"
+"POT-Creation-Date: 2012-12-18 08:51+0000\n"
+"PO-Revision-Date: 2012-12-18 18:30+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
"Language-Team: Estonian <>\n"
"Language: et\n"
@@ -37,6 +37,9 @@ msgstr ""
"Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste "
"kaudu"
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "vestlus;jutukas;jututuba;kiirsõnumid;irc;voip;gtalk;facebook;jabber;"
+
msgid "Connection managers should be used"
msgstr "Kas peab ühenduste haldureid kasutama"
@@ -1828,11 +1831,11 @@ msgstr "Sisesta kontakti identifitseerif info või telefoninumber:"
#. add video button
msgid "_Video Call"
-msgstr "_Videovestlus"
+msgstr "_Videokõne"
#. add audio button
msgid "_Audio Call"
-msgstr "_Audiovestlus"
+msgstr "_Audiokõne"
#. Tweak the dialog
msgid "New Call"
@@ -2378,6 +2381,9 @@ msgstr ""
"\n"
"%s"
+msgid "In a call"
+msgstr "Kõne"
+
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy audio/video klient"
@@ -2544,6 +2550,12 @@ msgstr "_Sisukord"
msgid "_Debug"
msgstr "Si_lumine"
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
msgid "Swap camera"
msgstr "Kaamera vahetamine"
@@ -2786,6 +2798,22 @@ msgstr "Kriitiline"
msgid "Error"
msgstr "Viga"
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Isegi kui logides pole paroole, võivad need sisaldada tundlikke andmeid nagu "
+"kontaktide nimekiri või hiljuti saadetud ning vastuvõetud sõnumid.\n"
+"Kui sa ei taha selliseid andmeid näha avalikus vearaportis, võid raporti "
+"nähtavuse piirata ainult Empathy arendajatega, selleks vali <a href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">vearaporti</a> "
+"täpsemate sätete juures (advanced fields) vastav piirang."
+
msgid "Time"
msgstr "Aeg"
@@ -3270,6 +3298,20 @@ msgstr ""
"Vabandust, %s kontosid ei saa kasutada enne, kui sinu %s tarkvara on "
"uuendatud."
+msgid "Windows Live"
+msgstr "Windows Live"
+
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "Teenuse %s konto jaoks on vajalik autoriseerimine"
+
+msgid "Online Accounts"
+msgstr "Veebikontod"
+
msgid "Update software..."
msgstr "Tarkvara uuendamine..."
@@ -3377,38 +3419,3 @@ msgstr "Muuda %s konto valikuid"
msgid "Integrate your IM accounts"
msgstr "Integreeri oma IM kontod"
-
-#~ msgid "_GStreamer"
-#~ msgstr "_GStreamer"
-
-#~ msgid "_Telepathy"
-#~ msgstr "_Telepathy"
-
-#~ msgid ""
-#~ "Even if they don't display passwords, logs can contain sensible "
-#~ "information such as your list of contacts or the messages you recently "
-#~ "sent or received.\n"
-#~ "If you don't want to see such information available in a public bug "
-#~ "report, you can choose to limit the visibility of your bug to Empathy "
-#~ "developers when reporting it by displaying the advanced fields in the <a "
-#~ "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
-#~ "report</a>."
-#~ msgstr ""
-#~ "Isegi kui logides pole paroole, võivad need sisaldada tundlikke andmeid "
-#~ "nagu kontaktide nimekiri või hiljuti saadetud ning vastuvõetud sõnumid.\n"
-#~ "Kui sa ei taha selliseid andmeid näha avalikus vearaportis, võid raporti "
-#~ "nähtavuse piirata ainult Empathy arendajatega, selleks vali <a href="
-#~ "\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">vearaporti</"
-#~ "a> täpsemate sätete juures (advanced fields) vastav piirang."
-
-#~ msgid "Windows Live"
-#~ msgstr "Windows Live"
-
-#~ msgid "Facebook"
-#~ msgstr "Facebook"
-
-#~ msgid "%s account requires authorisation"
-#~ msgstr "Teenuse %s konto jaoks on vajalik autoriseerimine"
-
-#~ msgid "Online Accounts"
-#~ msgstr "Veebikontod"
diff --git a/po/gl.po b/po/gl.po
index eef695406..1245e94d6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-01 15:12+0200\n"
-"PO-Revision-Date: 2012-10-01 15:13+0200\n"
+"POT-Creation-Date: 2012-12-30 20:48+0100\n"
+"PO-Revision-Date: 2012-12-30 20:49+0200\n"
"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
"Language-Team: gnome-l10n-gl@gnome.org\n"
"Language: gl\n"
@@ -40,6 +40,10 @@ msgstr "Mensaxaría instantánea Empathy"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Converse en Google Talk, Facebook, MSN e moitos máis servizos de chat"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;conversa;mi;mensaxe;irc;voz ip;gtalk;facebook;jabber;"
+
# rever
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
@@ -900,11 +904,11 @@ msgstr "Xente cerca"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Conversa de Facebook"
@@ -1007,7 +1011,7 @@ msgstr "Servidor"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Porto"
@@ -1676,7 +1680,7 @@ msgstr "non implementado"
msgid "unknown"
msgstr "descoñecido"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:974
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Asunto:"
@@ -1795,9 +1799,9 @@ msgstr "%s agora é coñecido como %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Desconectado"
@@ -2138,7 +2142,7 @@ msgstr "Seleccione a conta a usar para realizar a chamada"
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Chamar"
@@ -2155,21 +2159,21 @@ msgid "HOME"
msgstr "Casa"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:667
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Bloquear contacto"
-#: ../libempathy-gtk/empathy-individual-menu.c:723
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Eliminar e _bloquear"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:785
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Está seguro de quere retirar o contacto '%s'?"
-#: ../libempathy-gtk/empathy-individual-menu.c:794
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2178,80 +2182,80 @@ msgstr ""
"Desexa retirar o contacto ligado %s? Teña en conta que se retirarán tamén "
"todos os contactos que conforman este contacto ligado."
-#: ../libempathy-gtk/empathy-individual-menu.c:805
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Retirando o contacto"
-#: ../libempathy-gtk/empathy-individual-menu.c:869
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Retirar"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1232
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Conversa"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1300
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Chamada de son"
-#: ../libempathy-gtk/empathy-individual-menu.c:1333
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videochamada"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1374
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "Conversas _previas"
-#: ../libempathy-gtk/empathy-individual-menu.c:1403
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Enviar ficheiro"
-#: ../libempathy-gtk/empathy-individual-menu.c:1433
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Compartir o meu escritorio"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1459
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Favorito"
-#: ../libempathy-gtk/empathy-individual-menu.c:1488
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-individual-menu.c:1537
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
# rever
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1653
-#: ../src/empathy-chat-window.c:1240
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1699
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "Conv_idar a sala de conversas"
# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1895
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "Eng_adir un contacto…"
@@ -2434,7 +2438,7 @@ msgstr "Seleccionar"
msgid "new server"
msgstr "servidor novo"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2614,12 +2618,12 @@ msgid "Profile"
msgstr "Perfíl"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Conversa"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "V_ídeo"
@@ -2865,12 +2869,12 @@ msgstr "_Rexeitar"
msgid "_Accept"
msgstr "_Aceptar"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "Mensaxe editado ás %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "Normal"
@@ -2995,15 +2999,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Detalles persoais</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Abrir a ligazón"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Inspeccionar HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Configuración rexional actual"
@@ -3180,6 +3189,14 @@ msgid "Ungrouped"
msgstr "Sen grupo"
# rever
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "O servidor non puido atopar o contacto: %s"
+
+# rever
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Non hai mensaxe de erro"
@@ -3285,7 +3302,7 @@ msgstr "Hai modificacións sen gardar respecto da súa conta %s."
msgid "Your new account has not been saved yet."
msgstr "A súa nova conta aínda non foi gardada."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Conectando…"
@@ -3325,22 +3342,22 @@ msgstr "Desconectado — Conta desactivada"
msgid "Edit Connection Parameters"
msgstr "Editar os parámetros da conexión"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Editar os parámetros da conexión…"
# rever
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Está seguro de que quere retirar o grupo '%s' do seu computador?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Isto non retirará a súa conta no servidor."
# rever
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3349,25 +3366,25 @@ msgstr ""
"Está seguro de que quere proceder?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Activado"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Renomear"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Omitir"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Conectar"
# rever
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3376,7 +3393,7 @@ msgstr ""
"Está seguro de que quere continuar?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxaría e Voz IP"
@@ -3444,11 +3461,16 @@ msgstr ""
"%s"
# rever
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "Nunha chamada"
+
+# rever
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Cliente de voz/vídeo Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Cliente de voz/vídeo Empathy"
@@ -3459,33 +3481,33 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "Información"
# rever
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Chamada entrante"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Videochamada entrante de %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Chamada entrante de %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Rexeitar"
# rever
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3493,62 +3515,62 @@ msgstr "Responder"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Chamada con %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP tal como o ve a máquina"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "O enderezo IP como é visto por un servidor na Internet"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "O enderezo IP do par como é visto pola outra parte"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "O enderezo IP do grupo multicast"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Descoñecido"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "En espera"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "Silenciar"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "Duración"
# rever
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
# rever
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3557,7 +3579,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3566,7 +3588,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3575,21 +3597,21 @@ msgstr ""
"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
"que non permite conexións directas."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3124
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados neste computador os formatos de son necesarios"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3127
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3600,32 +3622,32 @@ msgstr ""
"\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
"«Depuración» no menú Axuda."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "Produciuse un erro ao chamar ao motor"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de son"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "O seu crédito actual é %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Non ten crédito dabondo para facer esta chamada."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Recargar"
@@ -3662,79 +3684,87 @@ msgid "_Debug"
msgstr "_Depurar"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Intercambiar cámara"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimizarme"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maximizarme"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Desactivar cámara"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Colgar"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Colgar chamada actual"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Videochamada"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Iniciar unha videochamada"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Iniciar unha chamada de voz"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Mostrar teclado de chamada"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Mostrar o teclado de chamada"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Activar/desactivar transmisión de vídeo"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Activar/desactivar transmisión de son"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Códec de codificación:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Códec de decodificación:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Candidato remoto:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Candidato local:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Son"
# rever
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- Cliente de conversa Empathy"
@@ -3757,11 +3787,11 @@ msgid "Manage Favorite Rooms"
msgstr "Xestionar as salas favoritas"
# rever
-#: ../src/empathy-chat-window.c:282
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Pechar esta xanela?"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3770,7 +3800,7 @@ msgstr ""
"Se pecha esta xanela sairá de %s. Non recibirá máis mensaxes até que se una "
"de novo."
-#: ../src/empathy-chat-window.c:301
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3785,60 +3815,60 @@ msgstr[1] ""
"Se pecha esta xanela sairá de %u salas de conversas. Non recibirá máis "
"mensaxes até que se una de novo a elas."
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Saír de %s?"
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr ""
"Non recibirá máis mensaxes desta sala de conversas até que se volva unir."
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Pechar a xanela"
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Saír da sala"
-#: ../src/empathy-chat-window.c:672 ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d sen ler)"
msgstr[1] "%s (%d sen ler)"
-#: ../src/empathy-chat-window.c:687
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e outro %u)"
msgstr[1] "%s (e outros %u)"
-#: ../src/empathy-chat-window.c:703
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d sen ler de outros)"
msgstr[1] "%s (%d sen ler de outros)"
-#: ../src/empathy-chat-window.c:712
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d sen ler de todos)"
msgstr[1] "%s (%d sen ler de todos)"
-#: ../src/empathy-chat-window.c:949
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
# rever
-#: ../src/empathy-chat-window.c:957
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3846,7 +3876,7 @@ msgstr[0] "Enviando %d mensaxe."
msgstr[1] "Enviando %d mensaxes."
# rever
-#: ../src/empathy-chat-window.c:977
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Escribindo unha mensaxe."
@@ -3943,63 +3973,81 @@ msgid "Data too large for a single paste. Please save logs to file."
msgstr ""
"Datos demasiado longos para un pegado sinxelo. Garde o rexistro nun ficheiro."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Depurar xanela"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Enviar a pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pausa"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Depuración"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Mensaxe"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Aviso"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Erro"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Incluso se non mostra os contrasinais, os rexistros poden conter información "
+"sensíbel como a súa lista de contactos ou mensaxes que enviara ou recibira "
+"recentemente.\n"
+"Se non quere ver dita información dispoñíbel nun informe de erro público, "
+"pode limitar a visibilidade do seu informe de erro aos desenvolvedores de "
+"Empathy ao informalo mostrando os cambios avanzados do <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">informe de erro</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4076,7 +4124,7 @@ msgstr "Vostede foi convidado a unirse a %s"
msgid "Incoming file transfer from %s"
msgstr "Transferencia de ficheiro entrante de %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Requírese o contrasinal"
@@ -4457,7 +4505,7 @@ msgstr "Mostrar grupos"
msgid "Show account balances"
msgstr "Mostrar os balances das contas"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236
msgid "Contact List"
msgstr "Lista de contactos"
@@ -4639,66 +4687,88 @@ msgstr "Variante:"
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Escriba o seu contrasinal"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Debe configurar unha conta para ver contactos aquí."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"As contas de %s non se poden usar até que non teña actualizado o seu "
"software %s."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:669
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:688
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "A conta %s require autorización"
+
+#: ../src/empathy-roster-window.c:699
+msgid "Online Accounts"
+msgstr "Contas en liña"
+
+#: ../src/empathy-roster-window.c:746
msgid "Update software..."
msgstr "Actualizar software…"
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:752
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:756
msgid "Edit Account"
msgstr "Editar a conta"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:761
msgid "Close"
msgstr "Pechar"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:903
msgid "Top up account"
msgstr "Recargar conta"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1585
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Debe activar unha das súas contas para ver contactos aquí."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1593
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Debe activar %s para ver contactos aquí."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1671
msgid "Change your presence to see contacts here"
msgstr "Cambie a súa presencia para ver os contactos aquí"
# rever
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1680
msgid "No match found"
msgstr "Non se atopou ningunha coincidencia."
+#: ../src/empathy-roster-window.c:1687
+msgid "You haven't added any contact yet"
+msgstr "Non engadiu ningún contacto aínda"
+
# rever
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1690
msgid "No online contacts"
msgstr "Non hai contactos en liña"
@@ -4779,6 +4849,16 @@ msgstr "Configuración da conta"
msgid "Go _Online"
msgstr "C_onectarse"
+# rever
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Mostrar contactos _desconectados"
+
+# rever
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "_Engadir contacto…"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Nova conversa…"
@@ -5286,10 +5366,6 @@ msgstr "Integre as súas contas de MI"
#~ msgid "Favorite People"
#~ msgstr "Persoas favoritas"
-# rever
-#~ msgid "Select a contact"
-#~ msgstr "Seleccione un contacto"
-
#~ msgid "The selected contact cannot receive files."
#~ msgstr "O contacto seleccionado non pode recibir ficheiros."
@@ -5477,6 +5553,3 @@ msgstr "Integre as súas contas de MI"
#~ msgid "_Import&#x2026;"
#~ msgstr "_Importar&#x2026;"
-
-#~ msgid " Accounts"
-#~ msgstr " Contas"
diff --git a/po/he.po b/po/he.po
index 512b66cf6..6eaef79f2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-05 10:59+0200\n"
-"PO-Revision-Date: 2012-09-28 16:44+0200\n"
+"POT-Creation-Date: 2012-12-26 19:56+0200\n"
+"PO-Revision-Date: 2012-12-26 19:58+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"Language: \n"
@@ -33,17 +33,17 @@ msgstr "â€Empathy ×ž×¡×¨×™× ×ž×™×“×™×™×"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "ניתן לשוחח דרך Google Talk,†Facebook,†MSN ושירותי שיחה ×¨×‘×™× × ×•×¡×¤×™×"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "שיחה;דיבור;דיון;im;הודעה;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Connection managers should be used"
#: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect."
#: ../data/org.gnome.Empathy.gschema.xml.h:3
msgid "Empathy should auto-connect on startup"
@@ -51,18 +51,15 @@ msgstr "Empathy should auto-connect on startup"
#: ../data/org.gnome.Empathy.gschema.xml.h:4
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Whether Empathy should automatically log into your accounts on startup."
+msgstr "Whether Empathy should automatically log into your accounts on startup."
#: ../data/org.gnome.Empathy.gschema.xml.h:5
msgid "Empathy should auto-away when idle"
msgstr "Empathy should auto-away when idle"
#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Whether Empathy should go into away mode automatically if the user is idle."
#: ../data/org.gnome.Empathy.gschema.xml.h:7
msgid "Empathy default download folder"
@@ -78,12 +75,8 @@ msgid "Magic number used to check if sanity cleaning tasks should be run"
msgstr "Magic number used to check if sanity cleaning tasks should be run"
#: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
+msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
+msgstr "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
@@ -131,12 +124,8 @@ msgid "Display incoming events in the status area"
msgstr "Display incoming events in the status area"
#: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Display incoming events in the status area. If false, present them to the user immediately."
#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
@@ -200,18 +189,15 @@ msgstr "Play a sound when a contact logs in"
#: ../data/org.gnome.Empathy.gschema.xml.h:39
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging into the network."
+msgstr "Whether to play a sound to notify of contacts logging into the network."
#: ../data/org.gnome.Empathy.gschema.xml.h:40
msgid "Play a sound when a contact logs out"
msgstr "Play a sound when a contact logs out"
#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Whether to play a sound to notify of contacts logging out of the network."
#: ../data/org.gnome.Empathy.gschema.xml.h:42
msgid "Play a sound when we log in"
@@ -250,12 +236,8 @@ msgid "Pop up notifications if the chat isn't focused"
msgstr "Pop up notifications if the chat isn't focused"
#: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
@@ -302,44 +284,32 @@ msgid "Chat window theme variant"
msgstr "Chat window theme variant"
#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "The theme variant that is used to display the conversation in chat windows."
#: ../data/org.gnome.Empathy.gschema.xml.h:64
msgid "Path of the Adium theme to use"
msgstr "Path of the Adium theme to use"
#: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
-msgstr ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "Enable WebKit Developer Tools"
#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr "Inform other users when you are typing to them"
#: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
@@ -354,42 +324,32 @@ msgid "Spell checking languages"
msgstr "Spell checking languages"
#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "Enable spell checker"
#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Whether to check words typed against the languages you want to check with."
#: ../data/org.gnome.Empathy.gschema.xml.h:76
msgid "Nick completed character"
msgstr "Nick completed character"
#: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Character to add after nickname when using nick completion (tab) in group chat."
#: ../data/org.gnome.Empathy.gschema.xml.h:78
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy should use the avatar of the contact as the chat window icon"
#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Whether Empathy should use the avatar of the contact as the chat window icon."
#: ../data/org.gnome.Empathy.gschema.xml.h:80
msgid "Last account selected in Join Room dialog"
@@ -428,12 +388,8 @@ msgid "Show hint about closing the main window"
msgstr "Show hint about closing the main window"
#: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
@@ -472,10 +428,8 @@ msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy should reduce the location's accuracy"
#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons."
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
@@ -501,7 +455,8 @@ msgstr "התרחשה שגי××” בזמן ניסיון העברת הקובץ"
msgid "The other participant is unable to transfer the file"
msgstr "המשתתף ×”×חר ×œ× ×™×›×•×œ להעביר ×ת הקובץ"
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-utils.c:306
msgid "Unknown reason"
msgstr "סיבה ×œ× ×™×“×•×¢×”"
@@ -521,7 +476,8 @@ msgstr "הקובץ הנבחר ×ינו קובץ רגיל"
msgid "The selected file is empty"
msgstr "הקובץ הנבחר ריק"
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:85
+#: ../libempathy/empathy-keyring.c:194
msgid "Password not found"
msgstr "הססמה ×œ× × ×ž×¦××”"
@@ -535,7 +491,8 @@ msgstr "ססמת חשבון ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×¢×‘×•×¨ %s†(%s)"
msgid "Password for chatroom '%s' on account %s (%s)"
msgstr "הססמה עבור החדר '%s' דרך החשבון %s â€(%s)"
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:403
+#: ../src/empathy-call-observer.c:116
#, c-format
msgid "Missed call from %s"
msgstr "שיחה ×©×œ× × ×¢× ×ª×” מ×ת %s"
@@ -627,21 +584,25 @@ msgstr "×œ× ×™×“×•×¢"
msgid "No reason specified"
msgstr "×œ× ×¦×•×™×™× ×” סיבה"
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:336
msgid "Status is set to offline"
msgstr "המצב מוגדר כמנותק"
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:316
#: ../libempathy-gtk/empathy-call-utils.c:47
#: ../libempathy-gtk/empathy-new-message-dialog.c:80
msgid "Network error"
msgstr "שגי×ת רשת"
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:318
msgid "Authentication failed"
msgstr "×”×ימות נכשל"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:320
msgid "Encryption error"
msgstr "שגי×ת הצפנה"
@@ -649,31 +610,38 @@ msgstr "שגי×ת הצפנה"
msgid "Name in use"
msgstr "×”×©× ×‘×©×™×ž×•×©"
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate not provided"
msgstr "×œ× ×¡×•×¤×§×” תעודה"
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:324
msgid "Certificate untrusted"
msgstr "התעודה ××™× ×” מ×ובטחת"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate expired"
msgstr "התעודה ×œ× ×ª×§×¤×”"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
msgid "Certificate not activated"
msgstr "התעודה ××™× ×” פעילה"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
msgid "Certificate hostname mismatch"
msgstr "×©× ×”×ž×רח בתעודה ×œ× ×ª×•××"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
msgid "Certificate fingerprint mismatch"
msgstr "טביעת ×”×צבע של התעודה ××™× ×” תו×מת"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
msgid "Certificate self-signed"
msgstr "תעודה בחתימה עצמית"
@@ -706,8 +674,7 @@ msgid "This account is already connected to the server"
msgstr "חשבון זה כבר מחובר לשרת"
#: ../libempathy/empathy-utils.c:350
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+msgid "Connection has been replaced by a new connection using the same resource"
msgstr "החיבור הוחלף בחיבור חדש ב×מצעות ×ותו המש×ב"
#: ../libempathy/empathy-utils.c:353
@@ -723,18 +690,12 @@ msgid "Certificate has been revoked"
msgstr "התעודה נשללה"
#: ../libempathy/empathy-utils.c:359
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"התעודה משתמשת ב××œ×’×•×¨×™×ª× ×”×¦×¤× ×” בלתי מ×ובטח ×ו ×©×”×•× ×—×œ×© מבחינה קריפטוגרפית"
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "התעודה משתמשת ב××œ×’×•×¨×™×ª× ×”×¦×¤× ×” בלתי מ×ובטח ×ו ×©×”×•× ×—×œ×© מבחינה קריפטוגרפית"
#: ../libempathy/empathy-utils.c:362
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"×ורך ×ישור ×”×בטחה של השרת ×ו עומק מחרוזת ×ישור ×”×בטחה של השרת ×—×•×¨×’×™× "
-"מהמגבלות שהוצבו על ידי ספריית ההצפנה"
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "×ורך ×ישור ×”×בטחה של השרת ×ו עומק מחרוזת ×ישור ×”×בטחה של השרת ×—×•×¨×’×™× ×ž×”×ž×’×‘×œ×•×ª שהוצבו על ידי ספריית ההצפנה"
#: ../libempathy/empathy-utils.c:366
msgid "Your software is too old"
@@ -753,11 +714,12 @@ msgstr "×× ×©×™× ×‘×§×¨×‘×ª×™"
msgid "Yahoo! Japan"
msgstr "â€Yahoo! יפן"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538
+#: ../src/empathy-roster-window.c:671
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "צ׳×ט Facebook"
@@ -859,7 +821,7 @@ msgstr "שרת"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "פתחה"
@@ -989,9 +951,7 @@ msgid "Servers"
msgstr "שרתי×"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
msgstr "רוב שרתי ×”Ö¾IRC ××™× × ×“×•×¨×©×™× ×¡×¡×ž×”, לכן במידה של ספק, ×ין להזין ססמה."
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
@@ -1027,13 +987,11 @@ msgstr "מהו ×©× ×”×ž×©×ª×ž×© שלך בפייסבוק?"
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
msgstr ""
"זהו ×©× ×”×ž×©×ª×ž×© שלך, ×œ× ×¤×¨×˜×™ החיבור ×”×¨×’×™×œ×™× ×©×œ×š לפייסבוק.\n"
"×× ×”× ×š facebook.com/<b>badger</b>, יש להזין <b>badger</b>.\n"
-"יש להשתמש ב<a href=\"http://www.facebook.com/username/\">עמוד זה</a> כדי "
-"לבחור ×©× ×ž×©×ª×ž×© בפייסבוק ×× ×¢×•×“ ×ין לך ×חד ×›×–×”."
+"יש להשתמש ב<a href=\"http://www.facebook.com/username/\">עמוד ×–×”</a> כדי לבחור ×©× ×ž×©×ª×ž×© בפייסבוק ×× ×¢×•×“ ×ין לך ×חד ×›×–×”."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
@@ -1391,9 +1349,7 @@ msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי ×”×•× ×‘×¨×¨×ª המחדל"
#: ../libempathy-gtk/empathy-chat.c:1071
@@ -1413,25 +1369,16 @@ msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
#: ../libempathy-gtk/empathy-chat.c:1083
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות "
-"המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
+msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
+msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <מזהה המשתמש>:‎ הצגת ×¤×¨×˜×™× ×¢×œ ×יש הקשר"
#: ../libempathy-gtk/empathy-chat.c:1091
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. ×× ×™×© הגדרה ל־<פקודה> יוצג ×ופן "
-"הפעלתה."
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. ×× ×™×© הגדרה ל־<פקודה> יוצג ×ופן הפעלתה."
#: ../libempathy-gtk/empathy-chat.c:1110
#, c-format
@@ -1450,13 +1397,15 @@ msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפיי×
msgid "insufficient balance to send message"
msgstr "המ×זן ×ינו מ×פשר לשלוח הודעה"
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1556
#: ../libempathy-gtk/empathy-chat.c:1619
#, c-format
msgid "Error sending message '%s': %s"
msgstr "שגי××” בשליחת ההודעה '%s': â€%s"
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1544
+#: ../libempathy-gtk/empathy-chat.c:1561
#: ../libempathy-gtk/empathy-chat.c:1623
#, c-format
msgid "Error sending message: %s"
@@ -1497,7 +1446,8 @@ msgstr "התכונה ×œ× ×ž×•×ž×©×”"
msgid "unknown"
msgstr "×œ× ×™×“×•×¢"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:974
+#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "נוש×:"
@@ -1611,9 +1561,12 @@ msgstr "â€%s נודע כעת בכינוי %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989
+#: ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582
+#: ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "מנותק"
@@ -1644,7 +1597,8 @@ msgstr "חדר זה מוגן בססמה:"
msgid "Join"
msgstr "הצטרפות"
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4077
+#: ../src/empathy-event-manager.c:1187
msgid "Connected"
msgstr "מחובר"
@@ -1848,12 +1802,8 @@ msgid "Groups"
msgstr "קבוצות"
#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"יש לבחור ×ת הקבוצות בהן ×תה מעוניין ש×יש קשר ×–×” יופיע. ניתן לבחור ביותר "
-"מקבוצה ×חת ×ו ×œ× ×œ×‘×—×•×¨ קבוצות בכלל."
+msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
+msgstr "יש לבחור ×ת הקבוצות בהן ×תה מעוניין ש×יש קשר ×–×” יופיע. ניתן לבחור ביותר מקבוצה ×חת ×ו ×œ× ×œ×‘×—×•×¨ קבוצות בכלל."
#: ../libempathy-gtk/empathy-groups-widget.c:358
msgid "_Add Group"
@@ -1940,7 +1890,7 @@ msgstr "× × ×œ×‘×—×•×¨ ×ת החשבון לשימוש לצורך ההתקשרו
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "התקשרות"
@@ -1956,97 +1906,93 @@ msgstr "עבודה"
msgid "HOME"
msgstr "בית"
-#: ../libempathy-gtk/empathy-individual-menu.c:667
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "×—_סימת ×יש קשר"
-#: ../libempathy-gtk/empathy-individual-menu.c:723
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "מחיקה ו_חסימה"
-#: ../libempathy-gtk/empathy-individual-menu.c:785
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "להסיר ×ת ×יש הקשר '%s'?"
-#: ../libempathy-gtk/empathy-individual-menu.c:794
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"×”×× ×כן ברצונך להסיר ×ת ×יש הקשר המקושר '%s'? × × ×œ×©×™× ×œ×‘ שפעולה זו תסיר ×ת "
-"כל ×נשי הקשר המת××’×“×™× ×œ×יש קשר מקושר ×–×”."
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "×”×× ×כן ברצונך להסיר ×ת ×יש הקשר המקושר '%s'? × × ×œ×©×™× ×œ×‘ שפעולה זו תסיר ×ת כל ×נשי הקשר המת××’×“×™× ×œ×יש קשר מקושר ×–×”."
-#: ../libempathy-gtk/empathy-individual-menu.c:805
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "×יש קשר מוסר"
-#: ../libempathy-gtk/empathy-individual-menu.c:869
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "ה_סרה"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1232
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_שיחה"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1300
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "שיחה _קולית"
-#: ../libempathy-gtk/empathy-individual-menu.c:1333
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "שיחת _ויד×ו"
-#: ../libempathy-gtk/empathy-individual-menu.c:1374
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "שיחות _קודמות"
-#: ../libempathy-gtk/empathy-individual-menu.c:1403
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "שליחת קובץ"
-#: ../libempathy-gtk/empathy-individual-menu.c:1433
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "שיתוף שולחן העבודה שלי"
-#: ../libempathy-gtk/empathy-individual-menu.c:1459
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "מועדף"
-#: ../libempathy-gtk/empathy-individual-menu.c:1488
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "_מידע"
-#: ../libempathy-gtk/empathy-individual-menu.c:1537
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "ע_ריכה"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1653
-#: ../src/empathy-chat-window.c:1240
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "מזמין/×” ×ותך לחדר ×–×”"
-#: ../libempathy-gtk/empathy-individual-menu.c:1699
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "ה_זמנה לחדר שיחה"
-#: ../libempathy-gtk/empathy-individual-menu.c:1895
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "הוספת _×יש קשר…"
@@ -2225,30 +2171,21 @@ msgstr "בחירה"
msgid "new server"
msgstr "שרת חדש"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct."
-msgstr ""
-"ב×פשרות Empathy לגלות ולנהל שיחות ×¢× ×× ×©×™× ×”×ž×—×•×‘×¨×™× ×œ×ותה הרשת כמוך. ×× "
-"ברצונך להשתמש בתכונה זו, × × ×œ×‘×“×•×§ ×©×”×¤×¨×˜×™× ×©×œ×”×œ×Ÿ נכוני×."
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "ב×פשרות Empathy לגלות ולנהל שיחות ×¢× ×× ×©×™× ×”×ž×—×•×‘×¨×™× ×œ×ותה הרשת כמוך. ×× ×‘×¨×¦×•× ×š להשתמש בתכונה זו, × × ×œ×‘×“×•×§ ×©×”×¤×¨×˜×™× ×©×œ×”×œ×Ÿ נכוני×."
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
msgid "People nearby"
msgstr "×× ×©×™× ×‘×§×¨×‘×ª×™"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr ""
-"ב×פשרותך לשנות ×¤×¨×˜×™× ×לה מ×וחר יותר ×ו לנטרל תכונה זו על ידי בחירה ב<span "
-"style=\"italic\">עריכה ↠חשבונות</span> ברשימת ×נשי הקשר."
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "ב×פשרותך לשנות ×¤×¨×˜×™× ×לה מ×וחר יותר ×ו לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה ↠חשבונות</span> ברשימת ×נשי הקשר."
#: ../libempathy-gtk/empathy-log-window.c:622
msgid "History"
@@ -2387,7 +2324,8 @@ msgid "_File"
msgstr "_קובץ"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Edit"
msgstr "ע_ריכה"
@@ -2400,12 +2338,13 @@ msgid "Profile"
msgstr "פרופיל"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438
+#: ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "שיחה"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "ויד×ו"
@@ -2633,12 +2572,12 @@ msgstr "_סירוב"
msgid "_Accept"
msgstr "_קבלה"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "ההודעה נערכה ב־%s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "רגיל"
@@ -2671,8 +2610,7 @@ msgid "The certificate is self-signed."
msgstr "×ישור ×”×בטחה × ×—×ª× ×¢×¦×ž×ית."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
msgstr "×ישור ×”×בטחה נשלל על ידי רשות ×ישורי ×”×בטחה המנפיקה."
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2731,12 +2669,8 @@ msgstr "×ין די ×ž×§×•× ×¤× ×•×™ לשמירת הקובץ"
#: ../libempathy-gtk/empathy-ui-utils.c:1256
#, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"× ×“×¨×©×™× %s של ×ž×§×•× ×¤× ×•×™ כדי לשמור קובץ ×–×”, ×ך ×™×©× × ×¨×§ %s פנויי×. × × ×œ×‘×—×•×¨ "
-"×‘×ž×™×§×•× ×חר."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "× ×“×¨×©×™× %s של ×ž×§×•× ×¤× ×•×™ כדי לשמור קובץ ×–×”, ×ך ×™×©× × ×¨×§ %s פנויי×. × × ×œ×‘×—×•×¨ ×‘×ž×™×§×•× ×חר."
#: ../libempathy-gtk/empathy-ui-utils.c:1302
#, c-format
@@ -2752,15 +2686,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>×¤×¨×˜×™× ×ישיי×</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "העתקת _×ž×™×§×•× ×”×§×™×©×•×¨"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_פתיחת קישור"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "ניתוח ה־HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "×ž×™×§×•× ×•×©×¤×” נוכחיי×"
@@ -2936,6 +2875,13 @@ msgstr "×נשי קשר מובילי×"
msgid "Ungrouped"
msgstr "×œ×œ× ×§×‘×•×¦×”"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "השרת ×œ× ×™×›×•×œ ×œ×ž×¦×•× ×ת ×יש הקשר: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "×ין הודעת שגי××”"
@@ -2945,38 +2891,16 @@ msgid "Instant Message (Empathy)"
msgstr "הודעה מיידית (Empathy)"
#: ../src/empathy-about-dialog.c:81
-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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
+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 Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "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 Foundation; either version 2 of the License, or (at your option) any later version."
#: ../src/empathy-about-dialog.c:85
-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 "
-"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-"details."
+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 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
+msgstr "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
#: ../src/empathy-about-dialog.c:89
-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 "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"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 "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
#: ../src/empathy-about-dialog.c:109
msgid "An Instant Messaging client for GNOME"
@@ -2993,18 +2917,15 @@ msgstr ""
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"×ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו×) ול×חריה התכנית תסגר"
+msgstr "×ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו×) ול×חריה התכנית תסגר"
#: ../src/empathy-accounts.c:186
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "×ין להציג תיבות דו־שיח כלשהן ××œ× ×× ×›×Ÿ ישנן חשבונות \"×× ×©×™× ×‘×§×¨×‘×ª×™\""
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
+msgstr "בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3031,7 +2952,8 @@ msgstr "×™×©× × ×©×™× ×•×™×™× ×©×œ× × ×©×ž×¨×• בחשבון ×”Ö¾%s שלך."
msgid "Your new account has not been saved yet."
msgstr "החשבון החדש שלך ×œ× × ×©×ž×¨ עדיין."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404
+#: ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "בהתחברות…"
@@ -3054,13 +2976,8 @@ msgid "Unknown Status"
msgstr "מצב ×œ× ×™×“×•×¢"
#: ../src/empathy-accounts-dialog.c:492
-msgid ""
-"This account has been disabled because it relies on an old, unsupported "
-"backend. Please install telepathy-haze and restart your session to migrate "
-"the account."
-msgstr ""
-"חשבון ×–×” נוטרל כיוון ×©×”×•× × ×©×¢×Ÿ על מנגנון ישן ש×ינו נתמך עוד. × × ×œ×”×ª×§×™×Ÿ ×ת "
-"telepathy-haze ולצ×ת ולהיכנס לחשבון המשתמש שלך כדי ×œ×™×™×‘× ×ת החשבון."
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "חשבון ×–×” נוטרל כיוון ×©×”×•× × ×©×¢×Ÿ על מנגנון ישן ש×ינו נתמך עוד. × × ×œ×”×ª×§×™×Ÿ ×ת telepathy-haze ולצ×ת ולהיכנס לחשבון המשתמש שלך כדי ×œ×™×™×‘× ×ת החשבון."
#: ../src/empathy-accounts-dialog.c:502
msgid "Offline — Account Disabled"
@@ -3070,20 +2987,20 @@ msgstr "מנותק — החשבון מנוטרל"
msgid "Edit Connection Parameters"
msgstr "עריכת הגדרות החיבור"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "ע_ריכת הגדרות החיבור..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "×”×× ×‘×¨×¦×•× ×š להסיר ×ת החשבון '%s' ממחשבך?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "פעולה זו ×œ× ×ª×¡×™×¨ ×ת חשבונך מהשרת."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3092,24 +3009,24 @@ msgstr ""
"×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×× ×œ×”×ž×©×™×š?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "מו_פעל"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "שינוי ש×"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_דילוג"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "הת_חברות"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3118,7 +3035,7 @@ msgstr ""
"×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×× ×œ×”×ž×©×™×š?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "חשבונות התכתבות ו־VoIP"
@@ -3131,11 +3048,8 @@ msgid "Loading account information"
msgstr "פרטי ×יש הקשר נטעני×"
#: ../src/empathy-accounts-dialog.ui.h:5
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol backends installed"
@@ -3168,8 +3082,7 @@ msgstr "שגי××” ביצירת קשר ×¢× ×ž× ×”×œ החשבונות"
#: ../src/empathy.c:625
#, c-format
msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
"\n"
"%s"
msgstr ""
@@ -3177,11 +3090,15 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "בשיחה"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- לקוח השמע/הוויד×ו Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "לקוח השמע/הוויד×ו Empathy"
@@ -3192,31 +3109,35 @@ msgstr "התקבלה בקשת שיחה מ×ת %s, ×ך ב×ותו הזמן כב×
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131
+#: ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "שיחה נכנסת"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "שיחת ויד×ו נכנסת מ־%s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "שיחה נכנסת מ־%s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "דחייה"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3224,132 +3145,119 @@ msgstr "מענה"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "שיחה ×¢× %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "כתובת ×”Ö¾IP כפי שנר×ית על ידי המחשב"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "כתובת ×”Ö¾IP כפי שנר×ית על ידי שרת ב×ינטרנט"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "כתובת ×”Ö¾IP כדי שנר×ית על ידי עמית מהצד השני"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "כתובת ה־IP של שרת הממסר"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "כתובת ה־IP של קבוצת התשדורת"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598
+#: ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600
+#: ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "×œ× ×™×“×•×¢"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "בהמתנה"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "השתק"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "משך"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02d דק׳"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "×¤×¨×˜×™× ×˜×›× ×™×™×"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr "התכנה של %s ××™× ×” מבינה ×ת מבני השמע ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the video formats supported by your computer"
msgstr "התכנה של %s ××™× ×” מבינה ×ת מבני הוויד×ו ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"×œ× × ×™×ª×Ÿ להפעיל ×ת החיבור ×ל %s. כנר××” ×חד ממשתתפי השיחה מחובר לרשת ש××™× ×” "
-"מ×פשרת ×—×™×‘×•×¨×™× ×™×©×™×¨×™×."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "×œ× × ×™×ª×Ÿ להפעיל ×ת החיבור ×ל %s. כנר××” ×חד ממשתתפי השיחה מחובר לרשת ש××™× ×” מ×פשרת ×—×™×‘×•×¨×™× ×™×©×™×¨×™×."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "×ירעה שגי××” ברשת"
-#: ../src/empathy-call-window.c:3039
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3124
+msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "מבני השמע ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š"
-#: ../src/empathy-call-window.c:3042
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3127
+msgid "The video formats necessary for this call are not installed on your computer"
msgstr "מבני הוויד×ו ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"משהו בלתי צפוי ×רע ברכיב של Telepathy. × × <a href=\"%s\">לדווח על ב××’ ×–×”</a> "
-"ולהוסיף דוחות שנ×ספו מחלון 'ניפוי השגי×ות' שבתפריט העזרה."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "משהו בלתי צפוי ×רע ברכיב של Telepathy. × × <a href=\"%s\">לדווח על ב××’ ×–×”</a> ולהוסיף דוחות שנ×ספו מחלון 'ניפוי השגי×ות' שבתפריט העזרה."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "×ירעה שגי××” במנוע הקרי××”"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "×”×ª×–×¨×™× ×”×’×™×¢ לסיומו"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×©×ž×¢"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×•×™×“×ו"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "המ×זן הנוכחי שלך ×”×•× %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "×ין לך מספיק ×שר××™ כדי לבצע שיחה זו."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Top Up"
@@ -3373,11 +3281,13 @@ msgstr "ה_גדרות"
msgid "_View"
msgstr "_תצוגה"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Help"
msgstr "ע_זרה"
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Contents"
msgstr "_תכני×"
@@ -3386,78 +3296,87 @@ msgid "_Debug"
msgstr "_ניפוי שגי×ות"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "החלפת מצלמה"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "מזעור"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "הגדלה"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "נטרול המצלמה"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "ניתוק"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "ניתוק השיחה הנוכחית"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "שיחת ויד×ו"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "התחלה בשיחת ויד×ו"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "התחלה בשיחת שמע"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "הצגת מקשי חיוג"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "הצגת מקשי החיוג"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "החלפת מצב העברת ויד×ו"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "החלפה בין העברה ו××™ העברה של שמע"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "מקודד ההצפנה:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "מקודד הפענוח:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "מועמד מרוחק:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "מועמד מקומי:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "שמע"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- לקוח הצ׳××˜×™× Empathy"
@@ -3477,92 +3396,80 @@ msgstr "חיבור ×וטומטי"
msgid "Manage Favorite Rooms"
msgstr "ניהול חדרי שיחה מועדפי×"
-#: ../src/empathy-chat-window.c:282
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "×”×× ×œ×¡×’×•×¨ חלון ×–×”?"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:293
#, c-format
-msgid ""
-"Closing this window will leave %s. You will not receive any further messages "
-"until you rejoin it."
-msgstr ""
-"סגירת חלון ×–×” ×ª×’×¨×•× ×œ×¢×–×™×‘×ª %s. ×œ× ×™×ª×§×‘×œ×• עוד הודעות על להצטרפותך ×ליו מחדש."
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "סגירת חלון ×–×” ×ª×’×¨×•× ×œ×¢×–×™×‘×ª %s. ×œ× ×™×ª×§×‘×œ×• עוד הודעות על להצטרפותך ×ליו מחדש."
-#: ../src/empathy-chat-window.c:301
+#: ../src/empathy-chat-window.c:306
#, c-format
-msgid ""
-"Closing this window will leave a chat room. You will not receive any further "
-"messages until you rejoin it."
-msgid_plural ""
-"Closing this window will leave %u chat rooms. You will not receive any "
-"further messages until you rejoin them."
-msgstr[0] ""
-"סגירת חלון ×–×” תוביל לעזיבת חדר הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך מחדש "
-"×ליו."
-msgstr[1] ""
-"סגירת חלון ×–×” תוביל לעזיבת %u חדרי הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך "
-"מחדש ×ליה×."
-
-#: ../src/empathy-chat-window.c:312
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "סגירת חלון ×–×” תוביל לעזיבת חדר הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך מחדש ×ליו."
+msgstr[1] "סגירת חלון ×–×” תוביל לעזיבת %u חדרי הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך מחדש ×ליה×."
+
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "×”×× ×œ×¢×–×•×‘ ×ת %s?"
-#: ../src/empathy-chat-window.c:314
-msgid ""
-"You will not receive any further messages from this chat room until you "
-"rejoin it."
+#: ../src/empathy-chat-window.c:319
+msgid "You will not receive any further messages from this chat room until you rejoin it."
msgstr "×œ× ×™×ª×§×‘×œ×• עוד הודעות מחדר צ׳×ט ×–×” עד להצטרפותך המחודשת ×ליו."
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "סגירת החלון"
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "עזיבת החדר"
-#: ../src/empathy-chat-window.c:672 ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××”)"
msgstr[1] "â€%s â€(%d ×©×œ× × ×§×¨×ו)"
-#: ../src/empathy-chat-window.c:687
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "â€%s (ו×חד נוסף)"
msgstr[1] "â€%s (ו־%u נוספי×)"
-#: ../src/empathy-chat-window.c:703
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××” מ×חרי×)"
msgstr[1] "â€%s (%d ×©×œ× × ×§×¨×ו מ×חרי×)"
-#: ../src/empathy-chat-window.c:712
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××” מכול×)"
msgstr[1] "â€%s (%d ×©×œ× × ×§×¨×ו מכול×)"
-#: ../src/empathy-chat-window.c:949
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:957
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "נשלחת הודעה ×חת"
msgstr[1] "נשלחות %d הודעות"
-#: ../src/empathy-chat-window.c:977
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "הודעה מוקלדת."
@@ -3586,7 +3493,8 @@ msgstr "_הוספת חדר השיחה למועדפי×"
msgid "Notify for All Messages"
msgstr "התרעה עבור כל ההודעות"
-#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-status-icon.ui.h:1
msgid "_Show Contact List"
msgstr "×”_צגת רשימת ×נשי קשר"
@@ -3654,66 +3562,73 @@ msgstr "תגובה מ־Pastebin"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "×”× ×ª×•× ×™× ×’×“×•×œ×™× ×ž×“×™ להדבקה ×חת. × × ×œ×©×ž×•×¨ ×ת ×”×™×•×ž× ×™× ×œ×§×•×‘×¥."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "חלון ניפוי שגי×ות"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "שליחה ל־Pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "השהייה"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "רמה"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "ניפוי שגי×ות"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "מידע"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002
+#: ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "הודעה"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "×זהרה"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "קריטי"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "שגי××”"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
+"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"×פילו ×œ×œ× ×”×¦×’×ª ססמ×ות, ×™×•×ž× ×™× ×¢×œ×•×œ×™× ×œ×”×›×™×œ מידע רגיש כגון ×נשי הקשר שלך ×ו ההודעות ×”×חרונות ששלחת ×ו קיבלת.\n"
+" ×× ×œ× ×ª×¨×¦×” לר×ות ×¤×¨×˜×™× ×›×לה ×ž×•×¤×™×¢×™× ×‘×“×™×•×•×— תקלה ציבורי, ניתן להגביל ×ת טווח ×”×¦×•×¤×™× ×œ×ž×¤×ª×—×™ Empathy בלבד בעת הדיווח על ידי הצגת השדות ×”×ž×ª×§×“×ž×™× ×‘<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">דוח התקלה</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "זמן"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "תחו×"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "קטגוריה"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "רמה"
-#: ../src/empathy-debug-window.c:2073
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../src/empathy-debug-window.c:2100
+msgid "The selected connection manager does not support the remote debugging extension."
msgstr "מנהל ×”×—×™×‘×•×¨×™× ×©× ×‘×—×¨ ×ינו תומך בהרחבת ניפוי שגי×ות מרחוק."
#: ../src/empathy-event-manager.c:508
@@ -3734,7 +3649,8 @@ msgstr "â€%s מתקשר ×ליך, ×”×× ×‘×¨×¦×•× ×š לענות?"
msgid "_Reject"
msgstr "_דחייה"
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
+#: ../src/empathy-event-manager.c:557
msgid "_Answer"
msgstr "_מענה"
@@ -3775,7 +3691,8 @@ msgstr "הוזמנת להצטרף ×ל %s"
msgid "Incoming file transfer from %s"
msgstr "העברת ×§×‘×¦×™× × ×›× ×¡×ª מ־%s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973
+#: ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "נדרשת ססמה"
@@ -3865,16 +3782,19 @@ msgstr "הקובץ \"%s\" נשלח ×ל %s"
msgid "File transfer completed"
msgstr "העברת קובץ הושלמה"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:615
+#: ../src/empathy-ft-manager.c:779
msgid "Waiting for the other participant's response"
msgstr "בהמתנה לתגובה של ×ž×©×ª×ª×¤×™× × ×•×¡×¤×™×"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641
+#: ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "השלמות של „%s“ נבדקת"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644
+#: ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "מתבצע גיבוב לקובץ „%s“"
@@ -3904,11 +3824,8 @@ msgid "_Import"
msgstr "×™_בו×"
#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"×œ× × ×ž×¦×ו חשבונות לייבו×. Empathy תומך כרגע ×‘×™×™×‘×•× ×—×©×‘×•× ×•×ª מ־Pidgin בלבד."
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "×œ× × ×ž×¦×ו חשבונות לייבו×. Empathy תומך כרגע ×‘×™×™×‘×•× ×—×©×‘×•× ×•×ª מ־Pidgin בלבד."
#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
@@ -3980,30 +3897,20 @@ msgid "Join Room"
msgstr "הצטרפות לחדר"
#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"יש להזין ×ת ×©× ×”×—×“×¨ כדי להצטרף ×ליו ×ו ללחוץ על חדר ×חד ×ו יותר מהרשימה."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "יש להזין ×ת ×©× ×”×—×“×¨ כדי להצטרף ×ליו ×ו ללחוץ על חדר ×חד ×ו יותר מהרשימה."
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Room:"
msgstr "_חדר:"
#: ../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&apos;s server"
-msgstr ""
-"יש להזין ×ת כתובת השרת המ×רח ×ת החדר, ×ו להש×יר ×ת השדה ריק ×× ×”×—×“×¨ × ×ž×¦× "
-"בשרת של החשבון הנוכחי"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
+msgstr "יש להזין ×ת כתובת השרת המ×רח ×ת החדר, ×ו להש×יר ×ת השדה ריק ×× ×”×—×“×¨ × ×ž×¦× ×‘×©×¨×ª של החשבון הנוכחי"
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"יש להזין ×ת כתובת השרת המ×רח ×ת החדר, ×ו להש×יר ×ת השדה ריק ×× ×”×—×“×¨ × ×ž×¦× "
-"בשרת של החשבון הנוכחי"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "יש להזין ×ת כתובת השרת המ×רח ×ת החדר, ×ו להש×יר ×ת השדה ריק ×× ×”×—×“×¨ × ×ž×¦× ×‘×©×¨×ª של החשבון הנוכחי"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "_Server:"
@@ -4126,7 +4033,8 @@ msgstr "הצגת קבוצות"
msgid "Show account balances"
msgstr "הצגת מ××–× ×™ החשבונות"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-roster-window.c:2236
msgid "Contact List"
msgstr "רשימת ×נשי קשר"
@@ -4215,28 +4123,16 @@ msgid "Use _echo cancellation to improve call quality"
msgstr "שימוש ב_ביטול הד כדי לשפר ×ת ×יכות השיחה"
#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"ביטול ההד הופך ×ת השיחות הקוליות שלך לצלולות יותר עבור הצד השני ×ך עלולות "
-"×œ×’×¨×•× ×œ×ª×§×œ×•×ª במספר מחשבי×. ×× ×‘×¦×“ שלך ×ו בצד השני × ×©×ž×¢×™× ×¨×¢×©×™× ×ž×•×–×¨×™× ×ו "
-"קטיעות במהלך השיחה כד××™ לנסות לכבות ×ת ביטול ההד ולהתחיל בשיחה מחדש."
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "ביטול ההד הופך ×ת השיחות הקוליות שלך לצלולות יותר עבור הצד השני ×ך עלולות ×œ×’×¨×•× ×œ×ª×§×œ×•×ª במספר מחשבי×. ×× ×‘×¦×“ שלך ×ו בצד השני × ×©×ž×¢×™× ×¨×¢×©×™× ×ž×•×–×¨×™× ×ו קטיעות במהלך השיחה כד××™ לנסות לכבות ×ת ביטול ההד ולהתחיל בשיחה מחדש."
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "_×¤×¨×¡×•× ×”×ž×™×§×•× ×©×œ×™ ל×נשי הקשר שלי"
#: ../src/empathy-preferences.ui.h:31
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"הפחתת רמת הדיוק של ×”×ž×™×§×•× ×ומרת שהמידע המדויק ביותר ×©×™×¤×•×¨×¡× ×”×•× ×”×¢×™×¨, המדינה "
-"וה×רץ שלך. הדיוק של נקודות ציון מ־GPS יהיו ×¢× ×ž×¡×¤×¨ עשרוני 1."
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
+msgstr "הפחתת רמת הדיוק של ×”×ž×™×§×•× ×ומרת שהמידע המדויק ביותר ×©×™×¤×•×¨×¡× ×”×•× ×”×¢×™×¨, המדינה וה×רץ שלך. הדיוק של נקודות ציון מ־GPS יהיו ×¢× ×ž×¡×¤×¨ עשרוני 1."
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
@@ -4264,9 +4160,7 @@ msgid "Location sources:"
msgstr "מקורות המיקומי×:"
#: ../src/empathy-preferences.ui.h:40
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
msgstr "ברשימת השפות מוצגות שפות שעבורן ×ž×•×ª×§× ×™× ×צלך מילוני×."
#: ../src/empathy-preferences.ui.h:41
@@ -4289,62 +4183,84 @@ msgstr "הגוון:"
msgid "Themes"
msgstr "ערכות נוש×"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "הזנת ססמה"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "ניתוק"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "עליך להגדיר חשבון כדי שיופיעו ×›×ן ×נשי קשר."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "×œ× × ×™×ª×Ÿ להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:669
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:688
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "חשבון ×”Ö¾%s דורש ×ימות"
+
+#: ../src/empathy-roster-window.c:699
+msgid "Online Accounts"
+msgstr "חשבונות מקווני×"
+
+#: ../src/empathy-roster-window.c:746
msgid "Update software..."
msgstr "עדכון התכנה..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:752
msgid "Reconnect"
msgstr "התחברות מחדש"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:756
msgid "Edit Account"
msgstr "עריכת חשבון"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:761
msgid "Close"
msgstr "סגירה"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:903
msgid "Top up account"
msgstr "חשבון Top up"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1585
msgid "You need to enable one of your accounts to see contacts here."
msgstr "עליך להפעיל ×ת ×חד החשבונות שלך כדי שיופיעו ×›×ן ×נשי קשר."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1593
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "עליך להפעיל ×ת %s כדי שיופיעו ×›×ן ×נשי קשר."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1671
msgid "Change your presence to see contacts here"
msgstr "שינוי הנוכחות שלך כדי לצפות ב×נשי קשר להלן"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1680
msgid "No match found"
msgstr "×œ× × ×ž×¦××” הת×מה"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1687
+msgid "You haven't added any contact yet"
+msgstr "×œ× ×”×•×¡×¤×ª ×נשי קשר עדיין"
+
+#: ../src/empathy-roster-window.c:1690
msgid "No online contacts"
msgstr "×ין ×נשי קשר מחוברי×"
@@ -4421,6 +4337,14 @@ msgstr "הגדרות החשבון"
msgid "Go _Online"
msgstr "הת_חברות"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "הצגת ×נשי קשר ש××™× × ×ž×—×•×‘×¨×™×"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "הוספת _×יש קשר..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_שיחה חדשה…"
@@ -4566,8 +4490,8 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "Details"
#~ msgstr "פרטי×"
-
#~ msgctxt "codec"
+
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
@@ -4675,15 +4599,15 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "Contacts selected in the list on the left will be linked together."
#~ msgstr "×נשי הקשר שנבחרו ברשימה שמימין יקושרו ×–×” לזה."
-
#~ msgctxt "Link individual (contextual menu)"
+
#~ msgid "_Link Contacts…"
#~ msgstr "_קישור ×נשי קשר…"
#~ msgid "Link Contacts"
#~ msgstr "קישור בין ×נשי קשר"
-
#~ msgctxt "Unlink individual (button)"
+
#~ msgid "_Unlink…"
#~ msgstr "ה_פרדה…"
@@ -4703,8 +4627,8 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgstr ""
#~ "×”×× ×‘×מת ברצונך לפרק ×יש קשר מקושר ×–×”? פעולה זו תפריד ×ת הקשר המקושר ×”×–×” "
#~ "ל×נשי הקשר ×ותו ×”×•× ×ž×›×™×œ."
-
#~ msgctxt "Unlink individual (button)"
+
#~ msgid "_Unlink"
#~ msgstr "_ניתוק"
@@ -4830,8 +4754,8 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "Ca_ncel"
#~ msgstr "_ביטול"
-
#~ msgctxt "Edit contact (contextual menu)"
+
#~ msgid "_Edit"
#~ msgstr "ע_ריכה"
@@ -4869,9 +4793,6 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "Favorite People"
#~ msgstr "×× ×©×™× ×ž×•×¢×“×¤×™×"
-#~ msgid "Select a contact"
-#~ msgstr "בחירת ×יש קשר"
-
#~ msgid "Contact ID:"
#~ msgstr "מזהה ×יש הקשר:"
@@ -4889,20 +4810,20 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "The selected contact is offline."
#~ msgstr "×יש קשר הנבחר מנותק."
-
#~ msgctxt "encoding video codec"
+
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
-
#~ msgctxt "encoding audio codec"
+
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
-
#~ msgctxt "decoding video codec"
+
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
-
#~ msgctxt "decoding audio codec"
+
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
@@ -4976,8 +4897,8 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "שימוש ב־_Yahoo יפן"
-
#~ msgctxt "Link individual (contextual menu)"
+
#~ msgid "_Link…"
#~ msgstr "_קישור…"
@@ -5021,9 +4942,6 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~ msgstr ""
#~ "Whether the Salut account has been created on the first Empathy run."
-#~ msgid " Accounts"
-#~ msgstr "חשבונות"
-
#~ msgid "Hidden"
#~ msgstr "מוסתר"
@@ -5158,200 +5076,137 @@ msgstr "שילוב חשבונות ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š"
#~| msgid "Account"
#~ msgid "Add Account"
#~ msgstr "הוסף חשבון"
-
#~| msgid "Email:"
#~ msgid "Gmail"
#~ msgstr "Gmail"
-
#~ msgid "Import Accounts..."
#~ msgstr "×™×™×‘×•× ×—×©×‘×•× ×•×ª..."
-
#~ msgid "Type:"
#~ msgstr "סוג:"
-
#~ msgid "gtk-leave-fullscreen"
#~ msgstr "gtk-leave-fullscreen"
-
#~ msgid "<b>Network</b>"
#~ msgstr "<b>רשת</b>"
-
#~ msgid "<b>Servers</b>"
#~ msgstr "<b>שרתי×</b>"
-
#~ msgid "<b>Contact</b>"
#~ msgstr "<b>×יש קשר</b>"
-
#~ msgid "<b>Groups</b>"
#~ msgstr "<b>קבוצות</b>"
-
#~ msgid "Adium"
#~ msgstr "Adium"
-
#~ msgid "- Empathy Instant Messenger"
#~ msgstr "- Empathy Instant Messenger"
-
#~ msgid "<b>Add Account</b>"
#~ msgstr "<b>הוסף חשבון</b>"
-
#~ msgid "New message from %s"
#~ msgstr "הודעה חדשת מ־%s"
-
#~ msgid "File transfers"
#~ msgstr "העברות קבצי×"
-
#~ msgid "<b>Contact List</b>"
#~ msgstr "<b>רשימת ×נשי קשר</b>"
-
#~ msgid "Show _avatars"
#~ msgstr "הצג _תמנות ×ישיות"
-
#~ msgid "Show co_mpact contact list"
#~ msgstr "הצג רשימת ×נשי קשר מ_צומצמת"
-
#~ msgid "Enable popup when contact is available"
#~ msgstr "Enable popup when contact is available"
-
#~ msgid "Whether or not to show a popup when a contact becomes available."
#~ msgstr "Whether or not to show a popup when a contact becomes available."
-
#~ msgid "Edit the selected IRC network"
#~ msgstr "ערוך רשת IRC מסומנת"
-
#~ msgid "Remove the selected IRC network"
#~ msgstr "הסר רשת IRC מסומנת"
-
#~ msgid "_Check Word Spelling..."
#~ msgstr "ב_דוק ×יות..."
-
#~ msgid "Contact Information"
#~ msgstr "מידע ×יש קשר"
-
#~ msgid "I would like to add you to my contact list."
#~ msgstr "הייתי רוצה להוסיף ×ותך לרשימת ×נשי הקשר שלי."
-
#~ msgid "Sorry, I don't want you in my contact list anymore."
#~ msgstr "מצטער, ×× ×™ יותר ×œ× ×¨×•×¦×” ×ותך ברשימת ×נשי הקשר שלי."
-
#~ msgid "Word"
#~ msgstr "מילה"
-
#~ msgid "Suggestions for the word"
#~ msgstr "הצעות עבור המילה"
-
#~ msgid "Spell Checker"
#~ msgstr "בודק ×יות"
-
#~ msgid "Suggestions for the word:"
#~ msgstr "הצעות עבור המילה:"
-
#~ msgid "End this call?"
#~ msgstr "×œ×¡×™×™× ×ת השיחה?"
-
#~ msgid "Ringing"
#~ msgstr "מצלצל"
-
#~ msgid "#"
#~ msgstr "#"
-
#~ msgid "*"
#~ msgstr "*"
-
#~ msgid "0"
#~ msgstr "0"
-
#~ msgid "1"
#~ msgstr "1"
-
#~ msgid "2"
#~ msgstr "2"
-
#~ msgid "3"
#~ msgstr "3"
-
#~ msgid "4"
#~ msgstr "4"
-
#~ msgid "5"
#~ msgstr "5"
-
#~ msgid "6"
#~ msgstr "6"
-
#~ msgid "7"
#~ msgstr "7"
-
#~ msgid "8"
#~ msgstr "8"
-
#~ msgid "9"
#~ msgstr "9"
-
#~ msgid "<b>Keypad</b>"
#~ msgstr "<b>לוח מקשי×</b>"
-
#~ msgid "Invitation _message:"
#~ msgstr "הודעת הזמ_נה:"
-
#~ msgid "Edit Favorite Room"
#~ msgstr "ערוך חדר מועדף"
-
#~ msgid "N_ame:"
#~ msgstr "ש_×:"
-
#~ msgid "S_erver:"
#~ msgstr "ש_רת:"
-
#~| msgid "unknown"
#~ msgctxt "file size"
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
-
#~| msgid "unknown"
#~ msgctxt "remaining time"
#~ msgid "Unknown"
#~ msgstr "×œ× ×™×“×•×¢"
-
#~| msgid "_Send File..."
#~ msgid "Save file as..."
#~ msgstr "_שלח קובץ..."
-
#~| msgid "unknown"
#~ msgid "unknown size"
#~ msgstr "גודל ×œ× ×™×“×•×¢"
-
#~ msgid "gtk-cancel"
#~ msgstr "gtk-cancel"
-
#~ msgid "Browse:"
#~ msgstr "עיין:"
-
#~ msgid "Re_fresh"
#~ msgstr "רע_נן"
-
#~ msgid "Enable sound when busy"
#~ msgstr "Enable sound when busy"
-
#~ msgid "Configure Telepathy account settings"
#~ msgstr "הגדרות חשבון Telepathy"
-
#~ msgid "<b>No Accounts Configured</b>"
#~ msgstr "<b>×œ× ×”×•×’×“×¨×• חשבונות</b>"
-
#~ msgid "Invitation Error"
#~ msgstr "שגי×ת הזמנה"
-
#~ msgid "<b>Audio</b>"
#~ msgstr "<b>צליל</b>"
-
#~ msgid "<b>Visual</b>"
#~ msgstr "<b>חזותי</b>"
-
#~ msgid "J_apan server:"
#~ msgstr "שרת _יפן:"
-
#~ msgid "Invalid account"
#~ msgstr "חשבון ×œ× ×ª×§×™×Ÿ"
-
#, fuzzy
#~ msgid "Presence failure"
#~ msgstr "Presence"
diff --git a/po/id.po b/po/id.po
index b7624f0ec..62f9bf63b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-27 19:37+0700\n"
+"POT-Creation-Date: 2012-10-17 12:18+0000\n"
+"PO-Revision-Date: 2012-10-27 15:26+0700\n"
"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
"Language: id\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.3\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -774,7 +774,7 @@ msgstr "Orang-orang Berada di Sekitar"
msgid "Yahoo! Japan"
msgstr "Yahoo! Jepang"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "Google Talk"
@@ -1527,7 +1527,7 @@ msgstr "tidak dilaksanakan"
msgid "unknown"
msgstr "tidak diketahui"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Topik:"
@@ -1641,9 +1641,9 @@ msgstr "%s sekarang dikenal sebagai %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1525
+#: ../src/empathy-call-window.c:1575 ../src/empathy-call-window.c:2629
+#: ../src/empathy-call-window.c:2935 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Terputus"
@@ -1958,47 +1958,47 @@ msgstr "Silakan pasang gnome-contacts untuk mengakses rincian kontak."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Pilih akun yang dipakai untuk memanggil"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Panggilan"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Seluler"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Kantor"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "RUMAH"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Blok Kontak"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Hapus dan _Blokir"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Apakah Anda benar-benar ingin menghapus kontak '%s'?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2007,75 +2007,75 @@ msgstr ""
"Anda yakin ingin menghapus kontak terkait '%s'? Hal ini akan menghapus semua "
"kontak yang menyusun kontak terkait ini."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Menghapus kontak"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Hapus"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Obrolan"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Panggilan Suar_a"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "Panggilan _Video"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Percakapan Sebelumnya"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Kirim Berkas"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Berbagi Desktop Saya"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Favorit"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Infor_masi"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Sunting"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Mengundang Anda ke ruangan ini"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Undang ke Ruang Mengobrol"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "T_ambah Kontak…"
@@ -2435,12 +2435,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Obrolan"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2966,7 +2966,6 @@ msgid "Vietnamese"
msgstr "Vietnam"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "Kontak Top"
@@ -3218,11 +3217,11 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:195
msgid "- Empathy Audio/Video Client"
msgstr "- Klien Audio/Video Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:219
msgid "Empathy Audio/Video Client"
msgstr "Klien Audio/Video Empathy"
@@ -3238,27 +3237,27 @@ msgstr ""
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Panggilan masuk"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Panggilan video masuk dari %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Panggilan masuk dari %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1552
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Tolak"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1553
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3266,60 +3265,60 @@ msgstr "Jawab"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1920
#, c-format
msgid "Call with %s"
msgstr "Panggil dengan %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2172
msgid "The IP address as seen by the machine"
msgstr "Alamat IP sebagaimana dilihat oleh mesin"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2174
msgid "The IP address as seen by a server on the Internet"
msgstr "Alamat IP sebagaimana dilihat oleh server di Internet"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2176
msgid "The IP address of the peer as seen by the other side"
msgstr "Alamat IP dari peer sebagaimana dilihat oleh sisi lain"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2178
msgid "The IP address of a relay server"
msgstr "Alamat IP dari server relay"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2180
msgid "The IP address of the multicast group"
msgstr "Alamat IP dari grup multicast"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582
+#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Tidak Diketahui"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2933
msgid "On hold"
msgstr "Ditahan"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2937
msgid "Mute"
msgstr "Bisu"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2939
msgid "Duration"
msgstr "Durasi"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2942
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3038
msgid "Technical Details"
msgstr "Rincian Teknis"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3077
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3328,7 +3327,7 @@ msgstr ""
"Perangkat lunak %s tidak memahami format audio apapun yang didukung oleh "
"komputer Anda"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3082
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3337,7 +3336,7 @@ msgstr ""
"Perangkat lunak %s tidak memahami format video apapun yang didukung oleh "
"komputer Anda"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3088
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3346,25 +3345,25 @@ msgstr ""
"Tidak dapat membuat sambungan ke %s. Salah satu dari Anda mungkin berada "
"pada jaringan yang tidak mengizinkan koneksi langsung."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3094
msgid "There was a failure on the network"
msgstr "Ada kegagalan pada jaringan"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3098
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Format audio yang diperlukan untuk panggilan ini tidak diinstal pada "
"komputer Anda"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3101
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Format video yang diperlukan untuk panggilan ini tidak diinstal pada "
"komputer Anda"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3113
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3375,32 +3374,32 @@ msgstr ""
"\"%s\">laporkan bug ini</a> dan melampirkan log yang dikumpulkan dari "
"jendela 'Debug' dalam menu Bantuan."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3122
msgid "There was a failure in the call engine"
msgstr "Ada kegagalan dalam mesin panggilan"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3125
msgid "The end of the stream was reached"
msgstr "Akhir stream tercapai"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3165
msgid "Can't establish audio stream"
msgstr "Tidak dapat membangun aliran audio"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3175
msgid "Can't establish video stream"
msgstr "Tidak bisa membangun aliran video"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3212
#, c-format
msgid "Your current balance is %s."
msgstr "Pulsa Anda kini %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3216
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Maaf, Anda tak punya cukup pulsa untuk panggilan itu."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3218
msgid "Top Up"
msgstr "Isi Ulang"
@@ -3437,78 +3436,86 @@ msgid "_Debug"
msgstr "_Debug"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Tukar kamera"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimalkan saya"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maksimalkan saya"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Matikan kamera"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Menggantung"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Tutup saat panggilan"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Panggilan video"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Mulai panggilan video"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Mulai panggilan audio"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Tampilkan dialpad"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Tampilkan dialpad"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Jungkitkan transmisi video"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Aktifkan transmisi audio"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Codec Pengode:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Codec Pengawakode:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Kandidat Jauh:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Kandidat Lokal:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Audio"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- Klien Obrolan Empathy"
@@ -3528,11 +3535,11 @@ msgstr "Tersambung-Otomatis"
msgid "Manage Favorite Rooms"
msgstr "Mengelola Ruang Favorit"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Tutup jendela ini?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3541,7 +3548,7 @@ msgstr ""
"Menutup jendela ini akan meninggalkan %s. Anda tak akan menerima pesan lebih "
"lanjut sampai Anda bergabung ulang."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3553,12 +3560,12 @@ msgstr[0] ""
"Menutup jendela ini akan meninggalkan %u ruang obrolan. Anda tak akan "
"menerima pesan lebih lanjut sampai Anda bergabung ulang."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Tinggalkan %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3566,49 +3573,49 @@ msgstr ""
"Anda tak akan menerima pesan lebih lanjut dari ruang obrolan ini sampai Anda "
"bergabung ulang."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Tutup jendela"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Tinggalkan ruangan"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d belum dibaca)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (dan %u lainnya)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d belum dibaca dari lainnya)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d belum dibaca dari semua)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sedang mengirim %d pesan"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Ketik pesan."
@@ -3702,63 +3709,81 @@ msgstr ""
"Data terlalu besar untuk suatu penempelan tunggal. Silakan simpan log ke "
"berkas."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Jendela Debug"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Kirim ke pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Berhenti sebentar"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Tingkat "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Pesan"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Peringatan"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Kritis"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Kesalahan"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensible information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Bahkan bila mereka tak menampilkan sandi, log bisa memuat informasi sensitif "
+"seperti daftar kontak atau pesan yang baru-baru ini Anda kirim atau terima.\n"
+"Bila Anda tak ingin informasi seperti itu tersedia dalam laporan kutu "
+"publik, Anda dapat memilih untuk membatasi kenampakan kutu Anda ke para "
+"pengembang Empathy ketika melaporkannya dengan menampilkan ruas tingkat "
+"lanjut dalam <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy\">laporan kutu</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Waktu"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Tingkat"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4177,7 +4202,7 @@ msgstr "Tampilkan grup"
msgid "Show account balances"
msgstr "Tampilkan sisa pulsa"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "Daftar Kontak"
@@ -4352,56 +4377,76 @@ msgstr "Sediakan Sandi"
msgid "Disconnect"
msgstr "Putus"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:441
msgid "You need to setup an account to see contacts here."
msgstr "Anda perlu menyiapkan suatu akun untuk melihat kontak disini."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:517
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Maaf, akun %s tak bisa dipakai sampai perangkat lunak %s Anda dimutakhirkan."
+#: ../src/empathy-roster-window.c:617
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:621
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
#: ../src/empathy-roster-window.c:636
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "Akun %s memerlukan otorisasi"
+
+#: ../src/empathy-roster-window.c:647
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "Akun Daring"
+
+#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "Mutakhirkan perangkat lunak..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "Hubungkan kembali"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "Sunting Akun"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "Tutup"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:846
msgid "Top up account"
msgstr "Isi ulang kredit akun"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
msgstr ""
"Anda perlu mengaktifkan satu dari akun Anda untuk melihat kontak disini."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1536
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Anda perlu mengaktifkan %s untuk melihat kontak disini."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1614
msgid "Change your presence to see contacts here"
msgstr "Ubah kehadiran Anda untuk melihat kontak disini"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1623
msgid "No match found"
msgstr "Tidak ada yang cocok"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1628
msgid "No online contacts"
msgstr "Tak ada kontak daring"
diff --git a/po/it.po b/po/it.po
index dd57027f5..89f2fb905 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,14 +4,14 @@
# Fabio Bonelli <fabiobonelli@libero.it>, 2003
# Michele Baldessari <michele@pupazzo.org>, 2003
# Luca Ferretti <lferrett@gnome.org>, 2011.
-# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012.
+# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 12:35+0200\n"
-"PO-Revision-Date: 2012-09-27 12:36+0200\n"
+"POT-Creation-Date: 2013-01-07 14:25+0100\n"
+"PO-Revision-Date: 2013-01-07 14:31+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"Language: it\n"
@@ -37,6 +37,12 @@ msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr ""
"Conversa su Google Talk, Facebook, MSN e molti altri servizi di messaggistica"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;talk;im;messaggi;messaggio;irc;voip;gtalk;facebook;jabber;parlare;"
+"chiacchierare;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Indica se deve essere usato il gestore delle connessioni"
@@ -812,11 +818,11 @@ msgstr "Persone nelle vicinanze"
msgid "Yahoo! Japan"
msgstr "Yahoo! Giappone"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Chat di Facebook"
@@ -920,7 +926,7 @@ msgstr "Server"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Porta"
@@ -1578,7 +1584,7 @@ msgstr "non implementato"
msgid "unknown"
msgstr "sconosciuto"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Argomento:"
@@ -1699,9 +1705,9 @@ msgstr "L'utente %s è ora conosciuto come %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2657
+#: ../src/empathy-call-window.c:2963 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Disconnessi"
@@ -1777,7 +1783,7 @@ msgstr "Modifica contatti bloccati"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1884,12 +1890,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Vorrei poter vedere quando sei online! Grazie!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "Salva immagine"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Impossibile salvare l'immagine"
@@ -2027,49 +2033,49 @@ msgstr "Installare «gnome-contacts» per accedere ai dettagli dei contatti."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
# (ndt) è un titolo...
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Selezione account per la chiamata"
# (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Chiamata"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Cellulare"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Lavoro"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "Casa"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Blocca contatto"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Elimina e _blocca"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Rimuovere veramente il contatto «%s»?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2078,77 +2084,77 @@ msgstr ""
"Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà "
"tutti i contatti di cui è composto."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Rimozione contatto"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Rimuovi"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Conversazione"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Chiamata _audio"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "Chiamata _video"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "Conversazioni _precedenti"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Invia file"
# (ndt) voce di menù
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Condividi desktop"
# (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Preferito"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Informa_zioni"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Modifica"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Invito per questa stanza"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Invita nella stanza"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "A_ggiungi contatto..."
@@ -2286,17 +2292,17 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%-d %B %Y alle %H.%M UTC"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Pseudonimo:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identificatore:"
# (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2334,7 +2340,7 @@ msgstr "Seleziona"
msgid "new server"
msgstr "nuovo server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2385,115 +2391,115 @@ msgstr "Conversazione con %s"
# (ndt) domenica 01 ottobre 2007
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A %d %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s secondo"
msgstr[1] "%s secondi"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s minuto"
msgstr[1] "%s minuti"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Durata della chiamata: %s. Terminata alle: %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "Oggi"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "Ieri"
# (ndt) domenica 01 ottobre 2007
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%d %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "Qualsiasi ora"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "Chiunque"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "Chi"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "Quando"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Qualsiasi cosa"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "Testo conversazioni"
# (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Chiamate"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "Chiamate in arrivo"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "Chiamate in uscita"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "Chiamate perse"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "Cosa"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr ""
"Eliminare veramente tutte le registrazioni delle conversazioni precedenti?"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "Elimina tutto"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "Elimina da:"
@@ -2515,12 +2521,12 @@ msgid "Profile"
msgstr "Profilo"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Conversazione"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2756,12 +2762,12 @@ msgid "_Accept"
msgstr "Acce_tta"
# (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile...
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "Messaggio modificato alle %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "Normale"
@@ -2880,15 +2886,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Dettagli personali</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Copia indirizzo collegamento"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "Apri c_ollegamento"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Ispeziona HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Localizzazione corrente"
@@ -3065,6 +3076,13 @@ msgstr "Contatti principali"
msgid "Ungrouped"
msgstr "Non raggruppati"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Impossibile trovare il contatto: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Nessun messaggio di errore"
@@ -3162,7 +3180,7 @@ msgstr "Sono presenti delle modifiche non salvate per l'account %s."
msgid "Your new account has not been saved yet."
msgstr "Il nuovo account non è ancora stato salvato."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Connessione..."
@@ -3203,21 +3221,21 @@ msgstr "Fuori rete — Account disabilitato"
msgid "Edit Connection Parameters"
msgstr "Modifica parametri connessione"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Modifica parametri connessione..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Rimuovere «%s» dal computer?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Questo non rimuoverà l'account dal server."
# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3226,25 +3244,25 @@ msgstr ""
"effettuate verranno scartate. Procedere veramente?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Abilitato"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Rinomina"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Salta"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Connetti"
# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3253,7 +3271,7 @@ msgstr ""
"effettuate verranno scartate. Procedere veramente?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Account di messaggistica e VoIP"
@@ -3316,11 +3334,15 @@ msgstr ""
"account Telepathy:\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "Chiamata in corso"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Client audio/video Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Client audio/video Empathy"
@@ -3331,31 +3353,31 @@ msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Chiamata in arrivo"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Chiamata video in arrivo da %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Chiamata in arrivo da %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Rifiuta"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3364,61 +3386,61 @@ msgstr "Rispondi"
# (ndt) quello che c'è dopo è il nome del contatto
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1929
#, c-format
msgid "Call with %s"
msgstr "Chiamata con %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by the machine"
msgstr "L'indirizzo IP visto dal computer"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2183
msgid "The IP address as seen by a server on the Internet"
msgstr "L'indirizzo IP visto da un server su Internet"
# (ndt) il lato oscuro... questa è interessante e da rivedere
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of the peer as seen by the other side"
msgstr "L'indirizzo IP del nodo visto dall'altro lato"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of a relay server"
msgstr "L'indirizzo IP di un relay server"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2189
msgid "The IP address of the multicast group"
msgstr "L'indirizzo IP del gruppo multicast"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.c:2602 ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Sconosciuto"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2961
msgid "On hold"
msgstr "In attesa"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2965
msgid "Mute"
msgstr "Muto"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2967
msgid "Duration"
msgstr "Durata"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2970
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d.%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3066
msgid "Technical Details"
msgstr "Dettagli tecnici"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3105
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3427,7 +3449,7 @@ msgstr ""
"Il programma di %s non è in grado di comprendere alcuno dei formati audio "
"supportati da questo computer"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3436,7 +3458,7 @@ msgstr ""
"Il programma di %s non è in grado di comprendere alcuno dei formati video "
"supportati da questo computer"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3116
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3445,23 +3467,23 @@ msgstr ""
"Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
"una rete che non supporta connessioni dirette."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3122
msgid "There was a failure on the network"
msgstr "Si è verificato un problema sulla rete"
# (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3126
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "I formati audio necessari per eseguire la chiamata non sono installati"
# (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3129
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "I formati video necessari per eseguire la chiamata non sono installati"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3141
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3472,32 +3494,32 @@ msgstr ""
"\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
"attraverso l'azione «Debug» presente nel menù «Aiuto»."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3150
msgid "There was a failure in the call engine"
msgstr "Si è verificato un problema nel motore delle chiamate"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3153
msgid "The end of the stream was reached"
msgstr "Raggiunta la fine del flusso"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3193
msgid "Can't establish audio stream"
msgstr "Impossibile stabilire il flusso audio"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3203
msgid "Can't establish video stream"
msgstr "Impossibile stabilire il flusso video"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3240
#, c-format
msgid "Your current balance is %s."
msgstr "Il saldo attuale è di %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3244
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Saldo non sufficiente per effettuare la chiamata."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3246
msgid "Top Up"
msgstr "Ricarica"
@@ -3534,83 +3556,91 @@ msgstr "_Sommario"
msgid "_Debug"
msgstr "_Debug"
-# (ndt) non molto chiara... non so se sia per cambiare il dispositivo o per accenderlo/spegnerlo
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+# (ndt) non molto chiara... non so se sia per cambiare il dispositivo o per accenderlo/spegnerlo
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Cambia videocamera"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimizza"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Massimizza"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Disabilita la videocamera"
# (ndt) usato lo stesso anche in ekiga
# o meglio andare con un 'Termina'?
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Chiudi"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Chiude la chiamata corrente"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Chiamata video"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Avvia una chiamata video"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Avvia un chiamata audio"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Mostra tastierino"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Visualizza il tastierino"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Abilita/Disabilita la trasmissione video"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Abilita/Disabilita la trasmissione audio"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Codec di codifica:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Codec di decodifica:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Candidato remoto:"
# (ndt) è in un dialogo dove sono elencati i codec di codifica e decofica, questo dovrebbe indicare il codec locale... Quella un po' dopo quello remoto
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Candidato locale:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Audio"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- Client chat Empathy"
@@ -3632,11 +3662,11 @@ msgstr "Connessione automatica"
msgid "Manage Favorite Rooms"
msgstr "Gestione stanze preferite"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Chiudere la finestra?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3645,7 +3675,7 @@ msgstr ""
"Chiudendo questa finestra, il canale %s verrà abbandonato. Per ricevere "
"nuovi messaggi, entrare nuovamente nel canale."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3660,65 +3690,65 @@ msgstr[1] ""
"Chiudendo questa finestra verranno abbandonate %u stanze di conversazione. "
"Per ricevere nuovi messaggi, entrare nuovamente nelle stanze."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Uscire da %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr "Per ricevere nuovi messaggi, entrare nuovamente nella stanza."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Chiudi finestra"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Lascia stanza"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d non letto)"
msgstr[1] "%s (%d non letti)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e %u altro)"
msgstr[1] "%s (e %u altri)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d non letto da altri)"
msgstr[1] "%s (%d non letti da altri)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d non letto da tutti)"
msgstr[1] "%s (%d non letti da tutti)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Invio di %d messaggio in corso"
msgstr[1] "Invio di %d messaggi in corso"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Scrittura messaggio."
@@ -3811,63 +3841,82 @@ msgstr "Risposta Pastebin"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Troppi dati per una singola operazione. Salvare i registri su file."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Finestra di debug"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Invia a Pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pausa"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Livello "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Informazioni"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Messaggio"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Avviso"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Critico"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Errore"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Anche se non visualizzano password, i registri possono contenere "
+"informazioni come l'elenco dei contatti o i messaggi inviati e ricevuti.\n"
+"Per fare in modo che tali informazioni non vengano visualizzate in una "
+"segnalazione d'errore pubblica, è possibile modificare la visibilità "
+"dell'errore segnalato solamente agli sviluppatori dell'applicazione. Per "
+"fare ciò, utilizzare il campo delle opzioni avanzante presente nella <a href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">segnalazione</"
+"a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Orario"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Categoria"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Livello"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3935,7 +3984,7 @@ msgstr "C'è un invito per entrare in %s"
msgid "Incoming file transfer from %s"
msgstr "Trasferimento file in arrivo da %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Password richiesta"
@@ -4301,7 +4350,7 @@ msgstr "Mostrare i gruppi"
msgid "Show account balances"
msgstr "Mostrare i bilanci dell'account"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2240
msgid "Contact List"
msgstr "Elenco contatti"
@@ -4485,68 +4534,91 @@ msgid "Themes"
msgstr "Temi"
# (ndt) pare tooltip... mah...
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Fornisce password"
# (ndt) tooltip
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Disconnette"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "È necessario configurare un account per poter visualizzare i contatti."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"L'account «%s» non può essere utilizzato fino all'aggiornamento del software "
"«%s»."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:669
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:688
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "L'account %s richiede l'autorizzazione"
+
+# (ndt) suggerimento
+#: ../src/empathy-roster-window.c:699
+msgid "Online Accounts"
+msgstr "Account online"
+
+#: ../src/empathy-roster-window.c:746
msgid "Update software..."
msgstr "Aggiorna software..."
# (ndt) suggerimento
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:752
msgid "Reconnect"
msgstr "Riconnette"
# (ndt) suggerimento
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:756
msgid "Edit Account"
msgstr "Modifica account"
# (ndt) suggerimento
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:761
msgid "Close"
msgstr "Chiude"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:903
msgid "Top up account"
msgstr "Ricarica account"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1589
msgid "You need to enable one of your accounts to see contacts here."
msgstr "È necessario abilitare uno degli account per visualizzare i contatti."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1597
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "È necessario abilitare «%s» per visualizzare i contatti."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1675
msgid "Change your presence to see contacts here"
msgstr "Modificare la propria presenza per visualizzare i contatti"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1684
msgid "No match found"
msgstr "Nessun risultato"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1691
+msgid "You haven't added any contact yet"
+msgstr "Non è stato aggiunto ancora alcun contatto"
+
+#: ../src/empathy-roster-window.c:1694
msgid "No online contacts"
msgstr "Nessun contatto collegato"
@@ -4628,6 +4700,14 @@ msgstr "Impostazioni account"
msgid "Go _Online"
msgstr "C_ollegati"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Mostra contatti _fuori rete"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "A_ggiungi contatto..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Nuova conversazione..."
diff --git a/po/kn.po b/po/kn.po
index 5fc58b782..144f942ab 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
"POT-Creation-Date: 2012-11-15 12:18+0000\n"
-"PO-Revision-Date: 2012-11-21 16:01+0530\n"
+"PO-Revision-Date: 2012-11-21 16:03+0530\n"
"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
"Language-Team: Kannada <en@li.org>\n"
"Language: kn\n"
diff --git a/po/lt.po b/po/lt.po
index 2785a8379..79a938e63 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,18 +9,16 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
-"y&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 19:25+0000\n"
-"PO-Revision-Date: 2012-09-30 12:15+0300\n"
-"Last-Translator: Žygimantas BeruÄka <zygis@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-12-26 10:30+0000\n"
+"PO-Revision-Date: 2013-01-01 18:31+0300\n"
+"Last-Translator: Aurimas ÄŒernius <aurisc4@gmail.com>\n"
"Language-Team: Lithuanian\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: gnome\n"
@@ -38,21 +36,19 @@ msgstr "Tikralaikių pokalbių programa Empathy"
#: ../data/empathy.desktop.in.in.h:4
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Plepėkite naudodamiesi „Google Talk“, „Facebook“, „MSN“ ir kitomis pokalbių "
-"paslaugomis"
+msgstr "Plepėkite naudodamiesi „Google Talk“, „Facebook“, „MSN“ ir kitomis pokalbių paslaugomis"
+
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "pokalbiai;pranešimai;žinutės;irc;voip;gtalk;facebook;jabber;"
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Turėtų būti naudojamos ryšių valdyklės"
#: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Ar turėtų būti naudojamos ryšių valdyklės automatiniam atsijungimui / "
-"prisijungimui iš naujo."
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Ar turėtų būti naudojamos ryšių valdyklės automatiniam atsijungimui / prisijungimui iš naujo."
#: ../data/org.gnome.Empathy.gschema.xml.h:3
msgid "Empathy should auto-connect on startup"
@@ -67,11 +63,8 @@ msgid "Empathy should auto-away when idle"
msgstr "Nenaudojant Empathy, turėtų būti nustatoma nebuvimo būsena"
#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Ar Empathy turėtų automatiškai nustatyti nebuvimo būseną, jeigu naudotojas "
-"nesinaudoja kompiuteriu."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Ar Empathy turėtų automatiškai nustatyti nebuvimo būseną, jeigu naudotojas nesinaudoja kompiuteriu."
#: ../data/org.gnome.Empathy.gschema.xml.h:7
msgid "Empathy default download folder"
@@ -84,17 +77,11 @@ msgstr "Numatytasis aplankas, kuriame įrašomi atsiųsti failai."
#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
#: ../data/org.gnome.Empathy.gschema.xml.h:10
msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr ""
-"Magiškas numeris, naudojamas patikrinti, ar reikai vykdyti būklės "
-"patikrinimo darbus"
+msgstr "Magiškas numeris, naudojamas patikrinti, ar reikai vykdyti būklės patikrinimo darbus"
#: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c naudoja šį numerį patikrinimui, ar išvalymo darbai "
-"turi būti vykdomi. Naudotojai neturėtų rankomis keisti šio rakto."
+msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
+msgstr "empathy-sanity-cleaning.c naudoja šį numerį patikrinimui, ar išvalymo darbai turi būti vykdomi. Naudotojai neturėtų rankomis keisti šio rakto."
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
@@ -123,8 +110,7 @@ msgstr "Paslėpti pagrindinį langą."
#: ../data/org.gnome.Empathy.gschema.xml.h:18
msgid "Default directory to select an avatar image from"
-msgstr ""
-"Numatytasis aplankas, iš kurio pasirinktinas pseudoportreto paveikslėlis"
+msgstr "Numatytasis aplankas, iš kurio pasirinktinas pseudoportreto paveikslėlis"
#: ../data/org.gnome.Empathy.gschema.xml.h:19
msgid "The last directory that an avatar image was chosen from."
@@ -143,12 +129,8 @@ msgid "Display incoming events in the status area"
msgstr "Rodyti gaunamus įvykius būsenos srityje"
#: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Rodyti gaunamus įvykius būsenos srityje. Jei reikšmė neigiama, pateikti juos "
-"naudotojui nedelsiant."
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Rodyti gaunamus įvykius būsenos srityje. Jei reikšmė neigiama, pateikti juos naudotojui nedelsiant."
#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
@@ -219,8 +201,7 @@ msgid "Play a sound when a contact logs out"
msgstr "Atsijungus kontaktui sugroti garsÄ…"
#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "Ar sugroti garsÄ… kontaktams atsijungiant nuo tinklo."
#: ../data/org.gnome.Empathy.gschema.xml.h:42
@@ -260,12 +241,8 @@ msgid "Pop up notifications if the chat isn't focused"
msgstr "Rodyti iÅ¡kylanÄius praneÅ¡imus, jei pokalbio langas nesuaktyvintas"
#: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Ar rodyti iškylantį pranešimo langą, kai gaunama nauja žinutė, net jei "
-"pokalbio langas yra jau atvertas, taÄiau nesuaktyvintas."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Ar rodyti iÅ¡kylantį praneÅ¡imo langÄ…, kai gaunama nauja žinutÄ—, net jei pokalbio langas yra jau atvertas, taÄiau nesuaktyvintas."
#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
@@ -312,8 +289,7 @@ msgid "Chat window theme variant"
msgstr "Pokalbio lango temos variantas"
#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "The theme variant that is used to display the conversation in chat windows."
msgstr "Temos variantas, naudojamas pokalbio rodymui pokalbių languose."
#: ../data/org.gnome.Empathy.gschema.xml.h:64
@@ -321,34 +297,24 @@ msgid "Path of the Adium theme to use"
msgstr "Naudotinos „Adium“ temos kelias"
#: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
-msgstr ""
-"Naudotinos „Adium“ temos kelias, jei pokalbiui naudojama tema yra „Adium“. "
-"Nebenaudojama."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
+msgstr "Naudotinos „Adium“ temos kelias, jei pokalbiui naudojama tema yra „Adium“. Nebenaudojama."
#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "Įjungti WebKit programuotojų įrankius"
#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Ar turėtų būti įjungti WebKit programuotojų įrankiai, pvz., Web Inspector."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Ar turėtų būti įjungti WebKit programuotojų įrankiai, pvz., Web Inspector."
#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr "Pranešti kitiems naudotojams, kad jūs rašote jiems"
#: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"Ar siųsti pokalbio būsenas „rašo“ arba „sustapdyta“. Šiuo metu nepaveikia "
-"„atsitraukęs“ būsenos."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Ar siųsti pokalbio būsenas „rašo“ arba „sustapdyta“. Šiuo metu nepaveikia „atsitraukęs“ būsenos."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
@@ -363,42 +329,31 @@ msgid "Spell checking languages"
msgstr "Kalbos, kurių rašyba tikrinama"
#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Kableliu atskirtų kalbų, kurių rašyba tikrinama, sąrašas (pvz., „lt, en, "
-"fr“)."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Kableliu atskirtų kalbų, kurių rašyba tikrinama, sąrašas (pvz., „lt, en, fr“)."
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "Įjungti rašybos tikrinimą"
#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Ar tikrinti įvedamų žodžių rašybą pasirenkant jūsų pageidaujamas kalbas."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Ar tikrinti įvedamų žodžių rašybą pasirenkant jūsų pageidaujamas kalbas."
#: ../data/org.gnome.Empathy.gschema.xml.h:76
msgid "Nick completed character"
msgstr "Slapyvardžio užbaigimo simbolis"
#: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Po slapyvardžio pridėtinas simbolis, naudojant slapyvardžio užbaigimą (tab) "
-"grupÄ—s pokalbiuose."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Po slapyvardžio pridėtinas simbolis, naudojant slapyvardžio užbaigimą (tab) grupės pokalbiuose."
#: ../data/org.gnome.Empathy.gschema.xml.h:78
msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy turėtų naudoti kontakto pseudoportretą pokalbio lango piktogramai"
+msgstr "Empathy turėtų naudoti kontakto pseudoportretą pokalbio lango piktogramai"
#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Ar naudoti kontakto pseudoportretÄ… kaip pokalbio lango piktogramÄ…."
#: ../data/org.gnome.Empathy.gschema.xml.h:80
@@ -407,9 +362,7 @@ msgstr "PaskutinÄ— paskyra, pasirinkta prisijungimo prie kambario dialoge"
#: ../data/org.gnome.Empathy.gschema.xml.h:81
msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"PaskutinÄ—s paskyros, pasirinktos prijungti prie kambario, D-Bus objekto "
-"kelias."
+msgstr "PaskutinÄ—s paskyros, pasirinktos prijungti prie kambario, D-Bus objekto kelias."
#: ../data/org.gnome.Empathy.gschema.xml.h:82
msgid "Camera device"
@@ -417,9 +370,7 @@ msgstr "Kameros įrenginys"
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Numatytasis kameros įrenginys, naudojamas vaizdiniams skambuÄiams, pvz., "
-"/dev/video0."
+msgstr "Numatytasis kameros įrenginys, naudojamas vaizdiniams skambuÄiams, pvz., /dev/video0."
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
@@ -442,12 +393,8 @@ msgid "Show hint about closing the main window"
msgstr "Perspėti apie pagrindinio lango užvėrimą"
#: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Ar rodyti pranešimo apie pagrindinio lango uždarymą dialogą su mygtuku „x“ "
-"antraštės juostoje."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Ar rodyti pranešimo apie pagrindinio lango uždarymą dialogą su mygtuku „x“ antraštės juostoje."
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
@@ -486,10 +433,8 @@ msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy turėtų sumažinti vietovės tikslumą"
#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Ar Empathy turėtų sumažinti vietovės rodymo tikslumą privatumo sumetimais."
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Ar Empathy turėtų sumažinti vietovės rodymo tikslumą privatumo sumetimais."
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
@@ -515,7 +460,8 @@ msgstr "Klaida bandant persiųsti failą"
msgid "The other participant is unable to transfer the file"
msgstr "Kitas dalyvis negali persiųsti failo"
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-utils.c:306
msgid "Unknown reason"
msgstr "Nežinoma priežastis"
@@ -535,7 +481,8 @@ msgstr "Pasirinktas failas nÄ—ra normalus failas"
msgid "The selected file is empty"
msgstr "Pasirinktas failas yra tuÅ¡Äias"
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:85
+#: ../libempathy/empathy-keyring.c:194
msgid "Password not found"
msgstr "Slaptažodis nerastas"
@@ -549,7 +496,8 @@ msgstr "Pranešimų paskyros %s slaptažodis (%s)"
msgid "Password for chatroom '%s' on account %s (%s)"
msgstr "Pokalbių kambario „%s“ slaptažodis paskyrai %s (%s)"
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:403
+#: ../src/empathy-call-observer.c:116
#, c-format
msgid "Missed call from %s"
msgstr "Praleistas skambutis nuo %s"
@@ -647,21 +595,25 @@ msgstr "Nežinoma"
msgid "No reason specified"
msgstr "Nenurodyta priežastis"
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:336
msgid "Status is set to offline"
msgstr "Būsena nustatyta į „atsijungta“"
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:316
#: ../libempathy-gtk/empathy-call-utils.c:47
#: ../libempathy-gtk/empathy-new-message-dialog.c:80
msgid "Network error"
msgstr "Tinklo klaida"
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:318
msgid "Authentication failed"
msgstr "Nepavyko nustatyti tapatybÄ—s"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:320
msgid "Encryption error"
msgstr "Å ifravimo klaida"
@@ -669,31 +621,38 @@ msgstr "Å ifravimo klaida"
msgid "Name in use"
msgstr "Vardas jau naudojamas"
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate not provided"
msgstr "Nepateiktas liudijimas"
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:324
msgid "Certificate untrusted"
msgstr "Liudijimas nepatikimas"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate expired"
msgstr "Nebegaliojantis liudijimas"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
msgid "Certificate not activated"
msgstr "Liudijimas neaktyvuotas"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
msgid "Certificate hostname mismatch"
msgstr "Neatitinka liudijimo kompiuterio vardas"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
msgid "Certificate fingerprint mismatch"
msgstr "Neatitinka liudijimo kontrolinis kodas"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
msgid "Certificate self-signed"
msgstr "Paties pasirašytas liudijimas"
@@ -726,8 +685,7 @@ msgid "This account is already connected to the server"
msgstr "Å i paskyra jau prisijungta prie serverio"
#: ../libempathy/empathy-utils.c:350
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+msgid "Connection has been replaced by a new connection using the same resource"
msgstr "Ryšį pakeitė naujas ryšys, naudojantis tą patį išteklių"
#: ../libempathy/empathy-utils.c:353
@@ -743,19 +701,12 @@ msgid "Certificate has been revoked"
msgstr "Liudijimas atšauktas"
#: ../libempathy/empathy-utils.c:359
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"Liudijimas naudoja nesaugų šifravimo algoritmą arba yra kriptografiškai "
-"silpnas"
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Liudijimas naudoja nesaugų šifravimo algoritmą arba yra kriptografiškai silpnas"
#: ../libempathy/empathy-utils.c:362
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Serverio liudijimo ilgis, arba serverio liudijimų sekos gylis, viršija "
-"kriptografijos bibliotekos numatytas ribas"
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Serverio liudijimo ilgis, arba serverio liudijimų sekos gylis, viršija kriptografijos bibliotekos numatytas ribas"
#: ../libempathy/empathy-utils.c:366
msgid "Your software is too old"
@@ -774,11 +725,12 @@ msgstr "Žmonės netoliese"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538
+#: ../src/empathy-roster-window.c:642
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook pokalbis"
@@ -880,7 +832,7 @@ msgstr "Serveris"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Prievadas"
@@ -1010,12 +962,8 @@ msgid "Servers"
msgstr "Serveriai"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Daugumai IRC serverių nereikia slaptažodžio, todėl jei nesate tikras, "
-"neįveskite slaptažodžio."
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Daugumai IRC serverių nereikia slaptažodžio, todėl jei nesate tikras, neįveskite slaptažodžio."
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Nickname"
@@ -1050,13 +998,11 @@ msgstr "Koks jūsų „Facebook“ naudotojo vardas?"
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
msgstr ""
"Tai jūsų naudotojo vardas, o ne jūsų „Facebook“ prisijungimo vardas.\n"
"Jeigu jis yra facebook.com/<b>barsukas</b>, įveskite <b>barsukas</b>.\n"
-"Jeigu neturite „Facebook“ naudotojo vardo, pasirinkite pasinaudodami šiuo <a "
-"href=\"http://www.facebook.com/username/\">Å¡iuo</a> puslapiu."
+"Jeigu neturite „Facebook“ naudotojo vardo, pasirinkite pasinaudodami šiuo <a href=\"http://www.facebook.com/username/\">šiuo</a> puslapiu."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
@@ -1414,12 +1360,8 @@ msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <pokalbių kambario ID>: prisijungti prie naujo pokalbių kambario"
#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
-msgstr ""
-"/part [<pokalbių kambario ID>] [<priežastis>]: išeiti iš pokalbių kambario; "
-"dabartinio, jei nenurodyta kitaip"
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
+msgstr "/part [<pokalbių kambario ID>] [<priežastis>]: išeiti iš pokalbių kambario; dabartinio, jei nenurodyta kitaip"
#: ../libempathy-gtk/empathy-chat.c:1071
msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1438,26 +1380,16 @@ msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <žinutė>: siųsti dabartiniam pokalbiui žinutę ACTION"
#: ../libempathy-gtk/empathy-chat.c:1083
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <žinutė>: siųsti dabartiniam pokalbiui <žinutę>. Tai naudojama norint "
-"siųsti žinutÄ™, prasidedanÄia simboliu „/“. Pavyzdžiui: „/say /join naudojama "
-"norint prisijungti prie naujo pokalbių kambario“"
+msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
+msgstr "/say <žinutÄ—>: siųsti dabartiniam pokalbiui <žinutÄ™>. Tai naudojama norint siųsti žinutÄ™, prasidedanÄia simboliu „/“. Pavyzdžiui: „/say /join naudojama norint prisijungti prie naujo pokalbių kambario“"
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <kontakto ID>: parodo informacijÄ… apie kontaktÄ…"
#: ../libempathy-gtk/empathy-chat.c:1091
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<komanda>]: rodyti visas palaikomas komandas. Jei <komanda> "
-"apibrėžta, rodyti, kaip ją naudoti."
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<komanda>]: rodyti visas palaikomas komandas. Jei <komanda> apibrėžta, rodyti, kaip ją naudoti."
#: ../libempathy-gtk/empathy-chat.c:1110
#, c-format
@@ -1470,20 +1402,21 @@ msgstr "Nežinoma komanda"
#: ../libempathy-gtk/empathy-chat.c:1281
msgid "Unknown command; see /help for the available commands"
-msgstr ""
-"Nežinoma komanda. Galimas komandas galite pamatyti įvykdę komandą /help"
+msgstr "Nežinoma komanda. Galimas komandas galite pamatyti įvykdę komandą /help"
#: ../libempathy-gtk/empathy-chat.c:1538
msgid "insufficient balance to send message"
msgstr "nepakankamas balansas žinutės siuntimui"
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1556
#: ../libempathy-gtk/empathy-chat.c:1619
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Klaida siunÄiant žinutÄ™ „%s“: %s"
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1544
+#: ../libempathy-gtk/empathy-chat.c:1561
#: ../libempathy-gtk/empathy-chat.c:1623
#, c-format
msgid "Error sending message: %s"
@@ -1524,7 +1457,8 @@ msgstr "Å¡i funkcija dar nerealizuota"
msgid "unknown"
msgstr "nežinoma"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Tema:"
@@ -1638,9 +1572,12 @@ msgstr "%s dabar žinomas (-a) kaip %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989
+#: ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582
+#: ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Atsijungęs (-usi)"
@@ -1671,7 +1608,8 @@ msgstr "Šis kambarys yra apsaugotas slaptažodžiu:"
msgid "Join"
msgstr "Prisijungti"
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4077
+#: ../src/empathy-event-manager.c:1187
msgid "Connected"
msgstr "Prisijungęs (-usi)"
@@ -1875,12 +1813,8 @@ msgid "Groups"
msgstr "GrupÄ—s"
#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Pasirinkite grupes, į kurias norite įtraukti šį kontaktą. Galite pasirinkti "
-"daugiau nei vienÄ… grupÄ™ arba nepasirinkti nei vienos grupÄ—s."
+msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
+msgstr "Pasirinkite grupes, į kurias norite įtraukti šį kontaktą. Galite pasirinkti daugiau nei vieną grupę arba nepasirinkti nei vienos grupės."
#: ../libempathy-gtk/empathy-groups-widget.c:358
msgid "_Add Group"
@@ -1959,124 +1893,120 @@ msgstr "Įdiekite gnome-contacts prieigai prie kontaktų duomenų."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Pasirinkite naudotinÄ… paskyrÄ… skambuÄio vykdymui"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Skambutis"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Mobilusis"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Darbas"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "NAMAI"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Blokuoti kontaktÄ…"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "IÅ¡trinti ir _blokuoti"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ar tikrai norite pašalinti kontaktą „%s“?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"Ar tikrai norite pašalinti susietąjį kontaktą „%s“? Atminkite, jog bus "
-"pašalinti visi kontaktai, sudarantys šį susietąjį kontaktą."
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "Ar tikrai norite pašalinti susietąjį kontaktą „%s“? Atminkite, jog bus pašalinti visi kontaktai, sudarantys šį susietąjį kontaktą."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Å alinamas kontaktas"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Pašalinti"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Pokalbis"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Garsinis skambutis"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Vaizdinis skambutis"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Ankstesni pokalbiai"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Siųsti failą"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Dalintis mano darbastaliu"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "MÄ—giamas"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Infor_macija"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Taisyti"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Jus kvieÄia į šį kambarį"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Pakviesti į pokalbių kambarį"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "_Pridėti kontaktą…"
@@ -2256,31 +2186,21 @@ msgstr "Pasirinkti"
msgid "new server"
msgstr "naujas serveris"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct."
-msgstr ""
-"Empathy gali automatiÅ¡kai atrasti žmones, esanÄius tame paÄiame tinkle kaip "
-"ir jūs, ir leisti su jais kalbėtis. Jeigu norite pasinaudoti šia funkcija, "
-"pažiūrėkite, ar žemiau esantys duomenys yra teisingi."
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy gali automatiÅ¡kai atrasti žmones, esanÄius tame paÄiame tinkle kaip ir jÅ«s, ir leisti su jais kalbÄ—tis. Jeigu norite pasinaudoti Å¡ia funkcija, pažiÅ«rÄ—kite, ar žemiau esantys duomenys yra teisingi."
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
msgid "People nearby"
msgstr "Žmonės netoliese"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr ""
-"Jūs galite pakeisti šiuos duomenis vėliau arba išjungti šią savybę "
-"pasirinkite <span style=\"italic\">Taisyti → Paskyros</span> kontaktų sąraše."
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Jūs galite pakeisti šiuos duomenis vėliau arba išjungti šią savybę pasirinkite <span style=\"italic\">Taisyti → Paskyros</span> kontaktų sąraše."
#: ../libempathy-gtk/empathy-log-window.c:622
msgid "History"
@@ -2421,7 +2341,8 @@ msgid "_File"
msgstr "_Failas"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Edit"
msgstr "_Taisyti"
@@ -2434,12 +2355,13 @@ msgid "Profile"
msgstr "Profilis"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438
+#: ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Pokalbis"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Vaizdo įrašas"
@@ -2560,8 +2482,7 @@ msgid ""
"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
msgstr ""
"<b>Dabartinė žinutė: %s</b>\n"
-"<small><i>Norėdami nustatyti naują žinutę, spauskite „Enter“, norėdami "
-"atšaukti – „Esc“.</i></small>"
+"<small><i>Norėdami nustatyti naują žinutę, spauskite „Enter“, norėdami atšaukti – „Esc“.</i></small>"
#: ../libempathy-gtk/empathy-presence-chooser.c:393
msgid "Set status"
@@ -2668,12 +2589,12 @@ msgstr "_Atmesti"
msgid "_Accept"
msgstr "_Priimti"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "Žinutė redaguota %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "Normalus"
@@ -2699,16 +2620,14 @@ msgstr "Liudijime nÄ—ra laukto kontrolinio kodo."
#: ../libempathy-gtk/empathy-tls-dialog.c:170
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr ""
-"Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu."
+msgstr "Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu."
#: ../libempathy-gtk/empathy-tls-dialog.c:174
msgid "The certificate is self-signed."
msgstr "Savo paÄių pasiraÅ¡ytas liudijimas."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
msgstr "Liudijimą atšaukė liudijimus išduodanti įstaiga."
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2767,12 +2686,8 @@ msgstr "Nepakanka laisvos vietos failui įrašyti"
#: ../libempathy-gtk/empathy-ui-utils.c:1256
#, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"Å iam failui įraÅ¡yti reikia %s laisvos vietos, taÄiau prieinama tik %s. "
-"Pasirinkite kitÄ… vietÄ…."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Å iam failui įraÅ¡yti reikia %s laisvos vietos, taÄiau prieinama tik %s. Pasirinkite kitÄ… vietÄ…."
#: ../libempathy-gtk/empathy-ui-utils.c:1302
#, c-format
@@ -2788,15 +2703,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Asmeniniai duomenys</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Kopijuoti nuorodos adresÄ…"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Atverti nuorodÄ…"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "NagrinÄ—ti HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "DabartinÄ— lokalÄ—"
@@ -2972,6 +2892,13 @@ msgstr "Populiariausi kontaktai"
msgid "Ungrouped"
msgstr "Negrupuoti"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Serveris negali rasti kontakto: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Nėra klaidų pranešimų"
@@ -2981,38 +2908,16 @@ msgid "Instant Message (Empathy)"
msgstr "Tikralaikė žinutė (Empathy)"
#: ../src/empathy-about-dialog.c:81
-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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"„Empathy“ yra laisvoji programinė įranga. Galite ją platinti ir / arba "
-"modifikuoti pagal GNU Bendrosios viešosios licencijos sąlygas, paskelbtas "
-"Laisvosios programinės įrangos fondo; 2-osios arba (savo nuožiūra) bet "
-"kurios vÄ—lesnÄ—s licencijos versijos sÄ…lygas."
+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 Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "„Empathy“ yra laisvoji programinė įranga. Galite ją platinti ir / arba modifikuoti pagal GNU Bendrosios viešosios licencijos sąlygas, paskelbtas Laisvosios programinės įrangos fondo; 2-osios arba (savo nuožiūra) bet kurios vėlesnės licencijos versijos sąlygas."
#: ../src/empathy-about-dialog.c:85
-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 "
-"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-"details."
-msgstr ""
-"„Empathy“ yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ "
-"GARANTIJŲ, netgi be numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI "
-"garantijų. Išsamesnės informacijos ieškokite GNU Bendrojoje viešojoje "
-"licencijoje."
+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 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
+msgstr "„Empathy“ yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ, netgi be numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI garantijų. Išsamesnės informacijos ieškokite GNU Bendrojoje viešojoje licencijoje."
#: ../src/empathy-about-dialog.c:89
-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 "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Jūs turėjote gauti GNU Bendrosios viešosios licencijos kopiją kartu su "
-"„Empathy“ programa. Jei negavote, rašykite adresu: Free Software Foundation, "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA."
+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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Jūs turėjote gauti GNU Bendrosios viešosios licencijos kopiją kartu su „Empathy“ programa. Jei negavote, rašykite adresu: Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA."
#: ../src/empathy-about-dialog.c:109
msgid "An Instant Messaging client for GNOME"
@@ -3027,20 +2932,15 @@ msgstr ""
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Nerodyti jokių dialogų, atlikti pageidaujamas užduotis (pvz., importuoti) ir "
-"baigti darbÄ…"
+msgstr "Nerodyti jokių dialogų, atlikti pageidaujamas užduotis (pvz., importuoti) ir baigti darbą"
#: ../src/empathy-accounts.c:186
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "Nerodyti jokių dialogų, nebent yra tik „Žmonės netoliese“ tipo paskyros"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Iš pradžių pasirinkti duotąją paskyrą (pvz., gabble/jabber/"
-"foo_40pavyzdys_2eorg0)"
+msgstr "Iš pradžių pasirinkti duotąją paskyrą (pvz., gabble/jabber/foo_40pavyzdys_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3067,7 +2967,8 @@ msgstr "Jūsų %s paskyroje yra neįrašytų pakeitimų."
msgid "Your new account has not been saved yet."
msgstr "Jūsų naujoji paskyra dar neįrašyta."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404
+#: ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Jungiamasi…"
@@ -3090,14 +2991,8 @@ msgid "Unknown Status"
msgstr "Nežinoma būsena"
#: ../src/empathy-accounts-dialog.c:492
-msgid ""
-"This account has been disabled because it relies on an old, unsupported "
-"backend. Please install telepathy-haze and restart your session to migrate "
-"the account."
-msgstr ""
-"Ši paskyra buvo išjungta, nes ji naudoja seną, nepalaikomą realizaciją. "
-"Įdiekite telepathy-haze ir iš naujo paleiskite savo seansą paskyros "
-"migravimui."
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Ši paskyra buvo išjungta, nes ji naudoja seną, nepalaikomą realizaciją. Įdiekite telepathy-haze ir iš naujo paleiskite savo seansą paskyros migravimui."
#: ../src/empathy-accounts-dialog.c:502
msgid "Offline — Account Disabled"
@@ -3107,20 +3002,20 @@ msgstr "Neprisijungta – Paskyra išjungta"
msgid "Edit Connection Parameters"
msgstr "Taisyti ryšio parametrus"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Taisyti ryšio parametrus..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ar tikrai norite pašalinti %s iš savo kompiuterio?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Jūsų paskyros serveryje nebus pašalintos."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3129,24 +3024,24 @@ msgstr ""
"Ar tikrai norite tęsti?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "Įj_ungta"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Pervadinti"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "P_raleisti"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Prisijungti"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3155,7 +3050,7 @@ msgstr ""
"Ar tikrai norite tęsti?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Pokalbių ir VoIP paskyros"
@@ -3168,12 +3063,8 @@ msgid "Loading account information"
msgstr "Įkeliama paskyros informacija"
#: ../src/empathy-accounts-dialog.ui.h:5
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Norint sukurti naują paskyrą, pirma reikia įdiegti kiekvieno pageidaujamo "
-"naudoti protokolo posistemÄ™."
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Norint sukurti naują paskyrą, pirma reikia įdiegti kiekvieno pageidaujamo naudoti protokolo posistemę."
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol backends installed"
@@ -3206,21 +3097,24 @@ msgstr "Klaida susisiekiant su paskyrų tvarkykle"
#: ../src/empathy.c:625
#, c-format
msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
"\n"
"%s"
msgstr ""
-"Įvyko klaida bandant susisiekti su Telepathy paskyrų tvarkykle. Klaida "
-"buvo:\n"
+"Įvyko klaida bandant susisiekti su Telepathy paskyrų tvarkykle. Klaida buvo:\n"
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "Pokalbyje"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "– Empathy garso/vaizdo transliavimo klientas"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy garso/vaizdo transliavimo klientas"
@@ -3231,31 +3125,35 @@ msgstr "%s ką tik jums skambino, bet tuo metu kalbėjote su kažkuo kitu."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131
+#: ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Skambutis jums"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Gaunamas vaizdinis skambutis iš %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Skambutis jums nuo %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Atmesti"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3263,139 +3161,119 @@ msgstr "Atsiliepti"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Skambinti su %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "Kompiuterio matomas IP adresas"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "Interneto serverio matomas IP adresas"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "Kitos pusÄ—s matomas lygiarangio IP adresas"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "Perdavimo serverio IP adresas"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "Daugiaadresio perdavimo grupÄ—s IP adresas"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598
+#: ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600
+#: ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Nežinoma"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "Laukia"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "Nutildyti"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "TrukmÄ—"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "TechninÄ— informacija"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
-"formatų"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgstr "Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų formatų"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
-"vaizdo įrašų formatų"
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr "Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų vaizdo įrašų formatų"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, "
-"nepriimanÄiame tiesioginių prisijungimų."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Nepavyko užmegzti ryÅ¡io su %s. Gali bÅ«ti, kad vienas iÅ¡ jÅ«sų yra tinkle, nepriimanÄiame tiesioginių prisijungimų."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Tinkle yra triktis"
-#: ../src/empathy-call-window.c:3039
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"JÅ«sų kompiuteryje neįdiegti garso įrašų formatai, reikalingi Å¡iam skambuÄiui"
+#: ../src/empathy-call-window.c:3124
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "JÅ«sų kompiuteryje neįdiegti garso įrašų formatai, reikalingi Å¡iam skambuÄiui"
-#: ../src/empathy-call-window.c:3042
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"JÅ«sų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi Å¡iam skambuÄiui"
+#: ../src/empathy-call-window.c:3127
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "JÅ«sų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi Å¡iam skambuÄiui"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy komponente atsitiko kažkas nenumatyta. <a href=\"%s\">Praneškite "
-"apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba "
-"„Derinimo“ lange."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Telepathy komponente atsitiko kažkas nenumatyta. <a href=\"%s\">Praneškite apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba „Derinimo“ lange."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "Skambinimo posistemÄ—je yra triktis"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Pasiekta srauto pabaiga"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "Nepavyko sukurti garso srauto"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "Nepavyko sukurti vaizdo srauto"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "Jūsų balansas yra %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Deja, jūs neturite pakankamai kreditų, kad galėtumėte paskambinti."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Pakelti"
@@ -3419,11 +3297,13 @@ msgstr "_Nustatymai"
msgid "_View"
msgstr "_Rodymas"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Help"
msgstr "_Žinynas"
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Contents"
msgstr "_Turinys"
@@ -3432,78 +3312,87 @@ msgid "_Debug"
msgstr "_Derinti"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Sukeisti kameras"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Sumažinti"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "IÅ¡didinti"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "IÅ¡jungti kamerÄ…"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Padėti ragelį"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Baigti dabartinį pokalbį"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Vaizdo skambutis"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Pradėti vaizdo skambutį"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Pradėti garso skambutį"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Rodyti skambinimo skydelį"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Rodyti skambinimo skydelį"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Perjungti vaizdo transliavimÄ…"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Įjungti garso transliavimą"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Kodavimo kodekas:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Dekodavimo kodekas:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Nuotolinis kandidatas:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Vietos kandidatas:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Garsas"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "– Tikralaikių pokalbių klientas Empathy"
@@ -3523,59 +3412,42 @@ msgstr "Automatiškai prisijungti"
msgid "Manage Favorite Rooms"
msgstr "Tvarkyti mÄ—giamus kambarius"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Užverti šį langą?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
-msgid ""
-"Closing this window will leave %s. You will not receive any further messages "
-"until you rejoin it."
-msgstr ""
-"Užvėrę šį langą, išeisite iš %s. Nebegausite jokių pranešimų, kol vėl prie "
-"jo neprisijungsite."
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Užvėrę šį langą, išeisite iš %s. Nebegausite jokių pranešimų, kol vėl prie jo neprisijungsite."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
-msgid ""
-"Closing this window will leave a chat room. You will not receive any further "
-"messages until you rejoin it."
-msgid_plural ""
-"Closing this window will leave %u chat rooms. You will not receive any "
-"further messages until you rejoin them."
-msgstr[0] ""
-"Užvėrę šį langą, išeisite iš %u pokalbių kambario. Nebegausite jokių "
-"pranešimų, kol vėl prie jo neprisijungsite."
-msgstr[1] ""
-"Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių "
-"pranešimų, kol vėl prie jų neprisijungsite."
-msgstr[2] ""
-"Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių "
-"pranešimų, kol vėl prie jų neprisijungsite."
-
-#: ../src/empathy-chat-window.c:310
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "Užvėrę šį langą, išeisite iš %u pokalbių kambario. Nebegausite jokių pranešimų, kol vėl prie jo neprisijungsite."
+msgstr[1] "Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių pranešimų, kol vėl prie jų neprisijungsite."
+msgstr[2] "Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių pranešimų, kol vėl prie jų neprisijungsite."
+
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Išeiti iš %s?"
-#: ../src/empathy-chat-window.c:312
-msgid ""
-"You will not receive any further messages from this chat room until you "
-"rejoin it."
-msgstr ""
-"Negausite jokių tolesnių pranešimų iš šio pokalbių kambario, kol vėl prie jo "
-"neprisijungsite."
+#: ../src/empathy-chat-window.c:319
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Negausite jokių tolesnių pranešimų iš šio pokalbių kambario, kol vėl prie jo neprisijungsite."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Užverti langą"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Išeiti iš kambario"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3583,7 +3455,7 @@ msgstr[0] "%s (%d neskaitytas)"
msgstr[1] "%s (%d neskaityti)"
msgstr[2] "%s (%d neskaitytų)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3591,7 +3463,7 @@ msgstr[0] "%s (ir %u kitas)"
msgstr[1] "%s (ir %u kiti)"
msgstr[2] "%s (ir %u kitų)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3599,7 +3471,7 @@ msgstr[0] "%s (%d neskaitytas iš kitų)"
msgstr[1] "%s (%d neskaityti iš kitų)"
msgstr[2] "%s (%d neskaitytų iš kitų)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3607,11 +3479,11 @@ msgstr[0] "%s (%d neskaitytas iš visų)"
msgstr[1] "%s (%d neskaityti iš visų)"
msgstr[2] "%s (%d neskaityta iš visų)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3619,7 +3491,7 @@ msgstr[0] "SiunÄiama %d žinutÄ—"
msgstr[1] "SiunÄiamos %d žinutÄ—s"
msgstr[2] "SiunÄiama %d žinuÄių"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Rašoma žinutė."
@@ -3643,7 +3515,8 @@ msgstr "_Mėgstamiausias pokalbių kambarys"
msgid "Notify for All Messages"
msgstr "Įspėti apie visus pranešimus"
-#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-status-icon.ui.h:1
msgid "_Show Contact List"
msgstr "_Rodyti kontaktų sąrašą"
@@ -3711,66 +3584,73 @@ msgstr "„Pastebin“ atsakas"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Per daug duomenų įkelti vienu kartu. Įrašykite žurnalus į failą."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Derinimo langas"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Siūsti į „pastebin“"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "PauzÄ—"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Lygis "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Derinimas"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Informacija"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002
+#: ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Pranešimas"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "PerspÄ—jimas"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "KritinÄ—"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Klaida"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
+"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Net jei nerodo slaptažodžių, žurnalai turi jautrios informacijos, tokios kaip jÅ«sų kontaktų ar neseniai siųstų bei gautų žinuÄių sÄ…raÅ¡ai.\n"
+"Jei nenorite tokios informacijos matyti viešumoje pranešime apie klaidą, galite apriboti pranešomos klaidos matomumą tik Empathy kūrėjams parodydami sudėtingesnius laukus <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">pranešime apie klaidą</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Laikas"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Sritis"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategorija"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Lygis"
-#: ../src/empathy-debug-window.c:2073
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../src/empathy-debug-window.c:2100
+msgid "The selected connection manager does not support the remote debugging extension."
msgstr "Pasirinktoji ryšių valdyklė nepalaiko nuotolinio derinimo plėtinio."
#: ../src/empathy-event-manager.c:508
@@ -3791,7 +3671,8 @@ msgstr "%s jums skambina, ar atsiliepsite?"
msgid "_Reject"
msgstr "A_tmesti"
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
+#: ../src/empathy-event-manager.c:557
msgid "_Answer"
msgstr "_Atsiliepti"
@@ -3832,7 +3713,8 @@ msgstr "JÅ«s kvieÄiami prisijungti prie %s"
msgid "Incoming file transfer from %s"
msgstr "Failo atsiuntimas iš %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973
+#: ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Reikalingas slaptažodis"
@@ -3922,16 +3804,19 @@ msgstr "„%s“ išsiųstas gavėjui %s"
msgid "File transfer completed"
msgstr "Atsiųsta"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:615
+#: ../src/empathy-ft-manager.c:779
msgid "Waiting for the other participant's response"
msgstr "Laukiama kito dalyvio atsakymo"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641
+#: ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Tikrinamas „%s“ vientisumas"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644
+#: ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Kuriama „%s“ maiša"
@@ -3961,12 +3846,8 @@ msgid "_Import"
msgstr "_Importuoti"
#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Nerasta importuotinų paskyrų. Kol kas Empathy gali importuoti paskyras tik "
-"iš Pidgin programos."
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Nerasta importuotinų paskyrų. Kol kas Empathy gali importuoti paskyras tik iš Pidgin programos."
#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
@@ -4038,31 +3919,20 @@ msgid "Join Room"
msgstr "Prisijungti prie kambario"
#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Įveskite kambario, į kurį norite įeiti, pavadinimą arba spustelėkite vieną "
-"ar daugiau kambarių sąraše."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Įveskite kambario, į kurį norite įeiti, pavadinimą arba spustelėkite vieną ar daugiau kambarių sąraše."
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Room:"
msgstr "_Kambarys:"
#: ../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&apos;s server"
-msgstr ""
-"Nurodykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite "
-"nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
+msgstr "Nurodykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Įrašykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite "
-"nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Įrašykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "_Server:"
@@ -4185,7 +4055,8 @@ msgstr "Rodyti grupes"
msgid "Show account balances"
msgstr "Rodyti paskyrų sąskaitas"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-roster-window.c:2202
msgid "Contact List"
msgstr "Kontaktų sąrašas"
@@ -4274,29 +4145,16 @@ msgid "Use _echo cancellation to improve call quality"
msgstr "Naudoti _aido Å¡alinimÄ…, skambuÄio kokybei pagerinti"
#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Aido panaikinimas padeda padaryti jūsų balsą aiškesnį kitam asmeniui, bet "
-"gali sukelti problemų kai kuriuose kompiuteriuose. Jei jūs arba kitas asmuo "
-"girdi keistus triukÅ¡mus ar nesklandumus skambuÄio metu, bandykite iÅ¡jungti "
-"aido panaikinimą ir skambinti iš naujo."
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Aido panaikinimas padeda padaryti jÅ«sų balsÄ… aiÅ¡kesnį kitam asmeniui, bet gali sukelti problemų kai kuriuose kompiuteriuose. Jei jÅ«s arba kitas asmuo girdi keistus triukÅ¡mus ar nesklandumus skambuÄio metu, bandykite iÅ¡jungti aido panaikinimÄ… ir skambinti iÅ¡ naujo."
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "_Rodyti vietovÄ™ mano kontaktams"
#: ../src/empathy-preferences.ui.h:31
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Sumažinus vietovės rodymo tikslumą, bus rodomas tik jūsų miestas, sritis ir "
-"Å¡alis. GPS koordinatÄ—s bus rodomos vieno skaiÄiaus po kablelio tikslumu."
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
+msgstr "Sumažinus vietovÄ—s rodymo tikslumÄ…, bus rodomas tik jÅ«sų miestas, sritis ir Å¡alis. GPS koordinatÄ—s bus rodomos vieno skaiÄiaus po kablelio tikslumu."
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
@@ -4324,9 +4182,7 @@ msgid "Location sources:"
msgstr "VietovÄ—s Å¡altiniai:"
#: ../src/empathy-preferences.ui.h:40
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
msgstr "Šiame kalbų sąraše yra tik tos kalbos, kurių žodynus turite įdiegę."
#: ../src/empathy-preferences.ui.h:41
@@ -4349,65 +4205,86 @@ msgstr "Variantas:"
msgid "Themes"
msgstr "Temos"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Nurodykite slaptažodį"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Atsijungti"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:464
msgid "You need to setup an account to see contacts here."
msgstr "Jums reikia nustatyti paskyrÄ…, kad ten matytumÄ—te kontaktus."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:540
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr ""
-"Deja, paskyra %s negali būti naudojama, kol nebus atnaujinta programinė "
-"įranga %s."
+msgstr "Deja, paskyra %s negali būti naudojama, kol nebus atnaujinta programinė įranga %s."
+
+#: ../src/empathy-roster-window.c:640
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:644
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "Facebook"
-#: ../src/empathy-roster-window.c:636
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:659
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s paskyrai reikia patvirtinti tapatybÄ™"
+
+#: ../src/empathy-roster-window.c:670
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "InternetinÄ—s paskyros"
+
+#: ../src/empathy-roster-window.c:717
msgid "Update software..."
msgstr "Atnaujinti programinę įrangą..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:723
msgid "Reconnect"
msgstr "Prisijungti iš naujo"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:727
msgid "Edit Account"
msgstr "Taisyti paskyrÄ…"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:732
msgid "Close"
msgstr "Užverti"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:869
msgid "Top up account"
msgstr "Papildyti paskyros kreditÄ…"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1551
msgid "You need to enable one of your accounts to see contacts here."
-msgstr ""
-"Jums reikia įjungti vieną iš jūsų paskyrų, kad ten matytumėte kontaktus."
+msgstr "Jums reikia įjungti vieną iš jūsų paskyrų, kad ten matytumėte kontaktus."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1559
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Jums reikia įjungti %s, kad ten matytumėte kontaktus."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1637
msgid "Change your presence to see contacts here"
msgstr "Keisti jūsų būvimo būseną, kad ten matytumėte kontaktus"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1646
msgid "No match found"
msgstr "Nerasta atitikmenų"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1653
+msgid "You haven't added any contact yet"
+msgstr "Dar nepridėjote jokių kontaktų"
+
+#: ../src/empathy-roster-window.c:1656
msgid "No online contacts"
msgstr "Nėra kontaktų internete"
@@ -4484,6 +4361,16 @@ msgstr "Paskyros nustatymai"
msgid "Go _Online"
msgstr "_Prisijungti prie tinklo"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "Rodyti atsijungusius k_ontaktus"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Pridėti kontaktą…"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Naujas pokalbis…"
@@ -4513,3 +4400,4 @@ msgstr "Taisyti %s paskyros parinktis"
#: ../ubuntu-online-accounts/empathy.application.in.h:1
msgid "Integrate your IM accounts"
msgstr "Integruokite savo pranešimų paskyras"
+
diff --git a/po/mr.po b/po/mr.po
index dc18863ef..8672e0387 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
"POT-Creation-Date: 2012-10-09 14:38+0000\n"
-"PO-Revision-Date: 2012-10-13 05:32+0530\n"
+"PO-Revision-Date: 2012-10-13 05:15+0530\n"
"Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
"Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
"Language: mr\n"
diff --git a/po/nb.po b/po/nb.po
index 2057db891..4130c9d0f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,15 @@
# Norwegian bokmål translation of empathy.
# Copyright © 2003-2005 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2003-2012.
+# Kjartan Maraas <kmaraas@gnome.org>, 2003-2013.
# Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
+#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 3.6.x\n"
+"Project-Id-Version: empathy 3.7.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 00:24+0200\n"
-"PO-Revision-Date: 2012-10-12 00:25+0200\n"
+"POT-Creation-Date: 2013-01-07 11:29+0100\n"
+"PO-Revision-Date: 2013-01-07 11:30+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -33,6 +34,10 @@ msgstr "Empathy internettmeldinger"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "prat;snakk;im;melding;irc;voip;gtalk;facebook;jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Tilkoblingshåndterer skal brukes"
@@ -751,11 +756,11 @@ msgstr "Personer i nærheten"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook-prat"
@@ -857,7 +862,7 @@ msgstr "Tjener"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Port"
@@ -1500,7 +1505,7 @@ msgstr "ikke implementert"
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Emne:"
@@ -1614,9 +1619,9 @@ msgstr "%s er nå kjent som %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2657
+#: ../src/empathy-call-window.c:2963 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Koblet fra"
@@ -1689,7 +1694,7 @@ msgstr "Rediger blokkerte kontakter"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1794,12 +1799,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Vennligst la meg så når du er tilkoblet. Takk!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "Lagre personbilder"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Kan ikke lagre personbilde"
@@ -1943,7 +1948,7 @@ msgstr "Velg en konto til bruk for samtalen"
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Ring"
@@ -2026,7 +2031,7 @@ msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Favoritt"
@@ -2041,7 +2046,7 @@ msgstr "R_ediger"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
@@ -2183,16 +2188,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y, %R UTC"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Alias:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identifikator:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2228,7 +2233,7 @@ msgstr "Velg"
msgid "new server"
msgstr "ny tjener"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2404,12 +2409,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Prat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2638,12 +2643,12 @@ msgstr "_Avslå"
msgid "_Accept"
msgstr "Godt_a"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "Melding redigert %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "Normal"
@@ -2759,15 +2764,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Personlige detaljer</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "_Kopier lenkens adresse"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Ã…pne lenke"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Inspiser HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Aktivt locale"
@@ -2943,6 +2953,13 @@ msgstr "Mest populære kontakter"
msgid "Ungrouped"
msgstr "Ikke gruppert"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Tjener finner ikke kontakt: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Ingen feilmelding"
@@ -2957,7 +2974,11 @@ msgid ""
"terms of the GNU General Public License as published by the Free Software "
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
-msgstr "Empathy er fri programvare. Du kan redistribuere og/eller endre programmet under betingelsene gitt i GNU General Public License som utgitt av Free Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) enhver senere versjon."
+msgstr ""
+"Empathy er fri programvare. Du kan redistribuere og/eller endre programmet "
+"under betingelsene gitt i GNU General Public License som utgitt av Free "
+"Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
+"enhver senere versjon."
#: ../src/empathy-about-dialog.c:85
msgid ""
@@ -3033,7 +3054,7 @@ msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Kobler til …"
@@ -3073,20 +3094,20 @@ msgstr "Frakoblet - Konto deaktivert"
msgid "Edit Connection Parameters"
msgstr "Rediger parametere for tilkobling"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "R_ediger parametere for tilkoblingen …"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Vil du fjerne %s fra din datamaskin?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Dette vil ikke fjerne din konto på tjeneren."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3095,24 +3116,24 @@ msgstr ""
"dine endringer. Er du sikker på at du vil fortsette?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "Slått _på"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Endre navn"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Hopp over"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Koble til"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3121,7 +3142,7 @@ msgstr ""
"dine endringer. Er du sikker på at du vil fortsette?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Meldings- og VoIP-kontoer"
@@ -3182,11 +3203,15 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "I en samtale"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy lyd-/bildeklient"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy lyd-/bildeklient"
@@ -3197,31 +3222,31 @@ msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Innkommende samtale"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Innkommende videosamtale fra %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Innkommende samtale fra %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Avvis"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3229,60 +3254,60 @@ msgstr "Svar"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1929
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2183
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adresse for peer som sett av andre siden"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2189
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.c:2602 ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2961
msgid "On hold"
msgstr "PÃ¥ vent"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2965
msgid "Mute"
msgstr "Demp"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2967
msgid "Duration"
msgstr "Varighet"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2970
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s – %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3066
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3105
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3291,7 +3316,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3300,7 +3325,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3116
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3309,25 +3334,25 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3122
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3126
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3129
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3141
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3338,32 +3363,32 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3150
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3153
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3193
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3203
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3240
#, c-format
msgid "Your current balance is %s."
msgstr "Din saldo er %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3244
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Du har ikke nok kreditt til å starte denne samtalen."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3246
msgid "Top Up"
msgstr "Fyll opp"
@@ -3400,74 +3425,82 @@ msgid "_Debug"
msgstr "_Feilsøk"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Bytt kamera"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Minimer meg"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Maksimer meg"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Slå av kamera"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Legg på"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Legg på denne samtalen"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Videosamtale"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Start en videosamtale"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Start en lydsamtale"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Vis ringetastatur"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Vis ringetastatur"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Slå av/på overføring av video"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Slå av/på overføring av lyd"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Kodek for koding:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Kodek for dekoding:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Ekstern kandidat:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Lokal kandidat:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Lyd"
@@ -3491,11 +3524,11 @@ msgstr "Koble til automatisk"
msgid "Manage Favorite Rooms"
msgstr "HÃ¥ndter favorittrom"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Lukk dette vinduet?"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3504,7 +3537,7 @@ msgstr ""
"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
"meldinger før du blir med igjen."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3519,12 +3552,12 @@ msgstr[1] ""
"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
"videre meldinger før du blir med igjen."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Forlat %s?"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3532,54 +3565,54 @@ msgstr ""
"Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
"igjen."
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Lukk vindu"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Forlat rom"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulest)"
msgstr[1] "%s (%d uleste)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u annen)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulest fra andre)"
msgstr[1] "%s (%d uleste fra andre)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulest fra alle)"
msgstr[1] "%s (%d uleste fra alle)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sender %d melding"
msgstr[1] "Sender %d meldinger"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Skriver en melding"
@@ -3673,63 +3706,81 @@ msgstr ""
"Data for stor for en enkel klipp-og-lim operasjon. Vennligst lagre loggene "
"til en fil."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Feilsøkingsvindu"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Send til Pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Nivå "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Feilsøk"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Melding"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Advarsel"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Kritisk"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Feil"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Selv om logger ikke inneholder passord kan de inneholde sensitiv informasjon "
+"slik som kontaktlisten din eller meldinger du nylig har sendt eller "
+"mottatt.\n"
+"Hvis du ikke vil se slik informasjon i offentlige feilrapporter kan du velge "
+"å begrense synligheten for din feilrapport til utviklerene av Empathy når du "
+"rapporterer den ved å vise avanserte felt i <a href=\"https://bugzilla.gnome."
+"org/enter_bug.cgi?product=empathy>feilrapporten</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Tid"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domene"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Nivå"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3795,7 +3846,7 @@ msgstr "Du har blitt invitert til å bli med i %s"
msgid "Incoming file transfer from %s"
msgstr "Innkommende filoverføring fra %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Passord kreves"
@@ -4146,7 +4197,7 @@ msgstr "Vis grupper"
msgid "Show account balances"
msgstr "Vis saldo for konto"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2240
msgid "Contact List"
msgstr "Kontaktliste"
@@ -4311,62 +4362,84 @@ msgstr "Variant:"
msgid "Themes"
msgstr "Temaer"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Oppgi passord"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Koble fra"
-#: ../src/empathy-roster-window.c:441
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Du må sette opp en konto for å se kontakter her."
-#: ../src/empathy-roster-window.c:517
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:669
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:688
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s-konto krever autorisering"
+
+#: ../src/empathy-roster-window.c:699
+msgid "Online Accounts"
+msgstr "Kontoer på nettet"
+
+#: ../src/empathy-roster-window.c:746
msgid "Update software..."
msgstr "Oppdater programvare …"
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:752
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:756
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:761
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-roster-window.c:787
+#: ../src/empathy-roster-window.c:903
msgid "Top up account"
msgstr "Fyll opp konto"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1589
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Du må slå på en av kontoene for å se kontakter her."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1597
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Du må slå på %s for å se kontakter her."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1675
msgid "Change your presence to see contacts here"
msgstr "Endre din tilstedeværelse for å se kontakter her"
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1684
msgid "No match found"
msgstr "Ingen treff funnet"
-#: ../src/empathy-roster-window.c:1569
+#: ../src/empathy-roster-window.c:1691
+msgid "You haven't added any contact yet"
+msgstr "Du har ikke lagt til kontakter ennå"
+
+#: ../src/empathy-roster-window.c:1694
msgid "No online contacts"
msgstr "Ingen kontakter tilkoblet"
@@ -4443,6 +4516,14 @@ msgstr "Innstillinger for konto"
msgid "Go _Online"
msgstr "K_oble til"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Vis frak_oblede kontakter"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "_Legg til kontakt …"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Ny samtale …"
diff --git a/po/pl.po b/po/pl.po
index c575fe3fa..11abb4530 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-27 15:02+0200\n"
-"PO-Revision-Date: 2012-09-27 15:05+0200\n"
+"POT-Creation-Date: 2012-12-26 19:57+0100\n"
+"PO-Revision-Date: 2012-12-26 19:58+0100\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <gnomepl@aviary.pl>\n"
"Language: pl\n"
@@ -43,6 +43,12 @@ msgstr "Komunikator Empathy"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"rozmowa;chat;czat;komunikator;im;wiadomość;gadu;irc;voip;gtalk;facebook;"
+"jabber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Użycie menedżerów połączeń"
@@ -788,11 +794,11 @@ msgstr "Osoby w pobliżu"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japonia"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -894,7 +900,7 @@ msgstr "Serwer"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Port"
@@ -1541,7 +1547,7 @@ msgstr "niezaimplementowane"
msgid "unknown"
msgstr "nieznany"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Temat:"
@@ -1655,9 +1661,9 @@ msgstr "Użytkownik %s jest teraz znany jako %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Rozłączony"
@@ -1978,47 +1984,47 @@ msgstr ""
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Wybór konta do umieszczenia tej rozmowy głosowej"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Rozmowa głosowa"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Komórka"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Praca"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "Dom"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "Za_blokuj kontakt"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Usuń i za_blokuj"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Na pewno usunąć kontakt \"%s\"?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2027,77 +2033,77 @@ msgstr ""
"Na pewno usunąć metakontakt \"%s\"? Wszystkie kontakty tworzące metakontakt "
"zostaną usunięte."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Usuwanie kontaktu"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Usuń"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Rozmowa"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Rozmow_a głosowa"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Wideorozmowa"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Poprzednie rozmowy"
# to jest w menu
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Wyślij plik"
# to jest w menu
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Współdziel pulpit"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Ulubione"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "Infor_macje"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Modyfikuj"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Zapraszanie do tego pokoju"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_ZaproÅ› do pokoju rozmowy"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "_Dodaj kontakt…"
@@ -2277,7 +2283,7 @@ msgstr "Wybierz"
msgid "new server"
msgstr "nowy serwer"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2455,12 +2461,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Rozmowa"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Wideo"
@@ -2689,12 +2695,12 @@ msgstr "_Odmów"
msgid "_Accept"
msgstr "Z_aakceptuj"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1101
#, c-format
msgid "Message edited at %s"
msgstr "Zmodyfikowano wiadomość o %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1801
msgid "Normal"
msgstr "Zwykły"
@@ -2810,15 +2816,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Szczegóły osobiste</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "S_kopiuj adres odnośnika"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Otwórz odnośnik"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Zbadaj kod HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Bieżące ustawienia językowe"
@@ -2994,6 +3005,13 @@ msgstr "Najczęściej używane kontakty"
msgid "Ungrouped"
msgstr "Kontakty bez grup"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:219
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Serwer nie może odnaleźć kontaktu: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Brak komunikatu błędu"
@@ -3093,7 +3111,7 @@ msgstr "Modyfikacje konta %s nie zostały zapisane."
msgid "Your new account has not been saved yet."
msgstr "Nowe konto nie zostało jeszcze zapisane."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "ÅÄ…czenie…"
@@ -3133,20 +3151,20 @@ msgstr "Offline — konto jest wyłączone"
msgid "Edit Connection Parameters"
msgstr "Modyfikacja parametrów połączenia"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Modyfikuj parametry połączenia..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Na pewno usunąć \"%s\" z komputera?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Nie usunie to konta na serwerze."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3155,24 +3173,24 @@ msgstr ""
"utratę zmian. Na pewno kontynuować?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_WÅ‚Ä…czone"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Zmień nazwę"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_Pomiń"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "P_ołącz"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3181,7 +3199,7 @@ msgstr ""
"utratę zmian. Na pewno kontynuować?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Konta komunikatora i VoIP"
@@ -3242,11 +3260,15 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "W czasie rozmowy"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- klient dźwięku/wideo komunikatora Empathy"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Klient dźwięku/wideo komunikatora Empathy"
@@ -3259,31 +3281,31 @@ msgstr ""
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Przychodząca rozmowa głosowa"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Wideorozmowa przychodząca od użytkownika %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Przychodząca rozmowa głosowa od użytkownika %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Odrzuć"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3291,60 +3313,60 @@ msgstr "Odbierz"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "Rozmowa głosowa z użytkownikiem %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "Adres IP widziany przez komputer"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "Adres IP widziany przez serwer w Internecie"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "Adres IP elementu widziany przez drugÄ… stronÄ™"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "Adres IP serwera odpowiedzi"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "Adres IP grupy multikastowej"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Nieznany"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "Odłożone"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "Wycisz"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "Czas trwania"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "Szczegóły techniczne"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3353,7 +3375,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
"używanego przez ten komputer"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3362,7 +3384,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
"przez ten komputer"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3371,23 +3393,23 @@ msgstr ""
"Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
"się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Wystąpił błąd sieci"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3124
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3127
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty wideo wymagane dla tej rozmowy nie sÄ… zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3398,32 +3420,32 @@ msgstr ""
"\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
"w menu Pomoc."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "Wystąpił błąd mechanizmu rozmowy"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Osiągnięto koniec strumienia"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "Nie można utworzyć strumienia dźwięku"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "Nie można utworzyć strumienia obrazu"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "Obecnie saldo wynosi %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Brak wystarczających środków na tę rozmowę głosową."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Doładuj"
@@ -3460,78 +3482,86 @@ msgid "_Debug"
msgstr "_Debugowanie"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Przełącz kamery"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Zminimalizuj"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Zmaksymalizuj"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Wyłącz kamerę"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Rozłącz"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Rozłącza bieżącą rozmowę"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Wideorozmowa"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Rozpocznij wideorozmowÄ™"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Rozpocznij rozmowę głosową"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Wyświetl panel wybierania"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Wyświetl panel wybierania"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Przełącza przesyłanie obrazu wideo"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Przełącza przesyłanie dźwięku"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Koder:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Dekoder:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Zdalny kandydat:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Lokalny kandydat:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Dźwięk"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- komunikator Empathy"
@@ -3551,11 +3581,11 @@ msgstr "Automatyczne Å‚Ä…czenie"
msgid "Manage Favorite Rooms"
msgstr "ZarzÄ…dzanie ulubionymi pokojami"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Zamknąć to okno?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3564,7 +3594,7 @@ msgstr ""
"Zamknięcie tego okna spowoduje opuszczenie pokoju %s. Wiadomości nie będą "
"odbierane aż do ponownego dołączenia."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3582,12 +3612,12 @@ msgstr[2] ""
"Zamknięcie tego okna spowoduje opuszczenie %u pokojów rozmów. Wiadomości nie "
"będą odbierane aż do ponownego dołączenia."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Opuścić %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3595,15 +3625,15 @@ msgstr ""
"Wiadomości z tego pokoju rozmów nie będą odbierane aż do ponownego "
"dołączenia."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Zamknij okno"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Opuść pokój"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3611,7 +3641,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
msgstr[1] "%s (%d nieprzeczytane)"
msgstr[2] "%s (%d nieprzeczytanych)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3619,7 +3649,7 @@ msgstr[0] "%s (i %u inna)"
msgstr[1] "%s (i %u inne)"
msgstr[2] "%s (i %u innych)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3627,7 +3657,7 @@ msgstr[0] "%s (%d nieprzeczytana od innych)"
msgstr[1] "%s (%d nieprzeczytane od innych)"
msgstr[2] "%s (%d nieprzeczytanych od innych)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3635,11 +3665,11 @@ msgstr[0] "%s (%d nieprzeczytana od wszystkich)"
msgstr[1] "%s (%d nieprzeczytane od wszystkich)"
msgstr[2] "%s (%d nieprzeczytanych od wszystkich)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3647,7 +3677,7 @@ msgstr[0] "Wysyłanie %d wiadomości"
msgstr[1] "Wysyłanie %d wiadomości"
msgstr[2] "Wysyłanie %d wiadomości"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Pisze wiadomość."
@@ -3739,63 +3769,80 @@ msgstr "Odpowiedź serwisu Pastebin"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Dane są za duże na jeden raz. Proszę zapisać dzienniki do pliku."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Okno debugowania"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Wyślij do serwisu Pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Wstrzymaj"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Poziom "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Debugowanie"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Informacje"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Wiadomość"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Krytyczny"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Nawet, jeśli nie widać haseł, dzienniki mogą zawierać prywatne informacje, "
+"takie jak listy kontaktów lub ostatnio wysłane i odebrane wiadomości.\n"
+"Aby takie informacje nie znalazły się w publicznym zgłoszeniu błędu, można "
+"ograniczyć jego widoczność do programistów programu podczas jego zgłaszania "
+"za pomocą zaawansowanych pól w <a href=\"https://bugzilla.gnome.org/"
+"enter_bug.cgi?product=empathy\">zgłoszeniu błędu</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Czas"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domena"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategoria"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Poziom"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3861,7 +3908,7 @@ msgstr "Zaproszono użytkownika do dołączenia do %s"
msgid "Incoming file transfer from %s"
msgstr "Plik przychodzący od użytkownika %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Hasło wymagane"
@@ -4214,7 +4261,7 @@ msgstr "Wyświetlanie grup"
msgid "Show account balances"
msgstr "Wyświetlanie salda konta"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236
msgid "Contact List"
msgstr "Lista kontaktów"
@@ -4379,64 +4426,86 @@ msgstr "Wariant:"
msgid "Themes"
msgstr "Motywy"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Wprowadź hasło"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Rozłącz"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Należy ustawić konto, aby wyświetlić kontakty."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Konta %s nie mogą być używane, dopóki oprogramowanie %s nie zostanie "
"zaktualizowane."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:669
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:688
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "Konto serwisu %s wymaga upoważnienia"
+
+#: ../src/empathy-roster-window.c:699
+msgid "Online Accounts"
+msgstr "Konta online"
+
+#: ../src/empathy-roster-window.c:746
msgid "Update software..."
msgstr "Zaktualizuj oprogramowanie..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:752
msgid "Reconnect"
msgstr "Połącz ponownie"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:756
msgid "Edit Account"
msgstr "Modyfikuj konto"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:761
msgid "Close"
msgstr "Zamknij"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:903
msgid "Top up account"
msgstr "Doładuj konto"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1585
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Należy włączyć jedno z kont, aby wyświetlić kontakty."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1593
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Należy włączyć konto %s, aby wyświetlić kontakty."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1671
msgid "Change your presence to see contacts here"
msgstr "Należy zmienić stan, aby wyświetlić kontakty"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1680
msgid "No match found"
msgstr "Nie odnaleziono wyników"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1687
+msgid "You haven't added any contact yet"
+msgstr "Nie dodano jeszcze żadnych kontaktów"
+
+#: ../src/empathy-roster-window.c:1690
msgid "No online contacts"
msgstr "Brak kontaktów w trybie online"
@@ -4513,6 +4582,14 @@ msgstr "Ustawienia konta"
msgid "Go _Online"
msgstr "Przejdź do trybu _online"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Wyświetl kontakty w trybie _offline"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "_Dodaj kontakt..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Nowa rozmowa…"
diff --git a/po/ru.po b/po/ru.po
index 629d41fb5..9e3c30817 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,18 +13,16 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-27 16:36+0400\n"
+"PO-Revision-Date: 2012-11-22 18:02+0300\n"
"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
"Language-Team: руÑÑкий <gnome-cyr@gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
"X-Generator: Lokalize 1.0\n"
@@ -50,12 +48,8 @@ msgid "Connection managers should be used"
msgstr "ИÑпользуемые диÑпетчеры Ñоединений"
#: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"ИÑпользовать ли менеджеры ÑвÑзноÑти Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ "
-"переподключениÑ."
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "ИÑпользовать ли менеджеры ÑвÑзноÑти Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ переподключениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.h:3
msgid "Empathy should auto-connect on startup"
@@ -63,19 +57,15 @@ msgstr "ПриÑоединÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ запуÑке"
#: ../data/org.gnome.Empathy.gschema.xml.h:4
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Должен ли Empathy автоматичеÑки входить в ваши учётные запиÑи при запуÑке."
+msgstr "Должен ли Empathy автоматичеÑки входить в ваши учётные запиÑи при запуÑке."
#: ../data/org.gnome.Empathy.gschema.xml.h:5
msgid "Empathy should auto-away when idle"
msgstr "УÑтанавливать ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð¾Ñ‚ÑутÑтвует» при бездейÑтвии"
#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Должен ли Empathy автоматичеÑки уÑтанавливать ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð¾Ñ‚ÑутÑтвует» при "
-"бездейÑтвии пользователÑ."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматичеÑки уÑтанавливать ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð¾Ñ‚ÑутÑтвует» при бездейÑтвии пользователÑ."
#: ../data/org.gnome.Empathy.gschema.xml.h:7
msgid "Empathy default download folder"
@@ -88,18 +78,11 @@ msgstr "Каталог по умолчанию Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð
#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
#: ../data/org.gnome.Empathy.gschema.xml.h:10
msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr ""
-"МагичеÑкое чиÑло, иÑпользуемое Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ того, нужно ли запуÑтить задачи "
-"по очиÑтке"
+msgstr "МагичеÑкое чиÑло, иÑпользуемое Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ того, нужно ли запуÑтить задачи по очиÑтке"
#: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c иÑпользует Ñто чиÑло Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸, нужно ли "
-"запуÑтить задачи по очиÑтке. Пользователи не должны изменÑÑ‚ÑŒ вручную "
-"значение Ñтого ключа."
+msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
+msgstr "empathy-sanity-cleaning.c иÑпользует Ñто чиÑло Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸, нужно ли запуÑтить задачи по очиÑтке. Пользователи не должны изменÑÑ‚ÑŒ вручную значение Ñтого ключа."
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
@@ -147,12 +130,8 @@ msgid "Display incoming events in the status area"
msgstr "Показывать наÑтупающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти ÑоÑтоÑниÑ"
#: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показывать наÑтупающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти ÑоÑтоÑниÑ. ЕÑли ключ не уÑтановлен, "
-"показывать их непоÑредÑтвенно пользователю."
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать наÑтупающие ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² облаÑти ÑоÑтоÑниÑ. ЕÑли ключ не уÑтановлен, показывать их непоÑредÑтвенно пользователю."
#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
@@ -184,9 +163,7 @@ msgstr "Выключить звуки в ÑоÑтоÑнии «отÑутÑтву
#: ../data/org.gnome.Empathy.gschema.xml.h:31
msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"ВоÑпроизводить ли звуковые ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отÑутÑтвует» или «не "
-"беÑпокоить»."
+msgstr "ВоÑпроизводить ли звуковые ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отÑутÑтвует» или «не беÑпокоить»."
#: ../data/org.gnome.Empathy.gschema.xml.h:32
msgid "Play a sound for incoming messages"
@@ -225,8 +202,7 @@ msgid "Play a sound when a contact logs out"
msgstr "ВоÑпроизводить ли звук при выходе контакта из Ñети"
#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "ВоÑпроизводить ли звук Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ выходе ÑобеÑедников из Ñети."
#: ../data/org.gnome.Empathy.gschema.xml.h:42
@@ -259,21 +235,15 @@ msgstr "Выключить вÑплывающие ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñо
#: ../data/org.gnome.Empathy.gschema.xml.h:49
msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Показывать ли вÑплывающие ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отÑутÑтвует» или «не "
-"беÑпокоить»."
+msgstr "Показывать ли вÑплывающие ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² ÑоÑтоÑниÑÑ… «отÑутÑтвует» или «не беÑпокоить»."
#: ../data/org.gnome.Empathy.gschema.xml.h:50
msgid "Pop up notifications if the chat isn't focused"
msgstr "Показывать вÑплывающие уведомлениÑ, еÑли беÑеда находитÑÑ Ð½Ðµ в фокуÑе"
#: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Показывать ли вÑплывающее уведомление о получении нового ÑообщениÑ, когда "
-"беÑеда уже ведётÑÑ, но не находитÑÑ Ð² фокуÑе."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Показывать ли вÑплывающее уведомление о получении нового ÑообщениÑ, когда беÑеда уже ведётÑÑ, но не находитÑÑ Ð² фокуÑе."
#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
@@ -281,8 +251,7 @@ msgstr "Показывать вÑплывающие уведомлениÑ, ко
#: ../data/org.gnome.Empathy.gschema.xml.h:53
msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит в Ñеть."
+msgstr "Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит в Ñеть."
#: ../data/org.gnome.Empathy.gschema.xml.h:54
msgid "Pop up notifications when a contact logs out"
@@ -290,8 +259,7 @@ msgstr "Показывать вÑплывающие уведомлениÑ, ко
#: ../data/org.gnome.Empathy.gschema.xml.h:55
msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит из Ñети."
+msgstr "Показывать ли вÑплывающее уведомление, когда ÑобеÑедник выходит из Ñети."
#: ../data/org.gnome.Empathy.gschema.xml.h:56
msgid "Use graphical smileys"
@@ -299,9 +267,7 @@ msgstr "ИÑпользовать графичеÑкие улыбки"
#: ../data/org.gnome.Empathy.gschema.xml.h:57
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Преобразовывать ли текÑтовые улыбки (Ñмайлы) в беÑедах в графичеÑкие "
-"изображениÑ."
+msgstr "Преобразовывать ли текÑтовые улыбки (Ñмайлы) в беÑедах в графичеÑкие изображениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.h:58
msgid "Show contact list in rooms"
@@ -324,8 +290,7 @@ msgid "Chat window theme variant"
msgstr "Вариант тема Ð´Ð»Ñ Ð¾ÐºÐ½Ð° беÑеды"
#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "The theme variant that is used to display the conversation in chat windows."
msgstr "Вариант темы, иÑпользуемый Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð±ÐµÑед."
#: ../data/org.gnome.Empathy.gschema.xml.h:64
@@ -333,35 +298,24 @@ msgid "Path of the Adium theme to use"
msgstr "Путь к иÑпользуемой теме Adium"
#: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
-msgstr ""
-"Путь к иÑпользуемой теме Adium, еÑли тема, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð´Ð»Ñ Ð±ÐµÑеды — Adium. "
-"УÑтарело."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
+msgstr "Путь к иÑпользуемой теме Adium, еÑли тема, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ Ð´Ð»Ñ Ð±ÐµÑеды — Adium. УÑтарело."
#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "Включить инÑтрументы разработчика WebKit"
#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Должны ли быть включены инÑтрументы разработчика WebKit, например Web "
-"Inspector."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Должны ли быть включены инÑтрументы разработчика WebKit, например Web Inspector."
#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr "УведомлÑÑ‚ÑŒ пользователей о наборе Ñообщений"
#: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"ПоÑылать ли ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ наборе Ñообщений. Ðе иÑпользуетÑÑ Ð¿Ñ€Ð¸ ÑтатуÑе "
-"«Отошёл»."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "ПоÑылать ли ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ наборе Ñообщений. Ðе иÑпользуетÑÑ Ð¿Ñ€Ð¸ ÑтатуÑе «Отошёл»."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
@@ -376,19 +330,15 @@ msgid "Spell checking languages"
msgstr "Языки Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ орфографии"
#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"СпиÑок Ñзыков, иÑпользуемых при проверке орфографии, разделённых запÑтыми "
-"(например «en, fr, ru»)."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "СпиÑок Ñзыков, иÑпользуемых при проверке орфографии, разделённых запÑтыми (например «en, fr, ru»)."
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "Включить проверку орфографии"
#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Whether to check words typed against the languages you want to check with."
msgstr "ПроверÑÑ‚ÑŒ ли введённые Ñлова из ÑпиÑка Ñзыков Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ орфографии."
#: ../data/org.gnome.Empathy.gschema.xml.h:76
@@ -396,20 +346,15 @@ msgid "Nick completed character"
msgstr "Символ Ð°Ð²Ñ‚Ð¾Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿Ñевдонима"
#: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле пÑевдонима, еÑли в беÑеде иÑпользуетÑÑ "
-"автодополнение пÑевдонимов по клавише Tab."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле пÑевдонима, еÑли в беÑеде иÑпользуетÑÑ Ð°Ð²Ñ‚Ð¾Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ пÑевдонимов по клавише Tab."
#: ../data/org.gnome.Empathy.gschema.xml.h:78
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy должен иÑпользовать аватар контакта как значок окна Ñ Ð±ÐµÑедой"
#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "ИÑпользовать ли аватар ÑобеÑедника в качеÑтве значка окна беÑеды."
#: ../data/org.gnome.Empathy.gschema.xml.h:80
@@ -418,9 +363,7 @@ msgstr "ПоÑледнÑÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð² д
#: ../data/org.gnome.Empathy.gschema.xml.h:81
msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Путь к объекту D-Bus поÑледней учётной запиÑи, выбранной Ð´Ð»Ñ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº "
-"комнате."
+msgstr "Путь к объекту D-Bus поÑледней учётной запиÑи, выбранной Ð´Ð»Ñ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº комнате."
#: ../data/org.gnome.Empathy.gschema.xml.h:82
msgid "Camera device"
@@ -436,9 +379,7 @@ msgstr "Положение камеры"
#: ../data/org.gnome.Empathy.gschema.xml.h:85
msgid "Position the camera preview should be during a call."
-msgstr ""
-"Предварительный проÑмотр Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ð¼ÐµÑ€Ñ‹ должен выполнÑÑ‚ÑŒÑÑ Ð² течение "
-"вызова."
+msgstr "Предварительный проÑмотр Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ð¼ÐµÑ€Ñ‹ должен выполнÑÑ‚ÑŒÑÑ Ð² течение вызова."
#: ../data/org.gnome.Empathy.gschema.xml.h:86
msgid "Echo cancellation support"
@@ -453,12 +394,8 @@ msgid "Show hint about closing the main window"
msgstr "Показывать подÑказку о закрытии главного окна"
#: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Показывать ли диалоговое окно при закрытии главного окна Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кнопки "
-"«x» в Ñтроке заголовка."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Показывать ли диалоговое окно при закрытии главного окна Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кнопки «x» в Ñтроке заголовка."
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
@@ -466,9 +403,7 @@ msgstr "Empathy может публиковать меÑтоположение Ð
#: ../data/org.gnome.Empathy.gschema.xml.h:91
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Может ли Empathy публиковать меÑтоположение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ ÐµÐ³Ð¾ "
-"ÑобеÑедников."
+msgstr "Может ли Empathy публиковать меÑтоположение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ ÐµÐ³Ð¾ ÑобеÑедников."
#: ../data/org.gnome.Empathy.gschema.xml.h:92
msgid "Empathy can use the network to guess the location"
@@ -484,8 +419,7 @@ msgstr "Empathy может иÑпользовать Ñотовую Ñеть дл
#: ../data/org.gnome.Empathy.gschema.xml.h:95
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Может ли Empathy иÑпользовать Ñотовую Ñеть Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑтоположениÑ."
+msgstr "Может ли Empathy иÑпользовать Ñотовую Ñеть Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑтоположениÑ."
#: ../data/org.gnome.Empathy.gschema.xml.h:96
msgid "Empathy can use the GPS to guess the location"
@@ -500,11 +434,8 @@ msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy должен Ñнижать точноÑÑ‚ÑŒ меÑтоположениÑ"
#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Должен ли Empathy уменьшать точноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ причинам "
-"приватноÑти."
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точноÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¼ÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ причинам приватноÑти."
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
@@ -530,7 +461,8 @@ msgstr "Во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ файла возникла ошибкÐ
msgid "The other participant is unable to transfer the file"
msgstr "СобеÑедник не может передавать файлы"
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-utils.c:306
msgid "Unknown reason"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°"
@@ -550,7 +482,8 @@ msgstr "Выбранный файл не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файÐ
msgid "The selected file is empty"
msgstr "Выбранный файл пуÑÑ‚"
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:85
+#: ../libempathy/empathy-keyring.c:194
msgid "Password not found"
msgstr "Пароль не найден"
@@ -564,7 +497,8 @@ msgstr "Пароль к учётной запиÑи МС Ð´Ð»Ñ %s (%s)"
msgid "Password for chatroom '%s' on account %s (%s)"
msgstr "Пароль Ð´Ð»Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Â«%s» у учётной запиÑи %s (%s)"
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:403
+#: ../src/empathy-call-observer.c:116
#, c-format
msgid "Missed call from %s"
msgstr "Пропущенный вызов от %s"
@@ -662,21 +596,25 @@ msgstr "ÐеизвеÑтно"
msgid "No reason specified"
msgstr "Причина не указана"
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:336
msgid "Status is set to offline"
msgstr "УÑтановлен ÑÑ‚Ð°Ñ‚ÑƒÑ Â«Ð½Ðµ в Ñети»"
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:316
#: ../libempathy-gtk/empathy-call-utils.c:47
#: ../libempathy-gtk/empathy-new-message-dialog.c:80
msgid "Network error"
msgstr "Ошибка Ñети"
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:318
msgid "Authentication failed"
msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ðµ удалаÑÑŒ"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:320
msgid "Encryption error"
msgstr "Ошибка шифрованиÑ"
@@ -684,31 +622,38 @@ msgstr "Ошибка шифрованиÑ"
msgid "Name in use"
msgstr "Ð˜Ð¼Ñ ÑƒÐ¶Ðµ занÑто"
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate not provided"
msgstr "Сертификат недоÑтупен"
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:324
msgid "Certificate untrusted"
msgstr "Сертификат не ÑвлÑетÑÑ Ð´Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate expired"
msgstr "Сертификат уÑтарел"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
msgid "Certificate not activated"
msgstr "Сертификат не активирован"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
msgid "Certificate hostname mismatch"
msgstr "Имена узлов Ñертификатов не Ñовпадают"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
msgid "Certificate fingerprint mismatch"
msgstr "Отпечатки Ñертификатов не Ñовпадают"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
msgid "Certificate self-signed"
msgstr "Сертификат подпиÑан ÑамоÑтоÑтельно"
@@ -741,8 +686,7 @@ msgid "This account is already connected to the server"
msgstr "Эта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уже подключена к Ñерверу"
#: ../libempathy/empathy-utils.c:350
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+msgid "Connection has been replaced by a new connection using the same resource"
msgstr "Подключение было замещено новым подключение Ñ Ñтим же реÑурÑом"
#: ../libempathy/empathy-utils.c:353
@@ -751,26 +695,19 @@ msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уже ÑущеÑтвует на ÑервеÑ
#: ../libempathy/empathy-utils.c:355
msgid "Server is currently too busy to handle the connection"
-msgstr ""
-"Ð’ наÑтоÑщий момент Ñервер Ñлишком загружен, чтобы обработать подключение."
+msgstr "Ð’ наÑтоÑщий момент Ñервер Ñлишком загружен, чтобы обработать подключение."
#: ../libempathy/empathy-utils.c:357
msgid "Certificate has been revoked"
msgstr "Сертификат аннулирован"
#: ../libempathy/empathy-utils.c:359
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"Сертификат иÑпользует небезопаÑный алгоритм шифра или криптографичеÑки Ñлаб"
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Сертификат иÑпользует небезопаÑный алгоритм шифра или криптографичеÑки Ñлаб"
#: ../libempathy/empathy-utils.c:362
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Длина Ñертификата Ñервера или глубина цепочки Ñертификатов Ñервера превышает "
-"предел, уÑтановленный криптографичеÑкой библиотекой"
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Длина Ñертификата Ñервера или глубина цепочки Ñертификатов Ñервера превышает предел, уÑтановленный криптографичеÑкой библиотекой"
#: ../libempathy/empathy-utils.c:366
msgid "Your software is too old"
@@ -1025,12 +962,8 @@ msgid "Servers"
msgstr "Серверы"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"БольшинÑтво Ñерверов IRC не требует паролÑ, еÑли вы не уверены, то не "
-"вводите пароль."
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "БольшинÑтво Ñерверов IRC не требует паролÑ, еÑли вы не уверены, то не вводите пароль."
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Nickname"
@@ -1065,13 +998,11 @@ msgstr "Какое у Ð²Ð°Ñ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook?"
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
msgstr ""
"Это ваше Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, а не Ð¸Ð¼Ñ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в ÑиÑтему Facebook.\n"
"ЕÑли ваш Ð°Ð´Ñ€ÐµÑ facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
-"ИÑпользуйте <a href=\"http://www.facebook.com/username/\">Ñту Ñтраницу</a> "
-"Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook, еÑли у Ð²Ð°Ñ ÐµÐ³Ð¾ ещё нет."
+"ИÑпользуйте <a href=\"http://www.facebook.com/username/\">Ñту Ñтраницу</a> Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Facebook, еÑли у Ð²Ð°Ñ ÐµÐ³Ð¾ ещё нет."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
@@ -1208,8 +1139,7 @@ msgstr "<b>Пример:</b> user@my.sip.server"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"ИÑпользовать Ñту учётную запиÑÑŒ Ð´Ð»Ñ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð² на _обычные и мобильные телефоны"
+msgstr "ИÑпользовать Ñту учётную запиÑÑŒ Ð´Ð»Ñ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð² на _обычные и мобильные телефоны"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "NAT Traversal Options"
@@ -1314,8 +1244,7 @@ msgstr "Ðе удалоÑÑŒ преобразовать изображение"
#: ../libempathy-gtk/empathy-avatar-chooser.c:546
msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Ðи один из разрешённых форматов изображений не поддерживаетÑÑ Ð² вашей ÑиÑтеме"
+msgstr "Ðи один из разрешённых форматов изображений не поддерживаетÑÑ Ð² вашей ÑиÑтеме"
#: ../libempathy-gtk/empathy-avatar-chooser.c:906
msgid "Couldn't save picture to file"
@@ -1431,11 +1360,8 @@ msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID комнаты>: войти в новую комнату"
#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
-msgstr ""
-"/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
+msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
#: ../libempathy-gtk/empathy-chat.c:1071
msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1454,26 +1380,16 @@ msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <Ñообщение>: отправить Ñообщение о ДЕЙСТВИИ"
#: ../libempathy-gtk/empathy-chat.c:1083
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <Ñообщение>: отправить <Ñообщение> в текущей беÑеде. ИÑпользуетÑÑ Ð´Ð»Ñ "
-"отправки ÑообщениÑ, начинающегоÑÑ Ñ Â«/». Ðапример: «/say /join иÑпользуетÑÑ "
-"Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в новую комнату»"
+msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
+msgstr "/say <Ñообщение>: отправить <Ñообщение> в текущей беÑеде. ИÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ, начинающегоÑÑ Ñ Â«/». Ðапример: «/say /join иÑпользуетÑÑ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в новую комнату»"
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID контакта>: показать информацию о контакте"
#: ../libempathy-gtk/empathy-chat.c:1091
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<команда>]: показать вÑе поддерживаемые команды. ЕÑли <команда> "
-"определена, показать её иÑпользование."
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<команда>]: показать вÑе поддерживаемые команды. ЕÑли <команда> определена, показать её иÑпользование."
#: ../libempathy-gtk/empathy-chat.c:1110
#, c-format
@@ -1492,13 +1408,15 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°; Ð´Ð»Ñ Ð²Ñех доÑтупныÑ
msgid "insufficient balance to send message"
msgstr "недоÑтаточно ÑредÑтв Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ"
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1556
#: ../libempathy-gtk/empathy-chat.c:1619
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Ошибка при отправке ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Â«%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1544
+#: ../libempathy-gtk/empathy-chat.c:1561
#: ../libempathy-gtk/empathy-chat.c:1623
#, c-format
msgid "Error sending message: %s"
@@ -1509,8 +1427,7 @@ msgstr "Ошибка при отправке ÑообщениÑ: %s"
#: ../libempathy-gtk/empathy-chat.c:1550
#, c-format
msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr ""
-"недоÑтаточно ÑредÑтв Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ. <a href='%s'>Пополнить</a>."
+msgstr "недоÑтаточно ÑредÑтв Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑообщениÑ. <a href='%s'>Пополнить</a>."
#: ../libempathy-gtk/empathy-chat.c:1590
msgid "not capable"
@@ -1540,7 +1457,8 @@ msgstr "Ñта возможноÑÑ‚ÑŒ не Ñанкционирована"
msgid "unknown"
msgstr "неизвеÑтно"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680
+#: ../src/empathy-chat-window.c:967
msgid "Topic:"
msgstr "Тема:"
@@ -1654,9 +1572,12 @@ msgstr "%s теперь извеÑтен как %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989
+#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-call-window.c:1517
+#: ../src/empathy-call-window.c:2570
+#: ../src/empathy-call-window.c:2876
+#: ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "ОтÑоединён"
@@ -1687,7 +1608,8 @@ msgstr "Эта комната защищена паролем:"
msgid "Join"
msgstr "Войти"
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4077
+#: ../src/empathy-event-manager.c:1187
msgid "Connected"
msgstr "Соединён"
@@ -1891,12 +1813,8 @@ msgid "Groups"
msgstr "Группы"
#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Выберите группы, в которых должен поÑвитьÑÑ ÑобеÑедник. Можно выбрать больше "
-"одной группы или не выбирать вообще."
+msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
+msgstr "Выберите группы, в которых должен поÑвитьÑÑ ÑобеÑедник. Можно выбрать больше одной группы или не выбирать вообще."
#: ../libempathy-gtk/empathy-groups-widget.c:358
msgid "_Add Group"
@@ -1970,8 +1888,7 @@ msgstr "gnome-contacts не уÑтановлен"
#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
msgid "Please install gnome-contacts to access contacts details."
-msgstr ""
-"Чтобы получить доÑтуп к ÑведениÑм о пользователÑÑ…, уÑтановите gnome-contacts"
+msgstr "Чтобы получить доÑтуп к ÑведениÑм о пользователÑÑ…, уÑтановите gnome-contacts"
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
@@ -2018,12 +1935,8 @@ msgstr "ДейÑтвительно хотите удалить ÑобеÑеднÐ
#: ../libempathy-gtk/empathy-individual-menu.c:789
#, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"ДейÑтвительно удалить ÑвÑзанный контакт «%s»? Это приведёт к удалению вÑех "
-"контактов, которые ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью Ñтого ÑвÑзанного контакта."
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "ДейÑтвительно удалить ÑвÑзанный контакт «%s»? Это приведёт к удалению вÑех контактов, которые ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью Ñтого ÑвÑзанного контакта."
#: ../libempathy-gtk/empathy-individual-menu.c:800
msgid "Removing contact"
@@ -2044,7 +1957,7 @@ msgstr "_Разговор"
#: ../libempathy-gtk/empathy-individual-menu.c:1262
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
-msgstr "_SMS:"
+msgstr "_SMS"
#: ../libempathy-gtk/empathy-individual-menu.c:1295
msgctxt "menu item"
@@ -2278,26 +2191,16 @@ msgid "SSL"
msgstr "Шифрование SSL"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct."
-msgstr ""
-"Empathy может автоматичеÑки найти людей, подключённых к той же Ñети, что и "
-"вы. ЕÑли вы хотите иÑпользовать Ñту возможноÑÑ‚ÑŒ, отметьте, что информациÑ, "
-"предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð¸Ð¶Ðµ ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹."
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy может автоматичеÑки найти людей, подключённых к той же Ñети, что и вы. ЕÑли вы хотите иÑпользовать Ñту возможноÑÑ‚ÑŒ, отметьте, что информациÑ, предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð¸Ð¶Ðµ ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹."
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
msgid "People nearby"
msgstr "Люди поблизоÑти"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr ""
-"Ð’Ñ‹ можете отключить Ñту возможноÑÑ‚ÑŒ или изменить информацию о Ñебе, выбрав в "
-"ÑпиÑке ÑобеÑедников <span style=\"italic\">Правка → Учётные запиÑи</span>."
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Ð’Ñ‹ можете отключить Ñту возможноÑÑ‚ÑŒ или изменить информацию о Ñебе, выбрав в ÑпиÑке ÑобеÑедников <span style=\"italic\">Правка → Учётные запиÑи</span>."
#: ../libempathy-gtk/empathy-log-window.c:622
msgid "History"
@@ -2305,7 +2208,7 @@ msgstr "ИÑториÑ"
#: ../libempathy-gtk/empathy-log-window.c:677
msgid "Show"
-msgstr "Показать"
+msgstr "Показывать"
#: ../libempathy-gtk/empathy-log-window.c:699
msgid "Search"
@@ -2382,7 +2285,7 @@ msgstr "За вÑÑ‘ времÑ"
#: ../libempathy-gtk/empathy-log-window.c:1938
#: ../libempathy-gtk/empathy-log-window.c:2397
msgid "Anyone"
-msgstr "Любой"
+msgstr "Ð’Ñе"
#: ../libempathy-gtk/empathy-log-window.c:2710
msgid "Who"
@@ -2438,7 +2341,8 @@ msgid "_File"
msgstr "_Файл"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Edit"
msgstr "_Правка"
@@ -2451,7 +2355,8 @@ msgid "Profile"
msgstr "Профиль"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Разговор"
@@ -2577,8 +2482,7 @@ msgid ""
"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
msgstr ""
"<b>Текущее Ñообщение: %s</b>\n"
-"<small><i>Чтобы уÑтановить Ñообщение, нажмите Enter или Esc, чтобы отменить."
-"</i></small>"
+"<small><i>Чтобы уÑтановить Ñообщение, нажмите Enter или Esc, чтобы отменить.</i></small>"
#: ../libempathy-gtk/empathy-presence-chooser.c:393
msgid "Set status"
@@ -2723,8 +2627,7 @@ msgid "The certificate is self-signed."
msgstr "Сертификат подпиÑан ÑамоÑтоÑтельно."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
msgstr "Сертификат отозван центром Ñертификации."
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2783,12 +2686,8 @@ msgstr "ÐедоÑтаточно Ñвободного меÑта Ð´Ð»Ñ Ñохр
#: ../libempathy-gtk/empathy-ui-utils.c:1256
#, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"Ð”Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñтого файла требуетÑÑ %s Ñвободного меÑта, но доÑтупно только "
-"%s. Выберите другое меÑтоположение."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Ð”Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñтого файла требуетÑÑ %s Ñвободного меÑта, но доÑтупно только %s. Выберите другое меÑтоположение."
#: ../libempathy-gtk/empathy-ui-utils.c:1302
#, c-format
@@ -2998,39 +2897,16 @@ msgid "Instant Message (Empathy)"
msgstr "Мгновенное Ñообщение (Empathy)"
#: ../src/empathy-about-dialog.c:81
-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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°, вы можете раÑпроÑтранÑÑ‚ÑŒ и/или модифицировать "
-"её на уÑловиÑÑ…, указанных в GNU General Public License опубликованой Free "
-"Software Foundation; либо в верÑии 2 или (по вашему выбору) любой более "
-"поздней верÑии."
+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 Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°, вы можете раÑпроÑтранÑÑ‚ÑŒ и/или модифицировать её на уÑловиÑÑ…, указанных в GNU General Public License опубликованой Free Software Foundation; либо в верÑии 2 или (по вашему выбору) любой более поздней верÑии."
#: ../src/empathy-about-dialog.c:85
-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 "
-"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-"details."
-msgstr ""
-"Программа Empathy раÑпроÑтранÑетÑÑ Ð² раÑчёте на то, что будет полезной, "
-"однако БЕЗ КÐКИХ ЛИБО ГÐРÐÐТИЙ в том чиÑле подразумеваемых гарантий "
-"ПОЛЕЗÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КÐКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public "
-"License."
+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 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
+msgstr "Программа Empathy раÑпроÑтранÑетÑÑ Ð² раÑчёте на то, что будет полезной, однако БЕЗ КÐКИХ ЛИБО ГÐРÐÐТИЙ в том чиÑле подразумеваемых гарантий ПОЛЕЗÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КÐКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public License."
#: ../src/empathy-about-dialog.c:89
-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 "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Ð’Ñ‹ должны были получить копию GNU General Public License вмеÑте Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ "
-"Empathy. ЕÑли Ñтого не произошло, напишите в Фонд Свободного Программного "
-"ОбеÑпечениÑ: Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-130159 USA"
+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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Ð’Ñ‹ должны были получить копию GNU General Public License вмеÑте Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ Empathy. ЕÑли Ñтого не произошло, напишите в Фонд Свободного Программного ОбеÑпечениÑ: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
#: ../src/empathy-about-dialog.c:109
msgid "An Instant Messaging client for GNOME"
@@ -3046,22 +2922,15 @@ msgstr ""
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Ðе показывать диалоговые окна; выполнить работу (напр., импортирование) и "
-"выйти"
+msgstr "Ðе показывать диалоговые окна; выполнить работу (напр., импортирование) и выйти"
#: ../src/empathy-accounts.c:186
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"Ðе показывать диалоговые окна до тех пор, пока иÑпользуютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ уч. "
-"запиÑи «Люди поблизоÑти»"
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "Ðе показывать диалоговые окна до тех пор, пока иÑпользуютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ уч. запиÑи «Люди поблизоÑти»"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Сначала выберите учётную запиÑÑŒ (например, gabble/jabber/"
-"foo_40example_2eorg0)"
+msgstr "Сначала выберите учётную запиÑÑŒ (например, gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3088,7 +2957,8 @@ msgstr "Ð’ учётной запиÑи %s имеютÑÑ Ð½ÐµÑохранённÑ
msgid "Your new account has not been saved yet."
msgstr "Ваша Ð½Ð¾Ð²Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ещё не была Ñохранена."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404
+#: ../src/empathy-call-window.c:1267
msgid "Connecting…"
msgstr "Соединение…"
@@ -3111,14 +2981,8 @@ msgid "Unknown Status"
msgstr "ÐеизвеÑтный ÑтатуÑ"
#: ../src/empathy-accounts-dialog.c:492
-msgid ""
-"This account has been disabled because it relies on an old, unsupported "
-"backend. Please install telepathy-haze and restart your session to migrate "
-"the account."
-msgstr ""
-"Эта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ отключена, Ñ‚. к. она иÑпользует неподдерживаемый драйвер. "
-"УÑтановите telepathy-haze и перезапуÑтите ÑеанÑ, чтобы перенеÑти учётную "
-"запиÑÑŒ."
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Эта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ отключена, Ñ‚. к. она иÑпользует неподдерживаемый драйвер. УÑтановите telepathy-haze и перезапуÑтите ÑеанÑ, чтобы перенеÑти учётную запиÑÑŒ."
#: ../src/empathy-accounts-dialog.c:502
msgid "Offline — Account Disabled"
@@ -3189,12 +3053,8 @@ msgid "Loading account information"
msgstr "Загрузка информации об учётной запиÑи"
#: ../src/empathy-accounts-dialog.ui.h:5
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Чтобы добавить новую учётную запиÑÑŒ уÑтановите поддержку каждого "
-"необходимого протокола."
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Чтобы добавить новую учётную запиÑÑŒ уÑтановите поддержку каждого необходимого протокола."
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol backends installed"
@@ -3227,13 +3087,11 @@ msgstr "Ошибка ÑвÑзи Ñ Ð´Ð¸Ñпетчером учётных запÐ
#: ../src/empathy.c:625
#, c-format
msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
"\n"
"%s"
msgstr ""
-"Во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸ ÑвÑзатьÑÑ Ñ Ð´Ð¸Ñпетчером учётных запиÑей Telepathy произошла "
-"ошибка:\n"
+"Во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸ ÑвÑзатьÑÑ Ñ Ð´Ð¸Ñпетчером учётных запиÑей Telepathy произошла ошибка:\n"
"\n"
"%s"
@@ -3248,25 +3106,28 @@ msgstr "Клиент Empathy Ð´Ð»Ñ Ð°ÑƒÐ´Ð¸Ð¾ и видео"
#: ../src/empathy-call-observer.c:119
#, c-format
msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"СобеÑедник %s попыталÑÑ Ð´Ð¾ Ð²Ð°Ñ Ð´Ð¾Ð·Ð²Ð¾Ð½Ð¸Ñ‚ÑŒÑÑ, но вы принимали другой вызов."
+msgstr "СобеÑедник %s попыталÑÑ Ð´Ð¾ Ð²Ð°Ñ Ð´Ð¾Ð·Ð²Ð¾Ð½Ð¸Ñ‚ÑŒÑÑ, но вы принимали другой вызов."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1124
+#: ../src/empathy-call-window.c:1140
msgid "i"
msgstr "Инфо"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1484
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "ВходÑщий вызов"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1490
+#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "ВходÑщий видеовызов от %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1490
+#: ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
@@ -3310,8 +3171,10 @@ msgstr "IP-Ð°Ð´Ñ€ÐµÑ Ñ€ÐµÑ‚Ñ€Ð°Ð½Ñлирующего Ñервера"
msgid "The IP address of the multicast group"
msgstr "Широковещательный IP-Ð°Ð´Ñ€ÐµÑ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.c:2522
+#: ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525
#: ../src/empathy-call-window.ui.h:26
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -3340,59 +3203,35 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑобеÑеднике"
#: ../src/empathy-call-window.c:3018
#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"Программное обеÑпечение %s не понимает аудиоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgstr "Программное обеÑпечение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
#: ../src/empathy-call-window.c:3023
#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"Программное обеÑпечение %s не понимает видеоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr "Программное обеÑпечение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
#: ../src/empathy-call-window.c:3029
#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"Ðе удалоÑÑŒ уÑтановить Ñоединение Ñ %s. Один из Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ находитьÑÑ Ð² Ñети, "
-"ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ поддерживает прÑмые подключениÑ."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Ðе удалоÑÑŒ уÑтановить Ñоединение Ñ %s. Один из Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ находитьÑÑ Ð² Ñети, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ поддерживает прÑмые подключениÑ."
#: ../src/empathy-call-window.c:3035
msgid "There was a failure on the network"
msgstr "Сбой Ñети"
#: ../src/empathy-call-window.c:3039
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"Ðудиоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем "
-"компьютере"
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "Ðудиоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем компьютере"
#: ../src/empathy-call-window.c:3042
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"Видеоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем "
-"компьютере"
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "Видеоформаты, необходимые Ð´Ð»Ñ Ñтого вызова, не уÑтановлены на вашем компьютере"
#: ../src/empathy-call-window.c:3054
#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Что-то неожиданное ÑлучилоÑÑŒ Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð¼ Telepathy. <a href=\"%s"
-"\">Сообщите об Ñтой ошибке</a> и прикрепите журналы, Ñобранные из окна "
-"отладки в меню «Справка»."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Что-то неожиданное ÑлучилоÑÑŒ Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¾Ð¼ Telepathy. <a href=\"%s\">Сообщите об Ñтой ошибке</a> и прикрепите журналы, Ñобранные из окна отладки в меню «Справка»."
#: ../src/empathy-call-window.c:3063
msgid "There was a failure in the call engine"
@@ -3443,11 +3282,13 @@ msgstr "_Параметры"
msgid "_View"
msgstr "_Вид"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Help"
msgstr "_Справка"
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Contents"
msgstr "_Содержание"
@@ -3523,7 +3364,8 @@ msgstr "Удалённый кандидат:"
msgid "Local Candidate:"
msgstr "Локальный кандидат:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Ðудио"
@@ -3553,30 +3395,16 @@ msgstr "Закрыть Ñто окно?"
#: ../src/empathy-chat-window.c:286
#, c-format
-msgid ""
-"Closing this window will leave %s. You will not receive any further messages "
-"until you rejoin it."
-msgstr ""
-"ЕÑли вы закроете окно, то выйдете из комнаты %s. Ð’Ñ‹ не будете получать "
-"ÑообщениÑ, пока не войдёте в комнату. "
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "ЕÑли вы закроете окно, то выйдете из комнаты %s. Ð’Ñ‹ не будете получать ÑообщениÑ, пока не войдёте в комнату. "
#: ../src/empathy-chat-window.c:299
#, c-format
-msgid ""
-"Closing this window will leave a chat room. You will not receive any further "
-"messages until you rejoin it."
-msgid_plural ""
-"Closing this window will leave %u chat rooms. You will not receive any "
-"further messages until you rejoin them."
-msgstr[0] ""
-"ЕÑли вы закроете окно, то выйдете из %u комнаты. Ð’Ñ‹ не будете получать "
-"ÑообщениÑ, пока не войдёте в комнату. "
-msgstr[1] ""
-"ЕÑли вы закроете окно, то выйдете из %u комнат. Ð’Ñ‹ не будете получать "
-"ÑообщениÑ, пока не войдёте в комнаты."
-msgstr[2] ""
-"ЕÑли вы закроете окно, то выйдете из %u комнат. Ð’Ñ‹ не будете получать "
-"ÑообщениÑ, пока не войдёте в комнаты."
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "ЕÑли вы закроете окно, то выйдете из %u комнаты. Ð’Ñ‹ не будете получать ÑообщениÑ, пока не войдёте в комнату. "
+msgstr[1] "ЕÑли вы закроете окно, то выйдете из %u комнат. Ð’Ñ‹ не будете получать ÑообщениÑ, пока не войдёте в комнаты."
+msgstr[2] "ЕÑли вы закроете окно, то выйдете из %u комнат. Ð’Ñ‹ не будете получать ÑообщениÑ, пока не войдёте в комнаты."
#: ../src/empathy-chat-window.c:310
#, c-format
@@ -3584,12 +3412,8 @@ msgid "Leave %s?"
msgstr "Уйти из %s?"
#: ../src/empathy-chat-window.c:312
-msgid ""
-"You will not receive any further messages from this chat room until you "
-"rejoin it."
-msgstr ""
-"Ð’Ñ‹ не будете получать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтой комнаты, пока повторно не войдёте в "
-"комнату."
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Ð’Ñ‹ не будете получать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтой комнаты, пока повторно не войдёте в комнату."
#: ../src/empathy-chat-window.c:331
msgid "Close window"
@@ -3599,7 +3423,8 @@ msgstr "Закрыть окно"
msgid "Leave room"
msgstr "Уйти из комнаты"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:665
+#: ../src/empathy-chat-window.c:688
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3611,9 +3436,9 @@ msgstr[2] "%s (%d непрочитанных)"
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
-msgstr[0] "%s (и %u другой)"
-msgstr[1] "%s (и %u других)"
-msgstr[2] "%s (и %u других)"
+msgstr[0] "%s (и ещё %u ÑобеÑедник)"
+msgstr[1] "%s (и ещё %u ÑобеÑедника)"
+msgstr[2] "%s (и ещё %u ÑобеÑедников)"
#: ../src/empathy-chat-window.c:696
#, c-format
@@ -3667,7 +3492,8 @@ msgstr "_Ð˜Ð·Ð±Ñ€Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°"
msgid "Notify for All Messages"
msgstr "УведомлÑÑ‚ÑŒ обо вÑех ÑообщениÑÑ…"
-#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-status-icon.ui.h:1
msgid "_Show Contact List"
msgstr "_Показывать ÑпиÑок ÑобеÑедников"
@@ -3759,7 +3585,8 @@ msgstr "Отладка"
msgid "Info"
msgstr "ИнформациÑ"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2001
+#: ../src/empathy-debug-window.c:2050
msgid "Message"
msgstr "Сообщение"
@@ -3792,11 +3619,8 @@ msgid "Level"
msgstr "Уровень"
#: ../src/empathy-debug-window.c:2073
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Выбранный менеджер Ñоединений не поддерживает раÑширение удалённой отладки."
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Выбранный менеджер Ñоединений не поддерживает раÑширение удалённой отладки."
#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
@@ -3816,7 +3640,8 @@ msgstr "%s вызывает ваÑ. Хотите ответить?"
msgid "_Reject"
msgstr "_Отказать"
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
+#: ../src/empathy-event-manager.c:557
msgid "_Answer"
msgstr "_Ответить"
@@ -3857,7 +3682,8 @@ msgstr "Вам предложили приÑоединитьÑÑ Ðº %s"
msgid "Incoming file transfer from %s"
msgstr "ВходÑщий файл от %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973
+#: ../src/empathy-roster-window.c:225
msgid "Password required"
msgstr "ТребуетÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
@@ -3947,16 +3773,19 @@ msgstr "«%s» отправлен %s"
msgid "File transfer completed"
msgstr "Передача файла завершена"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:615
+#: ../src/empathy-ft-manager.c:779
msgid "Waiting for the other participant's response"
msgstr "Ожидание ответа от других учаÑтников"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641
+#: ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Проверка целоÑтноÑти «%s»"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644
+#: ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Ð¥Ñширование «%s»"
@@ -3979,20 +3808,15 @@ msgstr "Передачи файлов"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"Удалить из ÑпиÑка завершённые, отменённые или прерванные передачи файлов"
+msgstr "Удалить из ÑпиÑка завершённые, отменённые или прерванные передачи файлов"
#: ../src/empathy-import-dialog.c:76
msgid "_Import"
msgstr "_Импортировать"
#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Ðе найдено учётных запиÑей Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ. Ðа данный момент возможно "
-"импортировать учётные запиÑи только из Pidgin."
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Ðе найдено учётных запиÑей Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ. Ðа данный момент возможно импортировать учётные запиÑи только из Pidgin."
#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
@@ -4064,31 +3888,20 @@ msgid "Join Room"
msgstr "Войти в комнату"
#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Введите Ð¸Ð¼Ñ Ð±ÐµÑеды, к которой хотите приÑоединитьÑÑ, или выберите одну (или "
-"более) в ÑпиÑке."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Введите Ð¸Ð¼Ñ Ð±ÐµÑеды, к которой хотите приÑоединитьÑÑ, или выберите одну (или более) в ÑпиÑке."
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Room:"
msgstr "_Комната:"
#: ../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&apos;s server"
-msgstr ""
-"Введите Ñервер, на котором раÑполагаетÑÑ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°, или оÑтавьте пуÑтым, еÑли "
-"комната находитÑÑ Ð½Ð° Ñервере текущей учётной запиÑи"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
+msgstr "Введите Ñервер, на котором раÑполагаетÑÑ ÐºÐ¾Ð¼Ð½Ð°Ñ‚Ð°, или оÑтавьте пуÑтым, еÑли комната находитÑÑ Ð½Ð° Ñервере текущей учётной запиÑи"
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Введите Ñервер комнаты, или оÑтавьте пуÑтым, еÑли комната находитÑÑ Ð½Ð° "
-"Ñервере текущей учётной запиÑи"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Введите Ñервер комнаты, или оÑтавьте пуÑтым, еÑли комната находитÑÑ Ð½Ð° Ñервере текущей учётной запиÑи"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "_Server:"
@@ -4211,7 +4024,8 @@ msgstr "Показывать группы"
msgid "Show account balances"
msgstr "Показывать Ð±Ð°Ð»Ð°Ð½Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… запиÑей"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-roster-window.c:2108
msgid "Contact List"
msgstr "СпиÑок ÑобеÑедников"
@@ -4300,30 +4114,16 @@ msgid "Use _echo cancellation to improve call quality"
msgstr "ИÑпользовать подавление _Ñха Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ ÐºÐ°Ñ‡ÐµÑтва ÑвÑзи"
#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Подавление Ñха позволÑет Ñделать передачу вашего голоÑа чище, но Ñто может "
-"вызывать проблемы на некоторых компьютерах. ЕÑли вы или ваш ÑобеÑедник "
-"Ñлышите Ñтранные шумы или Ñбои во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð°, попробуйте выключить "
-"подавление Ñха и повторить вызов ÑобеÑедника."
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Подавление Ñха позволÑет Ñделать передачу вашего голоÑа чище, но Ñто может вызывать проблемы на некоторых компьютерах. ЕÑли вы или ваш ÑобеÑедник Ñлышите Ñтранные шумы или Ñбои во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð°, попробуйте выключить подавление Ñха и повторить вызов ÑобеÑедника."
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "Пу_бликовать меÑтоположение Ð´Ð»Ñ ÑобеÑедников"
#: ../src/empathy-preferences.ui.h:31
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Примерное определение меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, что публикуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ваш "
-"город, регион и Ñтрана. Координаты GPS будут отображатьÑÑ Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ñтью до 1 "
-"знака поÑле запÑтой."
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
+msgstr "Примерное определение меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, что публикуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ваш город, регион и Ñтрана. Координаты GPS будут отображатьÑÑ Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ñтью до 1 знака поÑле запÑтой."
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
@@ -4351,11 +4151,8 @@ msgid "Location sources:"
msgstr "ИÑточники меÑтоположений:"
#: ../src/empathy-preferences.ui.h:40
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Ð’ Ñтом ÑпиÑке показаны только те Ñзыки, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… уÑтановлены Ñловари."
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Ð’ Ñтом ÑпиÑке показаны только те Ñзыки, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… уÑтановлены Ñловари."
#: ../src/empathy-preferences.ui.h:41
msgid "Enable spell checking for languages:"
@@ -4392,9 +4189,7 @@ msgstr "Чтобы увидеть ÑобеÑедников, необходимо
#: ../src/empathy-roster-window.c:518
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr ""
-"Учётные запиÑи %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать до тех пор, пока не будет обновлено "
-"приложение %s."
+msgstr "Учётные запиÑи %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать до тех пор, пока не будет обновлено приложение %s."
#: ../src/empathy-roster-window.c:636
msgid "Update software..."
@@ -4418,9 +4213,7 @@ msgstr "Пополнить Ñчёт"
#: ../src/empathy-roster-window.c:1470
msgid "You need to enable one of your accounts to see contacts here."
-msgstr ""
-"Чтобы увидеть ÑобеÑедников, необходимо включить одну из ваших учётных "
-"запиÑей."
+msgstr "Чтобы увидеть ÑобеÑедников, необходимо включить одну из ваших учётных запиÑей."
#. translators: argument is an account name
#: ../src/empathy-roster-window.c:1478
@@ -4542,3 +4335,4 @@ msgstr "Изменить параметры учётной запиÑи %s"
#: ../ubuntu-online-accounts/empathy.application.in.h:1
msgid "Integrate your IM accounts"
msgstr "Интегрируйте учётные запиÑи ÑиÑтем обмена мгновенными ÑообщениÑми"
+
diff --git a/po/sk.po b/po/sk.po
index a19d855b2..8caee0a84 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-10-12 13:53+0000\n"
+"POT-Creation-Date: 2012-11-09 11:00+0000\n"
"PO-Revision-Date: 2012-10-09 14:36+0200\n"
"Last-Translator: Pavol KlaÄanský <pavol@klacansky.com>\n"
"Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
@@ -19,26 +19,37 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+# desktop entry name
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
msgstr "Empathy"
+# desktop entry generic name
#: ../data/empathy.desktop.in.in.h:2
msgid "IM Client"
msgstr "Komunikátor"
+# desktop entry X-GNOME-FullName
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
msgstr "Empathy - internetová komunikácia"
+# desktop entry Comment
#: ../data/empathy.desktop.in.in.h:4
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Komunikujte pomocou služieb Google Talk, Facebook, MSN a mnoho Äalších"
+msgstr "Umožňuje komunikovaÅ¥ pomocou služieb Google Talk, Facebook, MSN a mnohých Äalších"
+# PM: rozmýšľam Äi nepridaÅ¥ aj videohovor;telefonovanie;
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;im;irc;voip;gtalk;facebook;jabber;komunikovať;komunikácia;rozhovor;hovor;"
+
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Mal by byť použitý správca pripojenia"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:2
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
@@ -47,265 +58,322 @@ msgstr ""
"Či sa má použiť správca pripojenia na automatické odpojenie alebo obnovenie "
"spojenia."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:3
msgid "Empathy should auto-connect on startup"
msgstr "Empathy by sa mal automaticky pripojiť pri štarte"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:4
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "ÄŒi sa má Empathy automaticky prihlasovaÅ¥ k vaším úÄtom po spustení."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:5
msgid "Empathy should auto-away when idle"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:6
#, fuzzy
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "ÄŒi sa má Empathy automaticky prihlasovaÅ¥ k vaším úÄtom po spustení."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:7
msgid "Empathy default download folder"
-msgstr "Predvolený prieÄinok na sÅ¥ahovanie"
+msgstr "Predvolený prieÄinok na preberanie"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:8
msgid "The default folder to save file transfers in."
msgstr "Predvolený prieÄinok na uloženie prenesených súborov."
+# gsettings summary
#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
#: ../data/org.gnome.Empathy.gschema.xml.h:10
msgid "Magic number used to check if sanity cleaning tasks should be run"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:11
msgid ""
"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
"should be executed or not. Users should not change this key manually."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
msgid "Show offline contacts"
msgstr "Zobraziť odhlásené kontakty"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:13
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Či sa majú zobrazovať v zozname kontaktov aj odhlásené kontakty."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:14
msgid "Show Balance in contact list"
msgstr "Zobraziť množstvo kreditu v zozname kontaktov"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:15
-#, fuzzy
msgid "Whether to show account balances in the contact list."
-msgstr "Či sa majú v zozname kontaktov zobrazovať pri kontakoch protokoly."
+msgstr "Či sa má v zozname kontaktov zobrazovať množstvo kreditu."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:16
msgid "Hide main window"
msgstr "Skryť hlavné okno"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:17
msgid "Hide the main window."
msgstr "Skryje hlavné okno."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:18
msgid "Default directory to select an avatar image from"
msgstr "Predvolený prieÄinok pre výber obrázku podobizne"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:19
msgid "The last directory that an avatar image was chosen from."
msgstr "Posledný prieÄinok, z ktorého bol vybratý obrázok podobizne."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:20
msgid "Open new chats in separate windows"
msgstr "Nové rozhovory otvoriť v samostatných oknách"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:21
msgid "Always open a separate chat window for new chats."
msgstr "Vždy otvoriť samostatné okno pre nové rozhovory."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:22
msgid "Display incoming events in the status area"
msgstr "Zobraziť prichádzajúce udalosti v stavovej oblasti"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:23
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:25
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:26
msgid "Show contact groups"
msgstr "Zobraziť skupiny"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:27
msgid "Whether to show groups in the contact list."
msgstr "Či sa majú v zozname kontaktov zobrazovať skupiny."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:28
msgid "Use notification sounds"
-msgstr "Použiť zvukové upozornenia"
+msgstr "Použiť zvukové oznamovanie"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:29
msgid "Whether to play a sound to notify of events."
-msgstr "Či sa má prehrať zvuk upozorňujúci na udalosti."
+msgstr "Či sa má prehrať zvuk oznamujúci udalosti."
+# PM: nepáÄi sa mi "som preÄ" ked tak v stave "preÄ" aj s úvodzovkami
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:30
msgid "Disable sounds when away"
-msgstr "ZakázaÅ¥ zvuky, keÄ som preÄ"
+msgstr "ZakázaÅ¥ zvuky v stave „preÄ“"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:31
msgid "Whether to play sound notifications when away or busy."
msgstr ""
-"ÄŒi sa majú prehrávaÅ¥ zvukové upozornenia v stave preÄ alebo zaneprázdnený."
+"ÄŒi sa majú prehrávaÅ¥ zvukové oznámenia v stave „preÄ“ alebo „zaneprázdnený“."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:32
msgid "Play a sound for incoming messages"
msgstr "Prehrať zvuk pri príchode správ"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:33
msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Či sa má prehrať zvuk upozorňujúci na prichádzajúce správy."
+msgstr "Či sa má prehrať zvuk oznamujúci prichádzajúce správy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:34
msgid "Play a sound for outgoing messages"
msgstr "Prehrať zvuk pri odchádzajúcej správe"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:35
msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Či sa má prehrať zvuk upozorňujúci na odchádzajúce správy."
+msgstr "Či sa má prehrať zvuk oznamujúci na odchádzajúce správy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:36
msgid "Play a sound for new conversations"
msgstr "Prehrať zvuk pri novej konverzácii"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:37
msgid "Whether to play a sound to notify of new conversations."
-msgstr "Či sa má prehrať zvuk upozorňujúci na nové konverzácie."
+msgstr "Či sa má prehrať zvuk oznamujúci nové konverzácie."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:38
msgid "Play a sound when a contact logs in"
msgstr "Prehrať zvuk pri prihlásení kontaktu"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:39
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Či sa má prehrať zvuk upozorňujúci na prihlásenie kontaktu do siete."
+msgstr "Či sa má prehrať zvuk oznamujúci prihlásenie kontaktu do siete."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:40
msgid "Play a sound when a contact logs out"
msgstr "Prehrať zvuk pri odhlásení kontaktu"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:41
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Či sa má prehrať zvuk upozorňujúci na odhlásenie kontaktu zo siete."
+msgstr "Či sa má prehrať zvuk oznamujúci odhlásenie kontaktu zo siete."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:42
msgid "Play a sound when we log in"
msgstr "Prehrať zvuk pri prihlásení"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:43
msgid "Whether to play a sound when logging into a network."
msgstr "Či sa má prehrať zvuk pri prihlasovaní sa do siete."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:44
msgid "Play a sound when we log out"
msgstr "Prehrať zvuk pri odhlásení"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:45
msgid "Whether to play a sound when logging out of a network."
msgstr "Či sa má prehrať zvuk pri odhlasovaní sa zo siete."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:46
msgid "Enable popup notifications for new messages"
-msgstr "Povoliť vyskakovacie upozornenia pre nové správy"
+msgstr "Povoliť vyskakovacie oznámenia pre nové správy"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:47
msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Či sa má zobraziť vyskakovacie upozornenie pri prijatí novej správy."
+msgstr "Či sa má zobraziť vyskakovacie oznámenie pri prijatí novej správy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:48
msgid "Disable popup notifications when away"
-msgstr "ZakázaÅ¥ vyskakovacie upozornenia, keÄ som preÄ"
+msgstr "ZakázaÅ¥ vyskakovacie oznámenia v stave „preÄ“"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:49
msgid "Whether to show popup notifications when away or busy."
msgstr ""
-"ÄŒi sa majú zobrazovaÅ¥ vyskakovacie upozornenia v stave preÄ alebo "
-"zaneprázdnený."
+"ÄŒi sa majú zobrazovaÅ¥ vyskakovacie oznámenia v stave „preÄ“ alebo "
+"„zaneprázdnený“."
-# Mylsím že pop up je v tomto prípade sloveso preto si nie som istý správnosťou prekladu a neviem navrhnúť iný preklad - prekonzultuj preklad v mailing liste (Ďalej len ML)
-# viackrát nesprávne preložené pop up
-# PK: je to popis dconf kluca, myslim ze to moze
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:50
msgid "Pop up notifications if the chat isn't focused"
-msgstr "Vyskakovacie upozornenia, ak rozhovor nie je aktívny"
+msgstr "Zobraziť vyskakovacie oznámenia, ak rozhovor nie je aktívny"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:51
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr ""
-"Či sa má zobraziť vyskakovacie upozornenie pri prijatí novej správy aj "
+"Či sa má zobraziť vyskakovacie oznámenie pri prijatí novej správy aj "
"vtedy, keÄ je okno rozhovoru už otvorené, ale nie je aktívne."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
-msgstr "Vyskakovacie upozornenia, keÄ sa kontakt prihlási"
+msgstr "ZobraziÅ¥ vyskakovacie oznámenia, keÄ sa kontakt prihlási"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:53
msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Či sa má zobraziť vyskakovacie upozornenie pri prihlásení kontaktu."
+msgstr "Či sa má zobraziť vyskakovacie oznámenie pri prihlásení kontaktu."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:54
msgid "Pop up notifications when a contact logs out"
-msgstr "Vyskakovacie upozornenia keÄ sa kontakt odhlási"
+msgstr "ZobraziÅ¥ vyskakovacie oznámenia, keÄ sa kontakt odhlási"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:55
msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Či sa má zobraziť vyskakovacie upozornenie pri odhlásení kontaktu."
+msgstr "Či sa má zobraziť vyskakovacie oznámenie pri odhlásení kontaktu."
# http://live.gnome.org/SlovakTranslation/Others/JULS
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:56
msgid "Use graphical smileys"
msgstr "Použiť grafických smejkov"
# http://live.gnome.org/SlovakTranslation/Others/JULS
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:57
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Či sa majú v konverzáciách prevádzať smejkovia na grafické obrázky."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:58
msgid "Show contact list in rooms"
msgstr "Zobraziť zoznam kontaktov v miestnostiach"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:59
msgid "Whether to show the contact list in chat rooms."
msgstr "Či sa má zobrazovať zoznam kontaktov v diskusných miestnostiach."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:60
msgid "Chat window theme"
msgstr "Téma okna rozhovoru"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:61
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"Téma, ktorá je použitá na zobrazenie konverzácie v oknách s rozhovormi."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:62
msgid "Chat window theme variant"
msgstr "Variant témy okna rozhovoru"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:63
msgid ""
"The theme variant that is used to display the conversation in chat windows."
@@ -313,10 +381,12 @@ msgstr ""
"Variant témy, ktorý je použitý na zobrazenie konverzácie v oknách s "
"rozhovormi."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:64
msgid "Path of the Adium theme to use"
msgstr "Cesta k téme Adium, ktorá sa má použiť"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:65
msgid ""
"Path of the Adium theme to use if the theme used for chat is Adium. "
@@ -325,110 +395,136 @@ msgstr ""
"Cesta k téme Adium, ktorá sa má použiť, ak je Adium použitá ako téma pre "
"rozhovor. Zastaralé."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "Povoliť vývojové nástroje pre WebKit"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Či majú byť povolené vývojové nástroje pre WebKit, ako napr. Web Inspector."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:69
msgid ""
"Whether to send the 'composing' or 'paused' chat states. Does not currently "
"affect the 'gone' state."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
msgstr "Použiť tému pre diskusné miestnosti"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:71
msgid "Whether to use the theme for chat rooms."
msgstr "Či sa má pre diskusné miestnosti používať téma."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:72
msgid "Spell checking languages"
msgstr "Jazyky pre kontrolu pravopisu"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:73
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Čiarkami oddelený zoznam jazykov pre kontrolu pravopisu (napr. „en, fr, nl“)."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "Povoliť kontrolu pravopisu"
+# PM: nepáÄi sa mi ten koniec s vami zadanými jazykmi
+# gsettings description
+#, fuzzy
#: ../data/org.gnome.Empathy.gschema.xml.h:75
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Či sa má kontrolovať pravopis zadaných slov s vami zadanými jazykmi."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:76
msgid "Nick completed character"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:77
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
"Znak, ktorý má byť pridaný za prezývku pri použití automatického dopĺňania "
-"prezývok (tab) v skupinovom rozhovore."
+"prezývok (pomocou tabulátoru) v skupinovom rozhovore."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:78
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy by mal použiť podobizeň kontaktu ako ikonu okna rozhovoru"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:79
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Či má Empathy použiť podobizeň kontaktu ako ikonu okna rozhovoru."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:80
msgid "Last account selected in Join Room dialog"
msgstr ""
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:81
msgid "D-Bus object path of the last account selected to join a room."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:82
msgid "Camera device"
msgstr "Zariadenie kamery"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
msgstr "Pozícia kamery"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:85
msgid "Position the camera preview should be during a call."
msgstr ""
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:86
msgid "Echo cancellation support"
msgstr "Podpora potlaÄenia ozveny"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:87
msgid "Whether to enable Pulseaudio's echo cancellation filter."
msgstr "ÄŒi povoliÅ¥ filter systému Pulseaudio na potlaÄenie ozveny."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:88
msgid "Show hint about closing the main window"
msgstr "Zobraziť radu ohľadne zatvárania hlavného okna"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:89
msgid ""
"Whether to show the message dialog about closing the main window with the "
@@ -437,48 +533,59 @@ msgstr ""
"ÄŒi sa má zobraziÅ¥ dialógové okno o zatvorení hlavného okna tlaÄidlom 'x' v "
"titulku okna."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
msgstr "Empathy môže publikovať používateľovu polohu"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:91
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Či Empathy môže publikovať polohu používateľa jeho kontaktom."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:92
msgid "Empathy can use the network to guess the location"
msgstr "Empathy môže použiť sieť na odhadnutie polohy"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:93
msgid "Whether Empathy can use the network to guess the location."
msgstr "Či má Empathy použiť sieť na odhadnutie polohy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:94
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy môže použiť sieť mobilného operátora na odhadnutie polohy"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:95
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Či má Empathy použiť mobilnú sieť na odhadnutie polohy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:96
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy môže použiť GPS na odhadnutie polohy"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:97
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Či má Empathy použiť GPS na odhadnutie polohy."
+# gsettings summary
#: ../data/org.gnome.Empathy.gschema.xml.h:98
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy by mal znížiÅ¥ presnosÅ¥ urÄenia polohy"
+# gsettings description
#: ../data/org.gnome.Empathy.gschema.xml.h:99
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"ÄŒi má Empathy znížiÅ¥ presnosÅ¥ urÄenia polohy z dôvodu ochrany súkromia."
+# Chyby ktoré vzniknú zmenou stavu
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
msgstr "Nebol špecifikovaný žiaden dôvod"
@@ -543,14 +650,15 @@ msgstr "Heslo pre diskusnú miestnosÅ¥ „%s“ na úÄte %s (%s)"
msgid "Missed call from %s"
msgstr "Zmeškaný hovor od %s"
+# PM: kvôli rodom a skloňovaniu - kontaktom %s alebo s úÄastníkom %s
#. Translators: this is an outgoing call, e.g. 'Called Alice'
#: ../libempathy/empathy-message.c:407
-#, c-format
+#, fuzzy, c-format
msgid "Called %s"
msgstr "Hovor s %s"
#: ../libempathy/empathy-message.c:410
-#, c-format
+#, fuzzy, c-format
msgid "Call from %s"
msgstr "Hovor od %s"
@@ -606,173 +714,213 @@ msgstr[2] "pred %d mesiacmi"
msgid "in the future"
msgstr "v budúcnosti"
+# stav prítomnosti
#: ../libempathy/empathy-utils.c:226
msgid "Available"
msgstr "Prítomný"
+# stav prítomnosti
#: ../libempathy/empathy-utils.c:228
msgid "Busy"
msgstr "Zaneprázdnený"
+# stav prítomnosti
#: ../libempathy/empathy-utils.c:231
msgid "Away"
msgstr "PreÄ"
+# stav prítomnosti
#: ../libempathy/empathy-utils.c:233
msgid "Invisible"
msgstr "Neviditeľný"
+# stav prítomnosti
#: ../libempathy/empathy-utils.c:235
msgid "Offline"
msgstr "Odhlásený"
+# stav prítomnosti
#. translators: presence type is unknown
#: ../libempathy/empathy-utils.c:238
msgctxt "presence"
msgid "Unknown"
msgstr "Neznámy"
+# status reason message
#: ../libempathy/empathy-utils.c:278
msgid "No reason specified"
msgstr "Nebol uvedený žiadny dôvod"
+# status reason message
#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
msgid "Status is set to offline"
msgstr "Stav je nastavený na odhlásený"
+# status reason message
#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
#: ../libempathy-gtk/empathy-call-utils.c:47
#: ../libempathy-gtk/empathy-new-message-dialog.c:80
msgid "Network error"
msgstr "Chyba siete"
+# status reason message
#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
msgid "Authentication failed"
msgstr "Overenie totožnosti zlyhalo"
+# status reason message
#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
msgid "Encryption error"
msgstr "Chyba Å¡ifrovania"
+# status reason message
#: ../libempathy/empathy-utils.c:288
msgid "Name in use"
msgstr "Meno sa používa"
+# status reason message
#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
msgid "Certificate not provided"
msgstr "Certifikát nebol poskytnutý"
+# status reason message
#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
msgid "Certificate untrusted"
msgstr "Nedôveryhodný certifikát"
+# status reason message
#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
msgid "Certificate expired"
msgstr "Certifikát vypršal"
+# status reason message
#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
msgid "Certificate not activated"
msgstr "Certifikát nie je aktivovaný"
+# status reason message
#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
msgid "Certificate hostname mismatch"
msgstr "Názov hostiteľa certifikátu nesúhlasí"
+# status reason message
#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
msgid "Certificate fingerprint mismatch"
msgstr "OdtlaÄok certifikátu sa nezhoduje"
+# status reason message
#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
msgid "Certificate self-signed"
msgstr "Certifikát podpísaný sám sebou"
+# status reason message
#: ../libempathy/empathy-utils.c:304
msgid "Certificate error"
msgstr "Chyba certifikátu"
+# error
#: ../libempathy/empathy-utils.c:338
msgid "Encryption is not available"
msgstr "Šifrovanie nie je dostupné"
+# error
#: ../libempathy/empathy-utils.c:340
msgid "Certificate is invalid"
msgstr "Certifikát je neplatný"
+# error
#: ../libempathy/empathy-utils.c:342
msgid "Connection has been refused"
msgstr "Spojenie bolo zamietnuté"
+# error
#: ../libempathy/empathy-utils.c:344
msgid "Connection can't be established"
msgstr "Spojenie sa nedá vytvoriť"
+# error
#: ../libempathy/empathy-utils.c:346
msgid "Connection has been lost"
msgstr "Spojenie bolo prerušené"
+# error
#: ../libempathy/empathy-utils.c:348
msgid "This account is already connected to the server"
msgstr "Tento úÄet už je pripojený k serveru"
+# error
#: ../libempathy/empathy-utils.c:350
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "Povodné spojenie bolo nahradené novým použitím rovnakého zdroja"
+# error
#: ../libempathy/empathy-utils.c:353
msgid "The account already exists on the server"
msgstr "ÚÄet už na serveri existuje"
+# error
#: ../libempathy/empathy-utils.c:355
msgid "Server is currently too busy to handle the connection"
msgstr ""
"Server je teraz príliš zaneprázdnený, a preto nemôže obslúžiť pripojenie"
+# error
#: ../libempathy/empathy-utils.c:357
msgid "Certificate has been revoked"
msgstr "Certifikát mal zrušenú platnosť"
+# error
#: ../libempathy/empathy-utils.c:359
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Certifikát používa nedostatoÄne bezpeÄný Å¡ifrovací algoritmus alebo je slabý"
+# error
#: ../libempathy/empathy-utils.c:362
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
+# error
#: ../libempathy/empathy-utils.c:366
msgid "Your software is too old"
msgstr "Váš softvér je príliš zastaralý"
+# error
#: ../libempathy/empathy-utils.c:368
msgid "Internal error"
msgstr "Vnútorná chyba"
+# protocol name
#: ../libempathy/empathy-utils.c:497
#: ../libempathy-gtk/empathy-roster-model.h:30
msgid "People Nearby"
msgstr "Ľudia v okolí"
+# protocol name
#: ../libempathy/empathy-utils.c:502
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
+# service name
#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "Google Talk"
+# service name
#: ../libempathy/empathy-utils.c:532
msgid "Facebook Chat"
msgstr "Facebook Chat"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-chooser.c:689
msgid "All accounts"
msgstr "VÅ¡etky úÄty"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
@@ -782,14 +930,17 @@ msgstr "VÅ¡etky úÄty"
msgid "Pass_word"
msgstr "_Heslo"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
msgid "Screen _Name"
msgstr "Pr_ezývka"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
msgid "<b>Example:</b> MyScreenName"
msgstr "<b>Príklad:</b> MojaPrezvýka"
+# GtkCheckButton
#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
@@ -802,6 +953,7 @@ msgstr "<b>Príklad:</b> MojaPrezvýka"
msgid "Remember password"
msgstr "Zapamätať heslo"
+# GtkLabel
#: ../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
@@ -810,6 +962,7 @@ msgstr "Zapamätať heslo"
msgid "_Port"
msgstr "_Port"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
@@ -818,6 +971,7 @@ msgstr "_Port"
msgid "_Server"
msgstr "_Server"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
@@ -831,14 +985,17 @@ msgstr "_Server"
msgid "Advanced"
msgstr "PokroÄilé"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
msgid "What is your AIM screen name?"
msgstr "Aká je vaša prezývka pre AIM?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
msgid "What is your AIM password?"
msgstr "Aké je vaše heslo pre AIM?"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
@@ -848,66 +1005,78 @@ msgstr "Aké je vaše heslo pre AIM?"
msgid "Remember Password"
msgstr "Zapamätať heslo"
+# hash table
#: ../libempathy-gtk/empathy-account-widget.c:675
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
#: ../src/empathy-import-widget.c:322
msgid "Account"
msgstr "ÚÄet"
+# hash table
#: ../libempathy-gtk/empathy-account-widget.c:676
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "Password"
msgstr "Heslo"
+# hash table
#: ../libempathy-gtk/empathy-account-widget.c:677
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
msgid "Server"
msgstr "Server"
+# hash table
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Port"
+# PM: tu by vývojári mali daÅ¥ komentár preÄo ten reÅ¥azec dali na preklad vyžiadaj si ho
#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
+#, fuzzy, c-format
msgid "%s"
msgstr "%s"
+# PM: aj tu
#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
+#, fuzzy, c-format
msgid "%s:"
msgstr "%s:"
+# gtk_label
#: ../libempathy-gtk/empathy-account-widget.c:1429
msgid "Username:"
msgstr "Používateľské meno:"
+# gtk_button
#: ../libempathy-gtk/empathy-account-widget.c:1746
msgid "A_pply"
msgstr "Po_užiť"
+# gtk_button
#: ../libempathy-gtk/empathy-account-widget.c:1775
msgid "L_og in"
msgstr "_Prihlásiť sa"
+# gtk_radio_button
#: ../libempathy-gtk/empathy-account-widget.c:1845
msgid "This account already exists on the server"
msgstr "Tento úÄet už na serveri existuje"
+# gtk_radio_button
#: ../libempathy-gtk/empathy-account-widget.c:1849
msgid "Create a new account on the server"
msgstr "VytvoriÅ¥ na serveri nový úÄet"
+# PM: to je fajn že to tak pekne popísali ale zišlo by sa vedieť kde je to vlastne použité
#. To translators: The first parameter is the login id and the
#. * second one is the network. The resulting string will be something
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
+#, fuzzy, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %2$s"
@@ -922,58 +1091,71 @@ msgstr "ÚÄet %s"
msgid "New account"
msgstr "Nový úÄet"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
msgid "Login I_D"
msgstr "Prihlasovací i_dentifikátor"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "<b>Example:</b> username"
msgstr "<b>Príklad:</b> používateľské meno"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise User ID?"
msgstr "Aký je váš používateľský identifikátor pre GroupWise?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
msgid "What is your GroupWise password?"
msgstr "Aké je vaše heslo pre GroupWise?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
msgid "ICQ _UIN"
msgstr "_IdentifikaÄné Äíslo ICQ"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "<b>Example:</b> 123456789"
msgstr "<b>Príklad:</b> 123456789"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
msgid "Ch_aracter set"
msgstr "Zn_aková sada"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ UIN?"
msgstr "Aké je vaÅ¡e identifikaÄné Äíslo pre ICQ?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
msgid "What is your ICQ password?"
msgstr "Aké je vaše heslo pre ICQ?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
msgid "Network"
msgstr "Sieť"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set"
msgstr "Znaková sada"
+# GtkToolButton tooltip
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "Add…"
msgstr "Pridať…"
+# GtkToolButton tooltip
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
@@ -982,57 +1164,68 @@ msgstr "Pridať…"
msgid "Remove"
msgstr "Odstrániť"
+# GtkToolButton tooltip
#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Up"
msgstr "Hore"
+# GtkToolButton tooltip
#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Down"
msgstr "Dolu"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Servers"
msgstr "Servery"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid ""
"Most IRC servers don't need a password, so if you're not sure, don't enter a "
"password."
msgstr ""
-"VäÄÅ¡ina IRC serverov nevyžaduje heslo, takže ak si nie ste istý, nezadávajte "
+"VäÄÅ¡ina serverov IRC nevyžaduje heslo, takže ak si nie ste istý, nezadávajte "
"žiadne."
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Nickname"
msgstr "Prezývka"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Quit message"
msgstr "Správa pri odchode"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
msgid "Real name"
msgstr "SkutoÄné meno"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
msgid "Username"
msgstr "Používateľské meno"
-# TC
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
msgid "Which IRC network?"
-msgstr "Ktorú IRC sieť?"
+msgstr "Ktorú sieť IRC?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
msgid "What is your IRC nickname?"
msgstr "Aká je vaša prezývka pre IRC?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "What is your Facebook username?"
msgstr "Aké je vaše používateľské meno pre Facebook?"
+# GtkLabel
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
msgid ""
@@ -1046,242 +1239,308 @@ msgstr ""
"Ak ešte používateľské meno pre Facebook nemáte, na jeho vytvorenie použite "
"<a href=\"http://www.facebook.com/username/\">túto stránku</a>."
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
msgstr "Aké je vaše heslo pre Facebook?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "What is your Google ID?"
msgstr "Aký je váš identifikátor pre Google?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>Príklad:</b> používateľ@gmail.com"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "What is your Google password?"
msgstr "Aké je vaše heslo pre Google?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>Príklad:</b> používateľ@jabber.org"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "I_gnore SSL certificate errors"
msgstr "_Ignorovať chyby SSL certifikátu"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Priori_ty"
msgstr "_Priorita"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Reso_urce"
msgstr "_Zdroj"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "Encr_yption required (TLS/SSL)"
msgstr "V_yžadovať šifrovanie (TLS/SSL)"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "Override server settings"
msgstr "PotlaÄiÅ¥ nastavenia servera"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "Use old SS_L"
msgstr "Použiť staré _SSL"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your Jabber ID?"
msgstr "Aký je váš identifikátor pre Jabber?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber ID?"
msgstr "Aký je váš požadovaný identifikátor pre Jabber?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
msgid "What is your Jabber password?"
msgstr "Aké je vaše heslo pre Jabber?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
msgid "What is your desired Jabber password?"
msgstr "Aké je vaše požadované heslo pre Jabber?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
msgid "Nic_kname"
msgstr "Prezýv_ka"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Last Name"
msgstr "_Priezvisko"
+# PM: dal by som krstné meno abo to bolo jednoznaÄné
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
msgid "_First Name"
msgstr "_Meno"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Published Name"
msgstr "_Zverejnené meno"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID"
msgstr "Identifikátor pre _Jabber"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "E-_mail address"
msgstr "E_mailová adresa"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Príklad:</b> používateľ@hotmail.com"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live ID?"
msgstr "Aký je váš identifikátor pre Windows Live?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
msgid "What is your Windows Live password?"
msgstr "Aké je vaše heslo pre Windows Live?"
# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
# PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
+# PM: jedno je pre 'transport' combo box; a druhe pre 'keep-alive mechanism' combo box
+# PM: V tom prvom prípade je to OK v tom druhom nechápem súvislosť medzi auto, register, options a none
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:207
#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#, fuzzy
msgid "Auto"
msgstr "Automaticky"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:210
msgid "UDP"
msgstr "UDP"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:213
msgid "TCP"
msgstr "TCP"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "TLS"
msgstr "TLS"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#, fuzzy
msgid "Register"
msgstr "Registrovať"
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#, fuzzy
msgid "Options"
msgstr "Voľby"
# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
# PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
+# gtk_list_store
#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#, fuzzy
msgid "None"
msgstr "Žiadna"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
msgid "_Username"
msgstr "_Používateľské meno"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
msgid "<b>Example:</b> user@my.sip.server"
msgstr "<b>Príklad:</b> používateľ@môj.sip.server"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Use this account to call _landlines and mobile phones"
msgstr "PoužiÅ¥ tento úÄet na volanie na _pevné linky alebo mobilné telefóny"
+# PM: voľby pre NAT Traversal
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "NAT Traversal Options"
msgstr ""
+# PM: znie to dosť divne, voľby pre proxy
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#, fuzzy
msgid "Proxy Options"
msgstr "Voľby proxy"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Miscellaneous Options"
msgstr "Ďalšie voľby"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "STUN Server"
-msgstr "STUN server"
+msgstr "Server STUN"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Discover the STUN server automatically"
msgstr "Automaticky objaviť server STUN"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Discover Binding"
msgstr ""
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Keep-Alive Options"
msgstr ""
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Mechanism"
msgstr "Mechanizmus"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Interval (seconds)"
msgstr "Interval (sekundy)"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Authentication username"
msgstr "Používateľské meno na overenie totožnosti"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport"
msgstr "Prenos"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Loose Routing"
msgstr ""
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "Ignore TLS Errors"
msgstr "Ignorovať chyby TLS"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "Local IP Address"
-msgstr "Miestna IP adresa:"
+msgstr "Miestna adresa IP"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "What is your SIP login ID?"
-msgstr "Aký je váš identifikátor pre SIP prihlásenie?"
+msgstr "Aký je váš prihlasovací identifikátor pre SIP?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
msgid "What is your SIP account password?"
-msgstr "Aké je heslo pre váš SIP úÄet?"
+msgstr "Aké je vaÅ¡e heslo k úÄtu pre SIP?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
msgid "Pass_word:"
msgstr "_Heslo:"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Yahoo! I_D:"
msgstr "I_dentifikátor pre Yahoo!:"
+# GtkCheckButton
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorovať pozvánky do konferencií a diskusných miestností"
-# Locale nie je slovenské slovo
-# prosím prediskutuj všetky výrazy podobného charakteru v ML
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#, fuzzy
msgid "_Room List locale:"
-msgstr "Locale _zoznamu miestností"
+msgstr "Miestne nastavenia _zoznamu miestností"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Ch_aracter set:"
msgstr "Zn_aková sada:"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Port:"
msgstr "_Port:"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "What is your Yahoo! ID?"
msgstr "Aký je váš identifikátor pre Yahoo!?"
+# GtkLabel
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "What is your Yahoo! password?"
msgstr "Aké je vaše heslo pre Yahoo!?"
@@ -1300,26 +1559,33 @@ msgstr ""
msgid "Couldn't save picture to file"
msgstr "Nepodarilo sa uložiť obrázok do súboru"
+# filechoser dialog title
#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
msgid "Select Your Avatar Image"
-msgstr "Vyberte si obrázok podobizne"
+msgstr "Výber obrázka podobizne"
+# PM: neviem Äi je to spisovne, poslal som otázku do JULS
+# button
#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
msgid "Take a picture..."
msgstr "Odfotiť..."
+# button
#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
msgid "No Image"
-msgstr "Žiadny obrázok"
+msgstr "Bez obrázka"
+# file filter name
#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
msgid "Images"
msgstr "Obrázky"
+# file filter name
#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
msgid "All Files"
msgstr "Všetky súbory"
+# tooltip
#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
msgstr "Kliknutím zväÄšíte"
@@ -1329,6 +1595,7 @@ msgstr "Kliknutím zväÄšíte"
msgid "Authentication failed for account <b>%s</b>"
msgstr "Overenie totožnosti zlyhalo pre úÄet <b>%s</b>"
+# button
#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
#: ../libempathy-gtk/empathy-chat.c:3724
msgid "Retry"
@@ -1344,35 +1611,43 @@ msgstr ""
"Zadajte vaÅ¡e heslo pre úÄet\n"
"<b>%s</b>"
+# button
#: ../libempathy-gtk/empathy-calendar-button.c:66
msgid "Select..."
msgstr "Vybrať..."
+# button
#: ../libempathy-gtk/empathy-calendar-button.c:154
msgid "_Select"
msgstr "_Vybrať"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:42
#: ../libempathy-gtk/empathy-call-utils.c:60
msgid "There was an error starting the call"
msgstr "PoÄas vytvárania hovoru nastala chyba"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "The specified contact doesn't support calls"
msgstr "Zvolený kontakt nepodporuje hovory"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "The specified contact is offline"
msgstr "Zvolený kontakt je odhlásený"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:53
msgid "The specified contact is not valid"
msgstr "Zvolený kontakt nie je platný"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:55
msgid "Emergency calls are not supported on this protocol"
msgstr "Tiesňové volania nie sú podporované týmto protokolom"
+# error message
#: ../libempathy-gtk/empathy-call-utils.c:57
msgid "You don't have enough credit in order to place this call"
msgstr "Nemáte dostatok kreditu na uskutoÄnenie tohto hovoru"
@@ -1393,23 +1668,28 @@ msgstr "Nie je vám dovolené meniť tému"
msgid "Invalid contact ID"
msgstr "Neplatný identifikátor kontaktu"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1054
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: vymaže všetky správy z aktuálnej konverzácie"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1057
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <téma>: nastaví tému aktuálnej konverzácie"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1060
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1063
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
"/j <identifikátor diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
@@ -1418,24 +1698,28 @@ msgstr ""
"/part [<identifikátor diskusnej miestnosti>] [<dôvod>]: opustí diskusnú "
"miestnosť, predvolene aktuálnu"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1071
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <identifikátor kontaktu> [<správa>]: otvorí súkromný rozhovor"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1074
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <identifikátor kontaktu> <správa>: otvorí súkromný rozhovor"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1077
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <prezývka>: zmeni vašu prezývku na aktuálnom serveri"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1080
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <správa>: pošle ACTION správu do aktuálnej konverzácie"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1083
-#, fuzzy
#| msgid ""
#| "/say <message>: send <message> to the current conversation. This is used "
#| "to send a message starting with a „/“. For example: „/say /join is used "
@@ -1449,10 +1733,12 @@ msgstr ""
"odoslanie správy zaÄínajúcej na „/“. Napríklad: „/say /join sa používa na "
"vstúpenie do novej diskusnej miestnosti“"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <identifikátor kontaktu>: zobrazí informácie o kontakte"
+# chat command item
#: ../libempathy-gtk/empathy-chat.c:1091
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
@@ -1461,6 +1747,7 @@ msgstr ""
"/help [<príkaz>]: zobrazí zoznam všetkých podporovaných príkazov. Ak je "
"zadaný aj <príkaz>, zobrazí sa jeho použitie."
+# %s item->help
#: ../libempathy-gtk/empathy-chat.c:1110
#, c-format
msgid "Usage: %s"
@@ -1482,7 +1769,7 @@ msgstr "nedostatoÄný kredit na poslanie správy"
#: ../libempathy-gtk/empathy-chat.c:1619
#, c-format
msgid "Error sending message '%s': %s"
-msgstr "Chyba pri posielaní správy '%s': %s"
+msgstr "Chyba pri posielaní správy „%s“: %s"
#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
#: ../libempathy-gtk/empathy-chat.c:1623
@@ -1497,31 +1784,40 @@ msgstr "Chyba pri posielaní správy: %s"
msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
msgstr "nedostatoÄný kredit na poslanie správy. <a href='%s'>DobiÅ¥</a>."
+# chat_send_error TP_ERROR_STR_NOT_CAPABLE
#: ../libempathy-gtk/empathy-chat.c:1590
msgid "not capable"
msgstr ""
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1597
msgid "offline"
msgstr "odpojený"
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1600
msgid "invalid contact"
msgstr "neplatný kontakt"
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1603
msgid "permission denied"
msgstr "prístup zamietnutý"
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1606
msgid "too long message"
msgstr "príliš dlhá správa"
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1609
msgid "not implemented"
msgstr "nie je implementované"
+# PM: je tu správny rod?
+# chat_send_error
#: ../libempathy-gtk/empathy-chat.c:1613
+#, fuzzy
msgid "unknown"
msgstr "neznámy"
@@ -1529,11 +1825,13 @@ msgstr "neznámy"
msgid "Topic:"
msgstr "Téma:"
+# %s priv->subject
#: ../libempathy-gtk/empathy-chat.c:1695
#, c-format
msgid "Topic set to: %s"
msgstr "Téma nastavená na: %s"
+# %s actor, priv->subject
#: ../libempathy-gtk/empathy-chat.c:1697
#, c-format
msgid "Topic set by %s to: %s"
@@ -1544,10 +1842,12 @@ msgstr "Téma nastavená používateľom %s na: %s"
msgid "No topic defined"
msgstr "Nebola nastavená žiadna téma"
+# gtk_menu_item
#: ../libempathy-gtk/empathy-chat.c:2218
msgid "(No Suggestions)"
msgstr "(Žiadne návrhy)"
+# gtk_image_menu_item
#. translators: %s is the selected word
#: ../libempathy-gtk/empathy-chat.c:2286
#, c-format
@@ -1555,6 +1855,7 @@ msgid "Add '%s' to Dictionary"
msgstr "Pridať „%s“ do slovníka"
# slovnik je v tvare napr. "slovencina", "anglictina" (podst. m.)
+# gtk_image_menu_item
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
#: ../libempathy-gtk/empathy-chat.c:2323
@@ -1563,6 +1864,7 @@ msgid "Add '%s' to %s Dictionary"
msgstr "Pridať „%s“ do slovníka pre jazyk %s"
#  http://live.gnome.org/SlovakTranslation/Others/JULS
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-chat.c:2393
msgid "Insert Smiley"
msgstr "Vložiť smejka"
@@ -1573,6 +1875,7 @@ msgstr "Vložiť smejka"
msgid "_Send"
msgstr "_Poslať"
+# gtk_image_menu_item
#. Spelling suggestions
#: ../libempathy-gtk/empathy-chat.c:2468
msgid "_Spelling Suggestions"
@@ -1582,37 +1885,45 @@ msgstr "_Návrhy kontroly pravopisu"
msgid "Failed to retrieve recent logs"
msgstr "Zlyhalo získavanie nedávnych záznamov"
+# chat_members_changed
#: ../libempathy-gtk/empathy-chat.c:2718
#, c-format
msgid "%s has disconnected"
msgstr "Kontakt %s sa odpojil"
+# PM preÄo raz kontakt a raz používateľ, neviem Äi oboch nenazvaÅ¥ úÄastníkmi, keÄ hej tak treba zmeniÅ¥ vÅ¡ade v opaÄnom prípade tu daj aspoň kontaktom %2$s
+# chat_members_changed
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
#: ../libempathy-gtk/empathy-chat.c:2725
-#, c-format
+#, fuzzy, c-format
msgid "%1$s was kicked by %2$s"
msgstr "Kontakt %1$s bol vykopnutý používateľom %2$s"
+# chat_members_changed
#: ../libempathy-gtk/empathy-chat.c:2728
#, c-format
msgid "%s was kicked"
msgstr "Kontakt %s bol vykopnutý"
+# PM: od kontaktu %2$s
+# chat_members_changed
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
#: ../libempathy-gtk/empathy-chat.c:2736
-#, c-format
+#, fuzzy, c-format
msgid "%1$s was banned by %2$s"
msgstr "Kontakt %1$s dostal zákaz od %2$s"
+# chat_members_changed
#: ../libempathy-gtk/empathy-chat.c:2739
#, c-format
msgid "%s was banned"
msgstr "Kontakt %s dostal zákaz"
+# chat_members_changed
#: ../libempathy-gtk/empathy-chat.c:2743
#, c-format
msgid "%s has left the room"
@@ -1641,34 +1952,40 @@ msgstr "Kontakt %s je teraz známy ako %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1525
-#: ../src/empathy-call-window.c:1575 ../src/empathy-call-window.c:2629
-#: ../src/empathy-call-window.c:2935 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Odpojený"
+# label
#. Add message
#: ../libempathy-gtk/empathy-chat.c:3664
msgid "Would you like to store this password?"
msgstr "Želáte si uložiť toto heslo?"
+# button
#: ../libempathy-gtk/empathy-chat.c:3670
msgid "Remember"
msgstr "Zapamätať"
+# button
#: ../libempathy-gtk/empathy-chat.c:3680
msgid "Not now"
msgstr "Teraz nie"
+# label
#: ../libempathy-gtk/empathy-chat.c:3728
msgid "Wrong password; please try again:"
msgstr "Nesprávne heslo; prosím, skúste to znova:"
+# label
#. Add message
#: ../libempathy-gtk/empathy-chat.c:3858
msgid "This room is protected by a password:"
msgstr "Miestnosť je chránená heslom:"
+# button
#: ../libempathy-gtk/empathy-chat.c:3885
#: ../src/empathy-new-chatroom-dialog.c:780
msgid "Join"
@@ -1678,6 +1995,7 @@ msgstr "Vstúpiť"
msgid "Connected"
msgstr "Pripojený"
+# empathy_chat_dup_name
#: ../libempathy-gtk/empathy-chat.c:4132
msgid "Conversation"
msgstr "Konverzácia"
@@ -1689,30 +2007,37 @@ msgstr "Konverzácia"
msgid "%s (SMS)"
msgstr "%s (SMS)"
+# label
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
msgid "Unknown or invalid identifier"
msgstr "Neznámy alebo neplatný identifikátor"
+# label
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
msgid "Contact blocking temporarily unavailable"
msgstr "Blokovanie kontaktu je doÄasne nedostupné"
+# label
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
msgid "Contact blocking unavailable"
msgstr "Blokovanie kontaktu je nedostupné"
+# label
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
msgid "Permission Denied"
msgstr "Prístup zamietnutý"
+# label
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
msgid "Could not block contact"
msgstr "Nepodarilo sa zablokovať kontakt"
+# windows title
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
msgid "Edit Blocked Contacts"
-msgstr "Upraviť zablokované kontakty"
+msgstr "Úprava blokovaných kontaktov"
+# GtkLabel
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
@@ -1722,30 +2047,37 @@ msgstr "Upraviť zablokované kontakty"
msgid "Account:"
msgstr "ÚÄet:"
+# GtkTreeViewColumn
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
msgid "Blocked Contacts"
msgstr "Zablokované kontakty"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
msgid "Full name"
msgstr "Celé meno"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
msgid "Phone number"
msgstr "Telefónne Äíslo"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
msgid "E-mail address"
msgstr "Emailová adresa"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
msgid "Website"
msgstr "Webová stránka"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
msgid "Birthday"
msgstr "Narodeniny"
+# info_field_data
#. Note to translators: this is the caption for a string of the form "5
#. * minutes ago", and refers to the time since the contact last interacted
#. * with their IM client.
@@ -1753,44 +2085,54 @@ msgstr "Narodeniny"
msgid "Last seen:"
msgstr "Naposledy videný:"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
msgid "Server:"
msgstr "Server:"
+# info_field_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
msgid "Connected from:"
msgstr "Pripojený z:"
+# info_field_data
#. FIXME: once Idle implements SimplePresence using this information, we can
#. * and should bin this.
#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
msgid "Away message:"
msgstr "Správa pri odchode:"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
msgid "work"
msgstr "pracovný"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
msgid "home"
msgstr "domov"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
msgid "mobile"
msgstr "mobilný"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
msgid "voice"
msgstr "hlasový"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
msgid "preferred"
msgstr "prednostný"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
msgid "postal"
msgstr "poštový"
+# info_parameter_data
#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
msgid "parcel"
msgstr "doruÄovací"
@@ -1798,38 +2140,47 @@ msgstr "doruÄovací"
#. Title
#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
msgid "Search contacts"
-msgstr "Hľadať kontakty"
+msgstr "Hľadanie kontaktov"
+# label
#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
msgid "Search: "
msgstr "Hľadať: "
+# button
#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
msgid "_Add Contact"
msgstr "_Pridať kontakt"
+# label
#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
msgid "No contacts found"
-msgstr "Žiadny nájdený kontakt"
+msgstr "Nenašiel sa žiadny kontakt"
+# label
#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
msgid "Your message introducing yourself:"
msgstr "Správa, ktorá vás predstaví:"
+# PM: Z významového hľadiska sa mi to zdá sprostosÅ¥ - buÄ "vidieÅ¥, že ste pihlásený" alebo "Vás vidieÅ¥ keÄ ste prihlásený" - v druhom prípade by som použil dokoca veľké V v slove Vás lebo ide o osobný kontakt jeden Älovek priamo žiada o nieÄo druhého
+# label
#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#, fuzzy
msgid "Please let me see when you're online. Thanks!"
msgstr "Prosím, dovoľte mi vidieÅ¥, keÄ ste prihlásený. ÄŽakujem!"
+# filechooser title
#: ../libempathy-gtk/empathy-contact-widget.c:168
#: ../libempathy-gtk/empathy-individual-widget.c:900
msgid "Save Avatar"
-msgstr "Uložiť podobizeň"
+msgstr "Uloženie podobizne"
#: ../libempathy-gtk/empathy-contact-widget.c:224
#: ../libempathy-gtk/empathy-individual-widget.c:958
msgid "Unable to save avatar"
msgstr "Podobizeň sa nedá uložiť"
+# GtkLabel
#. Identifier to connect to Instant Messaging network
#. Setup id label
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
@@ -1837,47 +2188,59 @@ msgstr "Podobizeň sa nedá uložiť"
msgid "Identifier"
msgstr "Identifikátor"
+# GtkLabel
#. Setup nickname entry
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
#: ../libempathy-gtk/empathy-user-info.c:449
msgid "Alias"
msgstr "Prezývka"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Contact Details"
msgstr "Podrobnosti o kontakte"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
msgid "Information requested…"
msgstr "Získavajú sa informácie…"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Poloha</b> dňa (dátum)\t"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Client Information"
msgstr "Informácie o klientovi"
+# PM: toto je asi iný bug
# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#, fuzzy
msgid "OS"
msgstr "OS"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Version"
msgstr "Verzia"
+# GtkLabel
#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "Client"
msgstr "Klient"
+# label
#: ../libempathy-gtk/empathy-groups-widget.c:327
msgid "Groups"
msgstr "Skupiny"
+# label
#: ../libempathy-gtk/empathy-groups-widget.c:339
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
@@ -1886,35 +2249,40 @@ msgstr ""
"Vyberte skupiny, do ktorých chcete kontakt zaradiť. Môžete vybrať viac ako "
"jednu skupinu alebo nevybrať žiadnu skupinu."
+# button
#: ../libempathy-gtk/empathy-groups-widget.c:358
msgid "_Add Group"
msgstr "_Pridať skupinu"
+# treeviewcolumn
#: ../libempathy-gtk/empathy-groups-widget.c:393
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Vybrať"
+# treeviewcolumn
#: ../libempathy-gtk/empathy-groups-widget.c:403
msgid "Group"
msgstr "Skupina"
+# window title
#: ../libempathy-gtk/empathy-individual-dialogs.c:118
msgid "New Contact"
msgstr "Nový kontakt"
+# kontakt %s
#: ../libempathy-gtk/empathy-individual-dialogs.c:193
#: ../libempathy-gtk/empathy-subscription-dialog.c:121
-#, c-format
+#, fuzzy, c-format
msgid "Block %s?"
msgstr "Zablokovať %s?"
#: ../libempathy-gtk/empathy-individual-dialogs.c:248
#: ../libempathy-gtk/empathy-subscription-dialog.c:125
-#, c-format
+#, fuzzy, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr ""
-"Ste si istý, že chcete zablokovať „%s“, aby vás už nemohol znovu kontaktovať?"
+"Naozaj chcete zablokovať „%s“, aby vás už nemohol znovu kontaktovať?"
#: ../libempathy-gtk/empathy-individual-dialogs.c:253
msgid "The following identity will be blocked:"
@@ -1930,12 +2298,14 @@ msgstr[0] "Nasledujúce identity sa nedajú zablokovať:"
msgstr[1] "Nasledujúca identita sa nedá zablokovať:"
msgstr[2] "Nasledujúce identity sa nedajú zablokovať:"
+# button
#: ../libempathy-gtk/empathy-individual-dialogs.c:270
#: ../libempathy-gtk/empathy-subscription-dialog.c:130
#: ../libempathy-gtk/empathy-subscription-dialog.c:275
msgid "_Block"
msgstr "Za_blokovať"
+# checkbutton
#: ../libempathy-gtk/empathy-individual-dialogs.c:279
#: ../libempathy-gtk/empathy-subscription-dialog.c:150
msgid "_Report this contact as abusive"
@@ -1944,10 +2314,12 @@ msgstr[0] "_Nahlásiť tieto kontakty ako obťažujúce"
msgstr[1] "_Nahlásiť tento kontakt ako obťažujúci"
msgstr[2] "_Nahlásiť tieto kontakty ako obťažujúce"
+# window title
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
-msgstr "Upraviť informácie o kontakte"
+msgstr "Úprava informácií o kontakte"
+# label
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
msgid "Linked Contacts"
@@ -1957,12 +2329,14 @@ msgstr "Prepojené kontakty"
msgid "gnome-contacts not installed"
msgstr "balík gnome-contacts nie je nainštalovaný"
+# PM: znie to neprirodzene dal by som Aby sa mohli zobrazovať... prosím, nainštalujte...
#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
msgid "Please install gnome-contacts to access contacts details."
msgstr ""
"Prosím, nainštalujte balík gnome-contacts pre zobrazenie podrobností o "
"kontaktoch."
+# gtk_image_menu_item
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
@@ -1971,32 +2345,41 @@ msgstr ""
msgid "%s (%s)"
msgstr "%s (%s)"
+# window title
#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr ""
+# button
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Hovor"
+# phone type
#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Mobil"
+# phone type
#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Práca"
+# PM: preÄo je to vÅ¡etko veľkými písmenami? Zaslúži si to kementár od autorov
+# phone type
#: ../libempathy-gtk/empathy-individual-menu.c:426
+#, fuzzy
msgid "HOME"
msgstr "DOMOV"
+# gtk_check_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "Za_blokovať kontakt"
+# button
#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Odstrániť a za_blokovať"
@@ -2013,10 +2396,12 @@ msgid ""
"remove all the contacts which make up this linked contact."
msgstr ""
+# dialog title
#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
-msgstr "Kontakt sa odstraňuje"
+msgstr "odstránenie kontaktu"
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
@@ -2045,43 +2430,56 @@ msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videohovor"
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "P_redchádzajúce konverzácie"
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Poslať súbor"
+# PM: zdieľať je nespisovne, myslím že tu by to šlo nahradiť napr: poskytnúť plochu alebo podeliť sa o plochu
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#, fuzzy
msgid "Share My Desktop"
msgstr "Zdieľať moju plochu"
+# vťahuje sa ku slovu kontakt
+# gtk_check_menu_item; gtk_check_button
#: ../libempathy-gtk/empathy-individual-menu.c:1461
#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Obľúbený"
+# gtk_check_menu_item;
#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "_Informácie"
+# gtk_check_menu_item;
#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Upraviť"
+# PM: Ako sa táto správa zobrazí? kde je meno toho Äo pozíva? Nie je to pokraÄovanie dajakej vety? jeto dosÅ¥ Äudné.
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
#: ../src/empathy-chat-window.c:1245
+#, fuzzy
msgid "Inviting you to this room"
msgstr "Pozýva vás do tejto miestnosti"
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Pozvať do diskusnej miestnosti"
+# gtk_image_menu_item
#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "_Pridať kontakt…"
@@ -2091,110 +2489,137 @@ msgstr "_Pridať kontakt…"
msgid "Do you really want to remove the group '%s'?"
msgstr "Naozaj chcete odstrániť skupinu „%s“?"
+# dialog title
#: ../libempathy-gtk/empathy-individual-view.c:2376
msgid "Removing group"
-msgstr "Skupina sa odstraňuje"
+msgstr "Odstránenie skupiny"
+# gtk_menu_item
#: ../libempathy-gtk/empathy-individual-view.c:2444
msgid "Re_name"
msgstr "P_remenovať"
+# label
#: ../libempathy-gtk/empathy-individual-widget.c:304
msgid "Channels:"
msgstr "Kanály:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country ISO Code:"
msgstr "ISO kód krajiny:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Country:"
msgstr "Krajina:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "State:"
msgstr "Štát:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "City:"
msgstr "Mesto:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Area:"
msgstr "Oblasť:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Postal Code:"
msgstr "PSČ:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Street:"
msgstr "Ulica:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Building:"
msgstr "Budova:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Floor:"
msgstr "Poschodie:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Room:"
msgstr "Miestnosť:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Text:"
msgstr "Text:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Description:"
msgstr "Popis:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "URI:"
msgstr "URI:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Accuracy Level:"
msgstr "Stupeň presnosti:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Error:"
msgstr "Chyba:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Vertical Error (meters):"
msgstr "Vertikálna chyba (v metroch):"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Horizontal Error (meters):"
msgstr "Horizontálna chyba (v metroch):"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Speed:"
msgstr "Rýchlosť:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Bearing:"
msgstr "Azimut:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Climb Speed:"
msgstr "Rýchlosť stúpania:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Last Updated on:"
msgstr "Posledná aktualizácia:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Longitude:"
msgstr "Zemepisná dĺžka:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Latitude:"
msgstr "Zemepisná šírka:"
+# location_key_to_label
#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "Altitude:"
msgstr "Nadmorská výška:"
@@ -2205,9 +2630,11 @@ msgstr "Nadmorská výška:"
msgid "Location"
msgstr "Poloha"
+# PM: teraz je to takto "Poloha, 18. november 2012, 23:00 UTC"
+# PM: dal by som Poloha dňa 18. november 2012 o 23:00 UTC alebo aspoň bez tej Äiarky
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
+#, fuzzy, c-format
msgid "%s, %s"
msgstr "%s, %s"
@@ -2215,11 +2642,13 @@ msgstr "%s, %s"
msgid "%B %e, %Y at %R UTC"
msgstr "%d. %B %Y, %R UTC"
+# label
#. Alias
#: ../libempathy-gtk/empathy-individual-widget.c:1304
msgid "Alias:"
msgstr "Prezývka:"
+# label
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-individual-widget.c:1513
msgid "Identifier:"
@@ -2233,10 +2662,12 @@ msgstr[0] "Prepojený kontakt obsahuje %u kontaktov"
msgstr[1] "Prepojený kontakt obsahuje %u kontakt"
msgstr[2] "Prepojený kontakt obsahuje %u kontakty"
+# GtkLabel
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
msgstr "<b>Poloha</b> dňa (dátum)"
+# GtkLabel
#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Online from a phone or mobile device"
msgstr "Prihlásený z telefónu alebo mobilného zariadenia"
@@ -2245,27 +2676,35 @@ msgstr "Prihlásený z telefónu alebo mobilného zariadenia"
msgid "New Network"
msgstr "Nová sieť"
+# window title
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
msgid "Choose an IRC network"
-msgstr "Zvoľte IRC sieť"
+msgstr "Výber siete IRC"
+# PM: neviem Äi vynulovaÅ¥ je ten správny výraz
+# button
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#, fuzzy
msgid "Reset _Networks List"
msgstr "Vynulovať zoznam _sietí"
+# button
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Vybrať"
+# niekde v nejakej tabuľke
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "nový server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+# niekde v nejakej tabuľke
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
+# label
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
@@ -2280,26 +2719,31 @@ msgstr ""
msgid "People nearby"
msgstr "Ľudia v okolí"
+# label
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
msgid ""
"You can change these details later or disable this feature by choosing <span "
"style=\"italic\">Edit → Accounts</span> in the Contact List."
msgstr ""
+# window title
#: ../libempathy-gtk/empathy-log-window.c:622
msgid "History"
msgstr "História"
+# label
#: ../libempathy-gtk/empathy-log-window.c:677
msgid "Show"
msgstr "Zobraziť"
+# label
#: ../libempathy-gtk/empathy-log-window.c:699
msgid "Search"
msgstr "Hľadať"
+# PM: v miestnosti %s
#: ../libempathy-gtk/empathy-log-window.c:1150
-#, c-format
+#, fuzzy, c-format
msgid "Chat in %s"
msgstr "Rozhovor v %s"
@@ -2314,9 +2758,10 @@ msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e. %B %Y"
+# PM: Bude to tu dobre takto vyzeraÅ¥? Daj sem prosím niekoľko príkladov ako to bude vyzeraÅ¥ v slovenÄine.
#. Translators: this is an emote: '* Danielle waves'
#: ../libempathy-gtk/empathy-log-window.c:1289
-#, c-format
+#, fuzzy, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
@@ -2411,60 +2856,75 @@ msgstr "ÄŒo"
#: ../libempathy-gtk/empathy-log-window.c:3755
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr ""
-"Ste si istý, že chcete odstrániť všetky záznamy predchádzajúcich konverzácií?"
+"Naozaj chcete odstrániť všetky záznamy predchádzajúcich konverzácií?"
+# button
#: ../libempathy-gtk/empathy-log-window.c:3759
msgid "Clear All"
msgstr "Vymazať všetko"
+# label
# nazov uctu alebo vsetky ucty
#: ../libempathy-gtk/empathy-log-window.c:3766
msgid "Delete from:"
msgstr "Odstrániť z:"
+# GtkMenuItem
#: ../libempathy-gtk/empathy-log-window.ui.h:1
msgid "_File"
msgstr "_Súbor"
+# GtkMenuItem
#: ../libempathy-gtk/empathy-log-window.ui.h:2
#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
msgid "_Edit"
msgstr "_Upraviť"
+# GtkMenuItem Edit
#: ../libempathy-gtk/empathy-log-window.ui.h:3
msgid "Delete All History..."
msgstr "Odstrániť celú históriu..."
+# GtkToolButton label
#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "Profile"
msgstr "Profil"
+# GtkToolButton label
#: ../libempathy-gtk/empathy-log-window.ui.h:5
#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Rozhovor"
+# PM: tu by sa podľa mňa viac hodil Videohovor
+# GtkToolButton label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
#: ../src/empathy-call-window.ui.h:26
+#, fuzzy
msgid "Video"
msgstr "Video"
+# tab
#: ../libempathy-gtk/empathy-log-window.ui.h:8
msgid "page 2"
msgstr "strana 2"
+# GtkLabel
#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "<span size=\"x-large\">Loading...</span>"
msgstr "<span size=\"x-large\">NaÄítava sa...</span>"
+# label
#: ../libempathy-gtk/empathy-new-account-dialog.c:129
msgid "What kind of chat account do you have?"
msgstr "Aký typ úÄtu máte?"
+# window title
#: ../libempathy-gtk/empathy-new-account-dialog.c:151
msgid "Adding new account"
-msgstr "Pridáva sa nový úÄet"
+msgstr "Pridanie nového úÄtu"
+# label
#: ../libempathy-gtk/empathy-new-call-dialog.c:199
#: ../libempathy-gtk/empathy-new-message-dialog.c:289
msgid "Enter a contact identifier or phone number:"
@@ -2480,47 +2940,58 @@ msgstr "_Videohovor"
msgid "_Audio Call"
msgstr "_Hlasový hovor"
+# window title
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "New Call"
msgstr "Nový hovor"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:82
msgid "The contact is offline"
msgstr "Kontakt je odhlásený"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:84
msgid "The specified contact is either invalid or unknown"
msgstr "Zvolený kontakt je buÄ neplatný alebo neznámy"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:86
msgid "The contact does not support this kind of conversation"
msgstr "Kontakt nie je podporovaný pri tomto type konverzácie"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:88
msgid "The requested functionality is not implemented for this protocol"
msgstr "Požadovaná funkcia nie je zahrnutá v tomto protokole"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:94
msgid "Could not start a conversation with the given contact"
msgstr "Nepodarilo sa zaÄaÅ¥ konverzáciu s daným kontaktom"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:96
msgid "You are banned from this channel"
msgstr "Ste zablokovaný v tomto kanáli"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:98
msgid "This channel is full"
msgstr "Tento kanál je plný"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:100
msgid "You must be invited to join this channel"
msgstr "Boli ste pozvaný na vstup do tohto kanálu"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:102
msgid "Can't proceed while disconnected"
msgstr "Pre pokraÄovanie sa musíte pripojiÅ¥"
+# error message
#: ../libempathy-gtk/empathy-new-message-dialog.c:104
msgid "Permission denied"
msgstr "Prístup zamietnutý"
@@ -2529,11 +3000,13 @@ msgstr "Prístup zamietnutý"
msgid "There was an error starting the conversation"
msgstr "PoÄas vytvárania konverzácie nastala chyba."
+# window title
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-message-dialog.c:332
msgid "New Conversation"
msgstr "Nová konverzácia"
+# PM: tieto kometáre zrejme nepatria k tejto položke
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
@@ -2542,6 +3015,7 @@ msgstr "Nová konverzácia"
#. COL_TYPE
#: ../libempathy-gtk/empathy-presence-chooser.c:164
#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#, fuzzy
msgid "Custom Message…"
msgstr "Vlastná správa…"
@@ -2550,14 +3024,17 @@ msgstr "Vlastná správa…"
msgid "Edit Custom Messages…"
msgstr "Upraviť vlastné správy…"
+# tooltip
#: ../libempathy-gtk/empathy-presence-chooser.c:341
msgid "Click to remove this status as a favorite"
msgstr "Kliknutím odstránite tento stav z obľúbených"
+# tooltip
#: ../libempathy-gtk/empathy-presence-chooser.c:350
msgid "Click to make this status a favorite"
msgstr "Kliknutím nastavíte tento stav ako obľúbený"
+# tooltip
#. Translators: %s is a status message like 'At the pub' for example
#: ../libempathy-gtk/empathy-presence-chooser.c:384
#, c-format
@@ -2569,10 +3046,12 @@ msgstr ""
"<small><i>Ak chcete nastaviÅ¥ novú správu stlaÄte Enter, pre zruÅ¡enie stlaÄte "
"Esc.</i></small>"
+# tooltip
#: ../libempathy-gtk/empathy-presence-chooser.c:393
msgid "Set status"
-msgstr "Nastaviť stav"
+msgstr "Nastavte stav"
+# gtk_image_menu_item
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1101
msgid "Custom messages…"
@@ -2587,102 +3066,123 @@ msgstr "Vlastné správy…"
msgid "New %s account"
msgstr "Nový úÄet %s"
+# gtk_check_menu_item
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "_Rozlišovať veľkosť"
+# GtkLabel
#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find:"
msgstr "Nájsť:"
+# GtkToolButton
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "_Previous"
msgstr "_Predchádzajúca"
+# GtkToolButton
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "_Next"
msgstr "Ďa_lšia"
# musi byt kratke
+# GtkCheckButton
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Mat_ch case"
msgstr "_Rozlišovať veľkosť"
+# GtkLabel
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Fráza sa nenašla"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Prijatá okamžitá správa"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Odoslaná okamžitá správa"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Prichádzajúca žiadosť o rozhovor"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Kontakt sa pripojil"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Kontakt sa odpojil"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Pripojenie k serveru"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Odpojenie od servera"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Prichádzajúci hovor"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Odchádzajúci hovor"
+# sound_entries
#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Hlasový hovor bol ukonÄený"
+# window title
#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
-msgstr "Upraviť vlastné správy"
+msgstr "Úprava vlastných správ"
+# window title
#: ../libempathy-gtk/empathy-subscription-dialog.c:234
msgid "Subscription Request"
msgstr "Žiadosť o zapísanie"
+# PM: kontakt %s
#: ../libempathy-gtk/empathy-subscription-dialog.c:240
#: ../src/empathy-event-manager.c:1104
-#, c-format
+#, fuzzy, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s by rád videl, kedy ste prihlásený"
+# button
#: ../libempathy-gtk/empathy-subscription-dialog.c:281
#: ../src/empathy-event-manager.c:729
msgid "_Decline"
msgstr "_Odmietnuť"
+# button
#: ../libempathy-gtk/empathy-subscription-dialog.c:282
msgid "_Accept"
msgstr "_Prijať"
# %s je cas vo formate "%H:%M:%S"
+# tooltip
#: ../libempathy-gtk/empathy-theme-adium.c:1125
#, c-format
msgid "Message edited at %s"
msgstr "Správa upravená o %s"
-# Varianta:
-# PÅ : keÄ už, tak "variant"... rod upravený
+# Variant:
#: ../libempathy-gtk/empathy-theme-adium.c:1841
msgid "Normal"
msgstr "Normálny"
@@ -2691,43 +3191,59 @@ msgstr "Normálny"
msgid "The identity provided by the chat server cannot be verified."
msgstr "Identita poskytnutá serverom pre rozhovory sa nedá overiť."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:157
msgid "The certificate is not signed by a Certification Authority."
msgstr "Certifikát nie je podpísaný certifikaÄnou autoritou."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:161
msgid "The certificate has expired."
msgstr "Certifikátu vypršala platnosť."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:164
msgid "The certificate hasn't yet been activated."
msgstr "Certifikát nie je aktivovaný."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:167
msgid "The certificate does not have the expected fingerprint."
msgstr "Certifikát nemá oÄakávaný odtlaÄok."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:170
msgid "The hostname verified by the certificate doesn't match the server name."
msgstr "Názov hostitela overený certifikátom sa nezhoduje s názvom servera."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:174
msgid "The certificate is self-signed."
msgstr "Certifikát je podpísaný sám sebou."
+# PM: v inom module je revoked preložené inak, skú to pohľadať
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
msgstr "Certifikát bol zneplatnený certifikaÄnou autoritou."
+# PM: chýba preklad cryptographically
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
msgid "The certificate is cryptographically weak."
msgstr "Certifikát je slabý."
+# PM: hranice overiteľnosti
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
msgid "The certificate length exceeds verifiable limits."
msgstr "Dĺžka certifikátu presahuje overiteľnú hranicu."
+# reason
#: ../libempathy-gtk/empathy-tls-dialog.c:188
msgid "The certificate is malformed."
msgstr "Certifikát je poškodený."
@@ -2742,10 +3258,12 @@ msgstr "OÄakávaný názov hostiteľa: %s"
msgid "Certificate hostname: %s"
msgstr "Názov hostiteľa certifikátu: %s"
+# button
#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "C_ontinue"
msgstr "P_okraÄovaÅ¥"
+# dialog title
#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "Untrusted connection"
msgstr "Nedôveryhodné spojenie"
@@ -2754,10 +3272,12 @@ msgstr "Nedôveryhodné spojenie"
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Toto spojenie je nedôveryhodné. Želáte si napriek tomu pokraÄovaÅ¥?"
+# checkbox
#: ../libempathy-gtk/empathy-tls-dialog.c:298
msgid "Remember this choice for future connections"
msgstr "Zapamätať si túto voľbu pre budúce spojenia"
+# expander
#: ../libempathy-gtk/empathy-tls-dialog.c:304
msgid "Certificate Details"
msgstr "Podrobnosti certifikátu"
@@ -2766,16 +3286,18 @@ msgstr "Podrobnosti certifikátu"
msgid "Unable to open URI"
msgstr "Nie je možné otvoriť URI"
+# filechooser dialog title
#: ../libempathy-gtk/empathy-ui-utils.c:1174
msgid "Select a file"
-msgstr "Vyberte súbor"
+msgstr "Výber súboru"
#: ../libempathy-gtk/empathy-ui-utils.c:1248
msgid "Insufficient free space to save file"
msgstr "Nedostatok voľného miesta na uloženie súboru"
+# PM: akým spôsobom sa zobrazí %s? Nebude lepšie %s voľného miesta ale dostupných (vzťahuje sa k bajtom) je len %s?
#: ../libempathy-gtk/empathy-ui-utils.c:1256
-#, c-format
+#, fuzzy, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
@@ -2783,15 +3305,20 @@ msgstr ""
"Na uloženie tohto súboru je vyžadované voľné miesto %s, ale dostupné je len "
"%s. Prosím, zvoľte iné umiestnenie."
+# PM: kontaktu %s
#: ../libempathy-gtk/empathy-ui-utils.c:1302
-#, c-format
+#, fuzzy, c-format
msgid "Incoming file from %s"
msgstr "Prichádzajúci súbor od %s"
+# PM: Zmenil by som slovosled Aby ste ... musíte byť prihlásený - aj inde to tak máš
+# label
#: ../libempathy-gtk/empathy-user-info.c:384
+#, fuzzy
msgid "Go online to edit your personal information."
msgstr "Prihláste sa aby ste mohli upraviť vaše osobné údaje."
+# label
#: ../libempathy-gtk/empathy-user-info.c:464
msgid "<b>Personal Details</b>"
msgstr "<b>Osobné údaje</b>"
@@ -2806,6 +3333,7 @@ msgstr "_Kopírovať adresu odkazu"
msgid "_Open Link"
msgstr "_Otvoriť odkaz"
+# PM: podľa dohody v ML treba zmeniť
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Aktuálne miestne nastavenia"
@@ -2974,7 +3502,9 @@ msgstr "Západné"
msgid "Vietnamese"
msgstr "Vietnamské"
+# PM: Obľúbené kontakty alebo Naj kontakty
#: ../libempathy-gtk/empathy-roster-model.h:29
+#, fuzzy
msgid "Top Contacts"
msgstr "Top kontakty"
@@ -2998,8 +3528,8 @@ msgid ""
"version."
msgstr ""
"Empathy je slobodný softvér. Môžete ho Äalej šíriÅ¥ a/alebo upravovaÅ¥ podľa "
-"ustanovení Všeobecnej verejnej licencie GNU tak, ako bola vydaná "
-"organizáciou Free Software Foundation, a to buÄ verzie 2 tejto licencie, "
+"ustanovení licencie GNU General Public Licence (Všeobecná zverejňovacia licencia GNU),"
+"vydávanej nadáciou Free Software Foundation, a to buÄ podľa 2. verzie tejto licencie, "
"alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie."
#: ../src/empathy-about-dialog.c:85
@@ -3011,8 +3541,7 @@ msgid ""
msgstr ""
"Program Empathy je rozÅ¡irovaný v nádeji, že bude užitoÄný, avÅ¡ak BEZ "
"AKEJKOĽVEK ZÃRUKY. Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI "
-"alebo VHODNOSTI NA URČITà ÚČEL. Ďalšie podrobnosti hľadajte vo Všeobecnej "
-"verejnej licencii GNU."
+"alebo VHODNOSTI NA URČITà ÚČEL. Ďalšie podrobnosti hľadajte v vlicencii General Public License."
#: ../src/empathy-about-dialog.c:89
msgid ""
@@ -3020,7 +3549,7 @@ msgid ""
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr ""
-"Kópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s programom "
+"Kópiu licencie General Public License ste mali dostať spolu s programom "
"Totem. Ak sa tak nestalo, napíšte na adresu Free Software Foundation, Inc., "
"51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
@@ -3034,30 +3563,38 @@ msgstr ""
"Miroslav Biňas <mirek@host.sk>\n"
"Pavol KlaÄanský <pavol@klacansky.com>"
+# cmd desc
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
-"NezobrazovaÅ¥ žiadne dialógové okná; urobiÅ¥ nejakú ÄinnosÅ¥ (napr. "
-"importovanie) a skonÄiÅ¥"
+"Nezobrazí žiadne dialógové okná; urobí nejakú ÄinnosÅ¥ (napr. "
+"importovanie) a skonÄí"
+# cmd desc
#: ../src/empathy-accounts.c:186
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
+# cmd desc
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
+# cmd desc
#: ../src/empathy-accounts.c:192
+#, fuzzy
msgid "<account-id>"
msgstr "<account-id>"
+# PM: úÄty pre Empathy
+# g_option_context
#: ../src/empathy-accounts.c:197
+#, fuzzy
msgid "- Empathy Accounts"
msgstr "- úÄty Empathy"
+# application_name
#: ../src/empathy-accounts.c:240
msgid "Empathy Accounts"
msgstr "Empathy - úÄty"
@@ -3075,28 +3612,36 @@ msgstr "Vo vaÅ¡om úÄte %s máte neuložené zmeny."
msgid "Your new account has not been saved yet."
msgstr "Váš nový úÄet eÅ¡te nebol uložený."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+# status infobar message
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "Pripája sa…"
+# status infobar message
#: ../src/empathy-accounts-dialog.c:445
#, c-format
msgid "Offline — %s"
msgstr "Odhlásený — %s"
+# status infobar message
#: ../src/empathy-accounts-dialog.c:457
#, c-format
msgid "Disconnected — %s"
msgstr "Odpojený — %s"
+# PM: bez sieťového pripojenia
+# status infobar message
#: ../src/empathy-accounts-dialog.c:468
+#, fuzzy
msgid "Offline — No Network Connection"
msgstr "Odhlásený — Žiadne sieťové pripojenie"
+# status infobar message
#: ../src/empathy-accounts-dialog.c:475
msgid "Unknown Status"
msgstr "Neznámy stav"
+# status infobar message
#: ../src/empathy-accounts-dialog.c:492
msgid ""
"This account has been disabled because it relies on an old, unsupported "
@@ -3104,28 +3649,34 @@ msgid ""
"the account."
msgstr ""
+# PM: nebude lepÅ¡ie Zablokovaný úÄet?
+# status infobar message
#: ../src/empathy-accounts-dialog.c:502
+#, fuzzy
msgid "Offline — Account Disabled"
msgstr "Odhlásený — ÚÄet zablokovaný"
+# window title
#: ../src/empathy-accounts-dialog.c:608
msgid "Edit Connection Parameters"
-msgstr "Upraviť parametre pripojenia"
+msgstr "Úprava parametrov pripojenia"
-#: ../src/empathy-accounts-dialog.c:733
+# button
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Upraviť parametre pripojenia..."
-#: ../src/empathy-accounts-dialog.c:1266
-#, c-format
+# úÄet %s
+#: ../src/empathy-accounts-dialog.c:1268
+#, fuzzy, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Naozaj chcete odstrániÅ¥ %s z vášho poÄítaÄa?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Toto neodstráni váš úÄet na serveri."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3134,24 +3685,26 @@ msgstr ""
"Naozaj chcete pokraÄovaÅ¥?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Povolený"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Premenovať"
-#: ../src/empathy-accounts-dialog.c:2105
+# button
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_PreskoÄiÅ¥"
-#: ../src/empathy-accounts-dialog.c:2109
+# button
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "P_ripojiť"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3159,49 +3712,66 @@ msgstr ""
"Chystáte sa zatvoriÅ¥ okno, Äím zrušíte vaÅ¡e zmeny.\n"
"Naozaj chcete pokraÄovaÅ¥?"
+# window title
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
-msgstr "Rozhovory a VoIP úÄty"
+msgstr "Rozhovory a úÄty VoIP"
+# GtkButton
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "_Import…"
msgstr "_Importovať…"
+# GtkLabel
#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Loading account information"
msgstr "NaÄítavajú sa informácie o úÄte"
+# GtkLabel
#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr ""
-"Aby ste mohli pridaÅ¥ nový úÄet, musíte najprv nainÅ¡talovaÅ¥ podporu pre každý "
+"Aby ste mohli pridaÅ¥ nový úÄet, musíte najprv nainÅ¡talovaÅ¥ obslužný program pre každý "
"protokol, ktorý chcete použiť."
+# GtkLabel
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol backends installed"
-msgstr "Žiadna implementácia protokolu nie je nainštalovaná"
+msgstr "Žiadny obslužný program protokolu nie je nainštalovaný"
+# PM: toto je popis príkazu nie názov programu
+# PM: Klient Empathy pre overenie totožnosti
+# g_option_context
#: ../src/empathy-auth-client.c:296
+#, fuzzy
msgid " - Empathy authentication client"
-msgstr "- Empathy - overenie totožnosti"
+msgstr "- overenie totožnosti Empathy"
+# application_name
#: ../src/empathy-auth-client.c:312
msgid "Empathy authentication client"
msgstr "Empathy - klient overenia totožnosti"
+# cmd desc
#: ../src/empathy.c:427
+#, fuzzy
msgid "Don't connect on startup"
msgstr "Nepripájať sa po spustení"
+# cmd desc
#: ../src/empathy.c:431
+#, fuzzy
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
"Nezobrazovať zoznam kontaktov alebo akékoľvek iné dialógové okno pri spustení"
+# PM: klient Empathy pre rýchle správy
+# g_option_context
#: ../src/empathy.c:447
+#, fuzzy
msgid "- Empathy IM Client"
msgstr "- Komunikátor Empathy"
@@ -3222,11 +3792,23 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:195
+# Správa pre dbus potlaÄenie spánku
+#: ../src/empathy-call.c:124
+#, fuzzy
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "Prichádzajúci hovor"
+
+# PM: klient Empathy pre zvukový hovor a videohovor
+# g_option_context
+#: ../src/empathy-call.c:224
+#, fuzzy
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy - klient pre zvuk a video"
-#: ../src/empathy-call.c:219
+# application_name
+#: ../src/empathy-call.c:248
+#, fuzzy
msgid "Empathy Audio/Video Client"
msgstr "Empathy - klient pre zvuk a video"
@@ -3237,32 +3819,34 @@ msgstr "Kontakt %s sa vám pokúšal dovolať, ale mali ste iný hovor."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Prichádzajúci hovor"
-#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:913
-#, c-format
+# PM: kontaktu %s
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
+#, fuzzy, c-format
msgid "Incoming video call from %s"
msgstr "Prichádzajúci videohovor od %s"
-#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
-#, c-format
+#, fuzzy, c-format
msgid "Incoming call from %s"
msgstr "Prichádzajúci hovor od %s"
-#: ../src/empathy-call-window.c:1552
+# button
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Odmietnuť"
-# PÅ : buÄ jednotný
-#: ../src/empathy-call-window.c:1553
+# button
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3270,63 +3854,76 @@ msgstr "Prijať"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1920
-#, c-format
+#: ../src/empathy-call-window.c:1927
+#, fuzzy, c-format
msgid "Call with %s"
msgstr "Hovor s %s"
-#: ../src/empathy-call-window.c:2172
+# candidate_type
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr ""
-#: ../src/empathy-call-window.c:2174
+# candidate_type
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr ""
-#: ../src/empathy-call-window.c:2176
+# candidate_type
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr ""
-#: ../src/empathy-call-window.c:2178
+# candidate_type
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr ""
-#: ../src/empathy-call-window.c:2180
+# candidate_type
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr ""
-# * https://bugzilla.gnome.org/show_bug.cgi?id=646131
-#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584
+# kodek
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Neznámy"
-#: ../src/empathy-call-window.c:2933
+# PM: Äakajúci? podržaný?
+# status
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr ""
-#: ../src/empathy-call-window.c:2937
+# status
+#: ../src/empathy-call-window.c:2963
+#, fuzzy
msgid "Mute"
msgstr "Stlmiť"
-#: ../src/empathy-call-window.c:2939
+# status
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "Trvanie"
# PÅ : som za "%d min %d s"
+# PM: aj ja
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2942
-#, c-format
+#: ../src/empathy-call-window.c:2968
+#, fuzzy, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:3038
+# expander
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
-msgstr "Technické údaje"
+msgstr "Technické podrobnosti"
-#: ../src/empathy-call-window.c:3077
-#, c-format
+# PM: všade inde kontaktu %s
+#: ../src/empathy-call-window.c:3103
+#, fuzzy, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
@@ -3334,8 +3931,8 @@ msgstr ""
"Softvér používateľa %s nepodporuje žiaden z audio formátov podporovaných vo "
"vaÅ¡om poÄítaÄi"
-#: ../src/empathy-call-window.c:3082
-#, c-format
+#: ../src/empathy-call-window.c:3108
+#, fuzzy, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
@@ -3343,8 +3940,9 @@ msgstr ""
"Softvér používateľa %s nepodporuje žiaden z video formátov podporovaných vo "
"vaÅ¡om poÄítaÄi"
-#: ../src/empathy-call-window.c:3088
-#, c-format
+# PM: s kontaktom %s
+#: ../src/empathy-call-window.c:3114
+#, fuzzy, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
@@ -3352,23 +3950,23 @@ msgstr ""
"Spojenie s %s sa nedá nadviazať. Jeden z vás môže byť v sieti, ktorá "
"neumožňuje priame pripojenie."
-#: ../src/empathy-call-window.c:3094
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "Došlo k výpadku v sieti"
-#: ../src/empathy-call-window.c:3098
+#: ../src/empathy-call-window.c:3124
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Audio formáty potrebné pre tento hovor nie sú nainÅ¡talované vo vaÅ¡om poÄítaÄi"
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-call-window.c:3127
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Video formáty potrebné pre tento hovor nie sú nainÅ¡talované vo vaÅ¡om poÄítaÄi"
-#: ../src/empathy-call-window.c:3113
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3379,174 +3977,209 @@ msgstr ""
"prosím, túto chybu</a> a pripojte k nej záznamy získané z okna 'Ladenie' z "
"ponuky Pomocník."
-#: ../src/empathy-call-window.c:3122
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "DoÅ¡lo k výpadku súÄasti pre volanie"
-#: ../src/empathy-call-window.c:3125
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "Bol dosiahnutý koniec streamu"
-#: ../src/empathy-call-window.c:3165
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "Audio spojenie sa nedá nadviazať"
-#: ../src/empathy-call-window.c:3175
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "Video spojenie sa nedá nadviazať"
-#: ../src/empathy-call-window.c:3212
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "Váš aktuálny kredit je %s."
-#: ../src/empathy-call-window.c:3216
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "PrepáÄte, nemáte dostatok kreditu na tento hovor."
-#: ../src/empathy-call-window.c:3218
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "Dobiť"
+# GtkAction
#: ../src/empathy-call-window.ui.h:1
msgid "_Call"
msgstr "Za_volať"
+# GtkAction
#: ../src/empathy-call-window.ui.h:3
msgid "_Microphone"
msgstr "_Mikrofón"
+# GtkAction
#: ../src/empathy-call-window.ui.h:4
msgid "_Camera"
msgstr "_Kamera"
+# GtkAction
#: ../src/empathy-call-window.ui.h:5
msgid "_Settings"
msgstr "Nas_tavenia"
+# GtkAction
#: ../src/empathy-call-window.ui.h:6
msgid "_View"
msgstr "_Zobraziť"
+# GtkAction
#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
msgid "_Help"
msgstr "_Pomocník"
+# GtkAction
#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
msgid "_Contents"
msgstr "Ob_sah"
+# GtkAction
#: ../src/empathy-call-window.ui.h:9
msgid "_Debug"
msgstr "_Ladiť"
+# GtkAction
#: ../src/empathy-call-window.ui.h:10
msgid "_GStreamer"
msgstr ""
+# GtkAction
#: ../src/empathy-call-window.ui.h:11
msgid "_Telepathy"
msgstr ""
+# GtkAction
#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr ""
+# GtkAction
#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr ""
+# GtkAction
#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr ""
+# GtkAction
#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "Zakázať kameru"
+# GtkToolButton
#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Položiť"
+# tooltip
#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
-msgstr "Položiť aktuálny hovor"
+msgstr "Položí aktuálny hovor"
+# GtkToolButton
#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Videohovor"
+# tooltip
#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
-msgstr "ZaÄaÅ¥ videohovor"
+msgstr "ZaÄne videohovor"
+# tooltip
#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
-msgstr "ZaÄaÅ¥ hlasový hovor"
+msgstr "ZaÄne hlasový hovor"
+# GtkToggleToolButton
#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "ZobraziÅ¥ Äíselník"
+# tooltip
#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
-msgstr "ZobraziÅ¥ Äíselník"
+msgstr "Zobrazí Äíselník"
+# tooltip
#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
-msgstr "Prepnúť prenos videa"
+msgstr "Prepne prenos videa"
+# tooltip
#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
-msgstr "Prepnúť prenos zvuku"
+msgstr "Prepnr prenos zvuku"
+# GtkLabel
#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr ""
+# GtkLabel
#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr ""
+# GtkLabel
#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr ""
+# GtkLabel
#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr ""
-# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
+# GtkLabel
#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Zvuk"
+# PM: klient Empathy pre rozhovor
+# g_option_context
#: ../src/empathy-chat.c:102
+#, fuzzy
msgid "- Empathy Chat Client"
msgstr "- Komunikátor Empathy"
+# gtk_tree_view_column
#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Názov"
+# gtk_tree_view_column
#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Miestnosť"
+# gtk_tree_view_column
#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Pripojiť sa automaticky"
+# GtkWindow title
#: ../src/empathy-chatrooms-window.ui.h:1
msgid "Manage Favorite Rooms"
-msgstr "Spravovať obľúbené miestnosti"
+msgstr "Správa obľúbených miestností"
#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Zavrieť toto okno?"
+# diskusnú miestnosť %s
#: ../src/empathy-chat-window.c:293
-#, c-format
+#, fuzzy, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
"until you rejoin it."
@@ -3573,7 +4206,7 @@ msgstr[2] ""
"žiadne ÄalÅ¡ie správy pokým do nich znovu nevstúpite."
#: ../src/empathy-chat-window.c:317
-#, c-format
+#, fuzzy, c-format
msgid "Leave %s?"
msgstr "Opustiť %s?"
@@ -3585,10 +4218,12 @@ msgstr ""
"Nebudete dostávaÅ¥ žiadne ÄalÅ¡ie správy z tejto diskusnej miestnosti pokým do "
"nej znovu nevstúpite."
+# button
#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Zavrieť okno"
+# button
#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Opustiť miestnosť"
@@ -3601,16 +4236,18 @@ msgstr[0] "%s (%d nepreÄítaných)"
msgstr[1] "%s (%d nepreÄítaná)"
msgstr[2] "%s (%d nepreÄítané)"
+# PM: %u je poÄet otvorených kariet nie sú to ľudia
#: ../src/empathy-chat-window.c:692
-#, c-format
+#, fuzzy, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (a %u ostatných)"
msgstr[1] "%s (a %u ostatný)"
msgstr[2] "%s (a %u ostatní)"
+# PM: myslia sa karty takže "na" alebo "v" nie "od"
#: ../src/empathy-chat-window.c:708
-#, c-format
+#, fuzzy, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d nepreÄítaných od iných)"
@@ -3618,17 +4255,19 @@ msgstr[1] "%s (%d nepreÄítaná od iných)"
msgstr[2] "%s (%d nepreÄítané od iných)"
#: ../src/empathy-chat-window.c:717
-#, c-format
+#, fuzzy, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d nepreÄítaných od vÅ¡etkých)"
msgstr[1] "%s (%d nepreÄítaná od vÅ¡etkých)"
msgstr[2] "%s (%d nepreÄítané od vÅ¡etkých)"
+# tooltip
#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
+# tooltip
#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
@@ -3637,79 +4276,98 @@ msgstr[0] "Posiela sa %d správ"
msgstr[1] "Posiela sa %d správa"
msgstr[2] "Posielajú sa %d správy"
+# tooltip
#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Píše správu."
+# GtkAction
#: ../src/empathy-chat-window.ui.h:1
msgid "_Conversation"
msgstr "_Konverzácia"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:2
msgid "C_lear"
msgstr "Vy_mazať"
# http://live.gnome.org/SlovakTranslation/Others/JULS
+# GtkAction
#: ../src/empathy-chat-window.ui.h:3
msgid "Insert _Smiley"
msgstr "Vložiť _smejka"
+# GtkToggleAction
#: ../src/empathy-chat-window.ui.h:4
msgid "_Favorite Chat Room"
msgstr "_Obľúbené diskusné miestnosti"
+# GtkToggleAction
#: ../src/empathy-chat-window.ui.h:5
msgid "Notify for All Messages"
msgstr "Upozorniť na všetky správy"
+# GtkToggleAction
#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "_Show Contact List"
msgstr "_Zobraziť zoznam kontaktov"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:7
msgid "Invite _Participant…"
msgstr "_PozvaÅ¥ úÄastníka…"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:8
msgid "C_ontact"
msgstr "_Kontakt"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:10
msgid "_Tabs"
msgstr "_Karty"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:11
msgid "_Previous Tab"
msgstr "_Predchádzajúca karta"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:12
msgid "_Next Tab"
msgstr "Ďalšia _karta"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:13
msgid "_Undo Close Tab"
msgstr "_Vrátiť spať zatvorenú kartu"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:14
msgid "Move Tab _Left"
msgstr "Presunúť kartu _vľavo"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:15
msgid "Move Tab _Right"
msgstr "Presunúť kartu vp_ravo"
+# GtkAction
#: ../src/empathy-chat-window.ui.h:16
msgid "_Detach Tab"
msgstr "_Oddeliť kartu"
+# cmd desc
#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
-msgstr "ZobraziÅ¥ urÄitú službu"
+msgstr "Zobrazí urÄitú službu"
+# g_option_context
#: ../src/empathy-debugger.c:74
msgid "- Empathy Debugger"
msgstr "- OdlaÄovaÄ Empathy"
+# application_name
#: ../src/empathy-debugger.c:113
msgid "Empathy Debugger"
msgstr "OdlaÄovaÄ Empathy"
@@ -3729,72 +4387,86 @@ msgstr "OdpoveÄ z pastebin"
#: ../src/empathy-debug-window.c:1675
msgid "Data too large for a single paste. Please save logs to file."
msgstr ""
-"Údaje sú príliš veľké aby boli poslané naraz. Prosím, uložte záznamy do "
+"Údaje sú príliš veľké, aby boli poslané naraz. Prosím, uložte záznamy do "
"súboru."
+# window title
#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Okno ladenia"
+# gtk_tool_button
#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Poslať na pastebin"
+# gtk_tool_button
#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pozastaviť"
+# label
#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Úroveň"
+# gtk_list_store
#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Ladenie"
+# gtk_list_store
#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Informácie"
+# gtk_list_store
#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Správa"
+# gtk_list_store
#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Upozornenie"
+# gtk_list_store
#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Kritická"
+# gtk_list_store
#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Chyba"
#: ../src/empathy-debug-window.c:2030
msgid ""
-"Even if they don't display passwords, logs can contain sensible information "
+"Even if they don't display passwords, logs can contain sensitive information "
"such as your list of contacts or the messages you recently sent or "
"received.\n"
"If you don't want to see such information available in a public bug report, "
-"you can choose to limit the visibility of your bug to Empathy developpers "
+"you can choose to limit the visibility of your bug to Empathy developers "
"when reporting it by displaying the advanced fields in the <a href=\"https://"
"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
msgstr ""
+# gtk_tree_view
#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "ÄŒas"
+# gtk_tree_view
#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Doména"
+# gtk_tree_view
#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategória"
+# gtk_tree_view
#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Úroveň"
@@ -3813,22 +4485,26 @@ msgstr "Prichádzajúci videohovor"
#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s vám volá. Chcete prijať tento videohovor?"
+msgstr "%s vám volá. Chcete prijať videohovor?"
#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
-msgstr "%s vám volá. Chcete hovor prijať?"
+msgstr "%s vám volá. Chcete prijať hovor?"
+# button
#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "_Odmietnuť"
+# button
#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
msgid "_Answer"
msgstr "_Prijať"
+# PM: inde prijať; Prijať a zapnúť video?
#: ../src/empathy-event-manager.c:557
+#, fuzzy
msgid "_Answer with video"
msgstr "_Odpovedať videom"
@@ -3836,36 +4512,44 @@ msgstr "_Odpovedať videom"
msgid "Room invitation"
msgstr "Pozvanie do miestnosti"
+# PM: do miestnosti %s
+# window title
#: ../src/empathy-event-manager.c:714
-#, c-format
+#, fuzzy, c-format
msgid "Invitation to join %s"
msgstr "Pozvánka na vstup do %s"
#: ../src/empathy-event-manager.c:721
-#, c-format
+#, fuzzy, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vás pozýva, aby ste vstúpili do %s"
+# button
#: ../src/empathy-event-manager.c:734
msgid "_Join"
msgstr "_Vstúpiť"
+# PM: tu aj kotntakt %s (môže to byť žena) aj do miestnosti %s
#: ../src/empathy-event-manager.c:760
-#, c-format
+#, fuzzy, c-format
msgid "%s invited you to join %s"
msgstr "%s vás pozval do %s"
+# PM: okrem do miestnosti %s to znie aj neprirodzene
#: ../src/empathy-event-manager.c:766
-#, c-format
+#, fuzzy, c-format
msgid "You have been invited to join %s"
msgstr "Boli ste pozvaný na vstup do %s"
+# PM: kontaktu %s
#: ../src/empathy-event-manager.c:945
-#, c-format
+#, fuzzy, c-format
msgid "Incoming file transfer from %s"
msgstr "Prichádzajúci prenos súboru od %s"
+# PM: vyžaduje sa tu asi bude lepšie
#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#, fuzzy
msgid "Password required"
msgstr "Vyžadované heslo"
@@ -3905,22 +4589,24 @@ msgstr "%s z %s pri %s/s"
msgid "%s of %s"
msgstr "%s z %s"
+# PM: kontaktu %s
#. translators: first %s is filename, second %s is the contact name
#: ../src/empathy-ft-manager.c:305
-#, c-format
+#, fuzzy, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Prijíma sa súbor „%s“ od %s"
+# PM: kontakt
#. translators: first %s is filename, second %s is the contact name
#: ../src/empathy-ft-manager.c:308
-#, c-format
+#, fuzzy, c-format
msgid "Sending \"%s\" to %s"
msgstr "Odosiela sa súbor „%s“ pre %s"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:338
-#, c-format
+#, fuzzy, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Chyba pri prijímaní súboru „%s“ od %s"
@@ -3929,7 +4615,7 @@ msgid "Error receiving a file"
msgstr "Chyba pri prijímaní súboru"
#: ../src/empathy-ft-manager.c:346
-#, c-format
+#, fuzzy, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Chyba pri odosielaní súboru „%s“ pre %s"
@@ -3940,14 +4626,14 @@ msgstr "Chyba pri odosielaní súboru"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:488
-#, c-format
+#, fuzzy, c-format
msgid "\"%s\" received from %s"
msgstr "Súbor „%s“ bol prijatý od %s"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:493
-#, c-format
+#, fuzzy, c-format
msgid "\"%s\" sent to %s"
msgstr "Súbor „%s“ bol odoslaný pre %s"
@@ -3959,36 +4645,43 @@ msgstr "Prenos súboru bol dokonÄený"
msgid "Waiting for the other participant's response"
msgstr "ÄŒaká sa na odpoveÄ od druhého úÄastníka"
+# PM: súboru %s
#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
-#, c-format
+#, fuzzy, c-format
msgid "Checking integrity of \"%s\""
msgstr "Kontrola integrity „%s“"
#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
-#, c-format
+#, fuzzy, c-format
msgid "Hashing \"%s\""
msgstr "Vytvára sa kontrolný súÄet „%s“"
+# gtk_tree_view
#: ../src/empathy-ft-manager.c:1025
msgid "%"
msgstr "%"
+# gtk_tree_view
#: ../src/empathy-ft-manager.c:1037
msgid "File"
msgstr "Súbor"
+# gtk_tree_view
#: ../src/empathy-ft-manager.c:1059
msgid "Remaining"
msgstr "Zostáva"
+# GtkDialog title
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
msgstr "Prenosy súborov"
+# GtkButton tooltip
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "OdstrániÅ¥ dokonÄené, zruÅ¡ené a chybné prenosy súborov zo zoznamu"
+msgstr "Odstráni dokonÄené, zruÅ¡ené a chybné prenosy súborov zo zoznamu"
+# button
#: ../src/empathy-import-dialog.c:76
msgid "_Import"
msgstr "_Importovať"
@@ -4001,48 +4694,60 @@ msgstr ""
"Žiadne úÄty na importovanie neboli nájdené. Empathy aktuálne podporuje "
"import úÄtov iba z aplikácie Pidgin."
+# window title
#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
-msgstr "ImportovaÅ¥ úÄty"
+msgstr "Import úÄtov"
+# PM: je to tu dobre ako sloveso?
+# gtk_tree_view
#. Translators: this is the header of a treeview column
#: ../src/empathy-import-widget.c:302
+#, fuzzy
msgid "Import"
msgstr "Importovať"
+# gtk_tree_view
#: ../src/empathy-import-widget.c:311
msgid "Protocol"
msgstr "Protokol"
+# gtk_tree_view
#: ../src/empathy-import-widget.c:335
msgid "Source"
msgstr "Zdroj"
+# window title
#: ../src/empathy-invite-participant-dialog.c:201
#: ../src/empathy-invite-participant-dialog.c:229
msgid "Invite Participant"
-msgstr "PozvaÅ¥ úÄastníka"
+msgstr "Pozvanie úÄastníka"
#: ../src/empathy-invite-participant-dialog.c:202
msgid "Choose a contact to invite into the conversation:"
msgstr "Vyberte kontakt, ktorý chcete pozvať do konverzácie:"
+# button
#: ../src/empathy-invite-participant-dialog.c:225
msgid "Invite"
msgstr "Pozvať"
+# gtk_tree_view
#: ../src/empathy-new-chatroom-dialog.c:194
msgid "Chat Room"
msgstr "Diskusná miestnosť"
+# gtk_tree_view
#: ../src/empathy-new-chatroom-dialog.c:209
msgid "Members"
msgstr "ÚÄastníci"
+# label
#: ../src/empathy-new-chatroom-dialog.c:410
msgid "Failed to list rooms"
msgstr "Zlyhalo vypísanie miesntostí"
+# tooltip
#: ../src/empathy-new-chatroom-dialog.c:439
#, c-format
msgid ""
@@ -4066,10 +4771,12 @@ msgstr "Ãno"
msgid "No"
msgstr "Nie"
+# window title
#: ../src/empathy-new-chatroom-dialog.c:784
msgid "Join Room"
-msgstr "Vstúpiť do miestnosti"
+msgstr "Vstup do miestnosti"
+# GtkEntry tooltip
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid ""
"Enter the room name to join here or click on one or more rooms in the list."
@@ -4077,10 +4784,12 @@ msgstr ""
"Zadajte názov miestnosti, do ktorej chcete vstúpiť, alebo kliknite na jednu "
"Äi viacero miestností v zozname."
+# GtkLabel
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Room:"
msgstr "_Miestnosť:"
+# GtkEntry tooltip_markup
#: ../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 "
@@ -4089,6 +4798,7 @@ msgstr ""
"Zadajte server, na ktorom sa miestnosť nachádza, alebo ak je miestnosť na "
"serveri aktuálneho úÄtu, ponechajte pole prázdne"
+# GtkEntry tooltip
#: ../src/empathy-new-chatroom-dialog.ui.h:4
msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
@@ -4097,31 +4807,42 @@ msgstr ""
"Zadajte server, na ktorom sa miestnosť nachádza, alebo ak je miestnosť na "
"serveri aktuálneho úÄtu, ponechajte pole prázdne"
+# GtkLabel
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "_Server:"
msgstr "_Server:"
+# PM: skôr nepodarilo/nebolo možné
+# GtkLabel
#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#, fuzzy
msgid "Couldn't load room list"
msgstr "Zoznam miestností sa nedá naÄítaÅ¥"
+# GtkLabel
#: ../src/empathy-new-chatroom-dialog.ui.h:8
msgid "Room List"
msgstr "Zoznam miestností"
+# notification action
#: ../src/empathy-notifications-approver.c:188
msgid "Respond"
msgstr "Odpovedať"
+# PM: inde answer preložené inak
+# notification action
#: ../src/empathy-notifications-approver.c:207
+#, fuzzy
msgid "Answer with video"
msgstr "Odpovedať videom"
+# notification action
#: ../src/empathy-notifications-approver.c:215
#: ../src/empathy-notifications-approver.c:225
msgid "Decline"
msgstr "Odmietnuť"
+# notification action
#: ../src/empathy-notifications-approver.c:219
#: ../src/empathy-notifications-approver.c:230
msgid "Accept"
@@ -4134,34 +4855,42 @@ msgstr "Prijať"
msgid "Provide"
msgstr "Poskytnúť"
+# sound_entries
#: ../src/empathy-preferences.c:143
msgid "Message received"
msgstr "Prijatá správa"
+# sound_entries
#: ../src/empathy-preferences.c:144
msgid "Message sent"
msgstr "Odoslaná správa"
+# sound_entries
#: ../src/empathy-preferences.c:145
msgid "New conversation"
msgstr "Nová konverzácia"
+# sound_entries
#: ../src/empathy-preferences.c:146
msgid "Contact comes online"
msgstr "Kontakt sa prihlásil"
+# sound_entries
#: ../src/empathy-preferences.c:147
msgid "Contact goes offline"
msgstr "Kontakt sa odpojil"
+# sound_entries
#: ../src/empathy-preferences.c:148
msgid "Account connected"
msgstr "ÚÄet pripojený"
+# sound_entries
#: ../src/empathy-preferences.c:149
msgid "Account disconnected"
msgstr "ÚÄet odpojený"
+# gtk_tree_view
#: ../src/empathy-preferences.c:386
msgid "Language"
msgstr "Jazyk"
@@ -4206,108 +4935,136 @@ msgstr "Mám poÄúvaÅ¥, a Äi hneÄ odvetiÅ¥?"
msgid "Juliet has disconnected"
msgstr "Kontakt Júlia sa odpojil"
+# window title
#: ../src/empathy-preferences.c:1032
msgid "Preferences"
msgstr "Nastavenia"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:2
msgid "Show groups"
msgstr "Zobraziť skupiny"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:3
msgid "Show account balances"
msgstr "ZobraziÅ¥ množstvo kreditu na úÄtoch"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "Zoznam kontaktov"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:5
msgid "Start chats in:"
msgstr "Rozhovor zaÄaÅ¥ v:"
+# GtkRadioButton
#: ../src/empathy-preferences.ui.h:6
msgid "new ta_bs"
msgstr "novej _karte"
+# GtkRadioButton
#: ../src/empathy-preferences.ui.h:7
msgid "new _windows"
msgstr "novom _okne"
# http://live.gnome.org/SlovakTranslation/Others/JULS
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:8
msgid "Show _smileys as images"
msgstr "Zobraziť _smejkov ako obrázky"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:9
msgid "Show contact _list in rooms"
msgstr "Zobraziť _zoznam kontaktov v miestnostiach"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:10
msgid "Log conversations"
msgstr "Zaznamenávať konverzácie"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:12
msgid "Display incoming events in the notification area"
msgstr "Zobraziť prichádzajúce udalosti v oblasti upozornení"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:13
msgid "_Automatically connect on startup"
msgstr "_Automaticky pripojiť po spustení"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:14
msgid "Behavior"
msgstr "Správanie"
+# tab
#: ../src/empathy-preferences.ui.h:15
msgid "General"
msgstr "Hlavné"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:16
msgid "_Enable bubble notifications"
-msgstr "_Povoliť bublinové upozornenia"
+msgstr "_Povoliť bublinové oznámenia"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:17
msgid "Disable notifications when _away or busy"
-msgstr "_ZakázaÅ¥ upozornenia v stave preÄ alebo zaneprázdnený"
+msgstr "_ZakázaÅ¥ oznámenia v stave preÄ alebo zaneprázdnený"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:18
msgid "Enable notifications when the _chat is not focused"
-msgstr "PovoliÅ¥ upozornenia, keÄ _rozhovor nie je aktívny"
+msgstr "PovoliÅ¥ oznámenia, keÄ _rozhovor nie je aktívny"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:19
msgid "Enable notifications when a contact comes online"
-msgstr "PovoliÅ¥ upozornenia, keÄ sa kontakt prihlási"
+msgstr "PovoliÅ¥ oznámenia, keÄ sa kontakt prihlási"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:20
msgid "Enable notifications when a contact goes offline"
-msgstr "PovoliÅ¥ upozornenia, keÄ sa kontakt odhlási"
+msgstr "PovoliÅ¥ oznámenia, keÄ sa kontakt odhlási"
+# tab
#: ../src/empathy-preferences.ui.h:21
msgid "Notifications"
-msgstr "Upozornenia"
+msgstr "Oznámenia"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:22
msgid "_Enable sound notifications"
-msgstr "_Povoliť zvukové upozornenia"
+msgstr "_Povoliť zvukové oznámenia"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:23
msgid "Disable sounds when _away or busy"
msgstr "_ZakázaÅ¥ zvuky v stave preÄ alebo zaneprázdnený"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:24
msgid "Play sound for events"
msgstr "Prehrať zvuk pre udalosti"
+# tab
#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Zvuky"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:26
msgid "Use _echo cancellation to improve call quality"
msgstr "_PoužiÅ¥ potlaÄenie ozveny pre zlepÅ¡enie kvality hovoru"
+# PM je to nezrozumiteľné, Pri potlaÄení ozveny vám...
+# GtkLabel
#: ../src/empathy-preferences.ui.h:27
+#, fuzzy
msgid ""
"Echo cancellation helps to make your voice sound clearer to the other "
"person, but may cause problems on some computers. If you or the other person "
@@ -4319,10 +5076,12 @@ msgstr ""
"zaznamená výpadky poÄas hovoru, skúste vypnúť potlaÄenie ozveny a "
"reštartovať hovor."
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "_Publikovať umiestnenie do mojich kontaktov"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:31
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
@@ -4330,31 +5089,40 @@ msgid ""
"decimal place."
msgstr ""
+# GtkCheckButton
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
msgid "_Reduce location accuracy"
msgstr "_ZnížiÅ¥ presnosÅ¥ urÄenia polohy"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:34
msgid "Privacy"
msgstr "Súkromie"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:35
msgid "_GPS"
msgstr "_GPS"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:36
msgid "_Cellphone"
msgstr "_Mobil"
+# GtkCheckButton
#: ../src/empathy-preferences.ui.h:37
msgid "_Network (IP, Wi-Fi)"
msgstr "_Sieť (IP, Wi-Fi)"
+# PM: asi polohy
+# GtkLabel
#: ../src/empathy-preferences.ui.h:38
+#, fuzzy
msgid "Location sources:"
msgstr "Zdroje umiestnenia:"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:40
msgid ""
"The list of languages reflects only the languages for which you have a "
@@ -4362,31 +5130,41 @@ msgid ""
msgstr ""
"Zoznam jazykov obsahuje iba tie jazyky, pre ktoré máte nainštalovaný slovník."
+# GtkLabel
#: ../src/empathy-preferences.ui.h:41
msgid "Enable spell checking for languages:"
msgstr "Povoliť kontrolu pravopisu pre jazyky:"
+# tab
#: ../src/empathy-preferences.ui.h:42
msgid "Spell Checking"
msgstr "Kontrola pravopisu"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:43
msgid "Chat Th_eme:"
msgstr "_Téma rozhovoru:"
+# GtkLabel
#: ../src/empathy-preferences.ui.h:44
msgid "Variant:"
msgstr "Variant:"
+# tab
#: ../src/empathy-preferences.ui.h:45
msgid "Themes"
msgstr "Témy"
+# PM: nemá tu byť poskytne, kde to je?
+# tooltip
#: ../src/empathy-roster-window.c:242
+#, fuzzy
msgid "Provide Password"
msgstr "Poskytnite heslo"
+# tooltip
#: ../src/empathy-roster-window.c:248
+#, fuzzy
msgid "Disconnect"
msgstr "Odpojiť"
@@ -4400,15 +5178,16 @@ msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"PrepáÄte, %s úÄty nemôžu byt používané pokým nebude aktualizovaný softvér %s."
+# service name
#: ../src/empathy-roster-window.c:617
msgid "Windows Live"
-msgstr ""
+msgstr "Windows Live"
+# service name
#: ../src/empathy-roster-window.c:621
-#, fuzzy
#| msgid "Facebook Chat"
msgid "Facebook"
-msgstr "Facebook Chat"
+msgstr "Facebook"
#. translators: %s is an account name like 'Facebook' or 'Google Talk'
#: ../src/empathy-roster-window.c:636
@@ -4416,31 +5195,37 @@ msgstr "Facebook Chat"
msgid "%s account requires authorisation"
msgstr ""
+# tooltip
#: ../src/empathy-roster-window.c:647
#, fuzzy
#| msgid "Edit Account"
msgid "Online Accounts"
msgstr "UpraviÅ¥ úÄet"
+# button
#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "Aktualizovať softvér..."
+# button
#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "Obnoviť spojenie"
+# button
#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "UpraviÅ¥ úÄet"
+# button
#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "Zatvoriť"
+# tooltip
#: ../src/empathy-roster-window.c:846
msgid "Top up account"
-msgstr "DobiÅ¥ kredit na úÄte"
+msgstr "Dobije kredit na úÄte"
#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
@@ -4464,105 +5249,131 @@ msgstr "Nenájdená žiadna zhoda"
msgid "No online contacts"
msgstr "Žiadne prihlásené kontakty"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:1
msgid "_New Conversation..."
msgstr "_Nová konverzácia..."
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:2
msgid "New _Call..."
msgstr "Nový _hovor..."
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:3
msgid "Contacts"
msgstr "Kontakty"
+# menu item Contacts
#: ../src/empathy-roster-window-menubar.ui.h:4
msgid "_Add Contacts..."
msgstr "_Pridať kontakty..."
+# menu item Contacts
#: ../src/empathy-roster-window-menubar.ui.h:5
msgid "_Search for Contacts..."
msgstr "_Hľadať kontakty..."
+# menu item Contacts
#: ../src/empathy-roster-window-menubar.ui.h:6
msgid "_Blocked Contacts"
msgstr "Za_blokované kontakty"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:7
msgid "_Rooms"
msgstr "_Miestnosti"
+# menu item Rooms
#: ../src/empathy-roster-window-menubar.ui.h:8
msgid "_Join..."
msgstr "_Vstúpiť..."
+# menu item Rooms
#: ../src/empathy-roster-window-menubar.ui.h:9
msgid "Join _Favorites"
msgstr "Vstúpiť do _obľúbených"
+# menu item Rooms
#: ../src/empathy-roster-window-menubar.ui.h:10
msgid "_Manage Favorites"
msgstr "_Spravovať obľúbené"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:12
msgid "_File Transfers"
msgstr "_Prenosy súborov"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:13
msgid "_Accounts"
msgstr "ÚÄt_y"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:14
msgid "P_references"
msgstr "Nas_tavenia"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:15
msgid "Help"
msgstr "Pomocník"
+# menu item
#: ../src/empathy-roster-window-menubar.ui.h:16
msgid "About Empathy"
msgstr "O programe Empathy"
+# GtkAction
#: ../src/empathy-roster-window-menubar.ui.h:17
#: ../src/empathy-status-icon.ui.h:5
msgid "_Quit"
msgstr "U_konÄiÅ¥"
+# GtkButton
#: ../src/empathy-roster-window.ui.h:1
msgid "Account settings"
msgstr "Nastavenia úÄtov"
+# GtkButton
#: ../src/empathy-roster-window.ui.h:2
msgid "Go _Online"
msgstr "_Prihlásiť sa"
+# GtkAction
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Nová konverzácia…"
+# GtkAction
#: ../src/empathy-status-icon.ui.h:3
msgid "New _Call…"
msgstr "N_ový hovor…"
+# GtkAction
#: ../src/empathy-status-icon.ui.h:4
msgid "Status"
msgstr "Stav"
+# button
#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
msgid "Done"
msgstr "DokonÄiÅ¥"
+# PM: asi o vaÅ¡om úÄte
#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#, fuzzy
msgid "Please enter your account details"
msgstr "Zadajte, prosím, podrobnosti vášho úÄtu"
+# PM: úÄtu pre %s
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
-#, c-format
+#, fuzzy, c-format
msgid "Edit %s account options"
msgstr "UpraviÅ¥ voľby %s úÄtu"
+# service type description
#: ../ubuntu-online-accounts/empathy.application.in.h:1
msgid "Integrate your IM accounts"
-msgstr "Integrujte vaÅ¡e úÄty pre internetovú komunikáciu"
+msgstr "Integruje vaÅ¡e úÄty pre internetovú komunikáciu"
diff --git a/po/sl.po b/po/sl.po
index f1ab9bcfe..85a877d53 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,24 +4,25 @@
#
# Bernard Banko <bernard.banko afna t-2.net>, 2009.
# Andrej ŽnidarÅ¡iÄ <andrej.znidarsic@gmail.com>, 2010.
-# Matej UrbanÄiÄ <mateju@svn.gnome.org>, 2006 - 2012.
+# Matej UrbanÄiÄ <mateju@svn.gnome.org>, 2006 - 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-27 10:33+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-01-11 12:18+0000\n"
+"PO-Revision-Date: 2013-01-12 21:31+0100\n"
"Last-Translator: Matej UrbanÄiÄ <mateju@svn.gnome.org>\n"
"Language-Team: SlovenÅ¡Äina <gnome-si@googlegroups.com>\n"
-"Language: \n"
+"Language: sl_SI\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -37,14 +38,22 @@ msgstr "Empathy hipno sporoÄanje"
#: ../data/empathy.desktop.in.in.h:4
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
+msgstr ""
+"Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih "
+"storitvah."
+
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "hipno;klepet;pogovor;sporoÄilo;irc;voip;gtalk;facebook;jabber;"
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Uporabljen naj bo upravljalnik omrežja"
#: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
#: ../data/org.gnome.Empathy.gschema.xml.h:3
@@ -60,8 +69,11 @@ msgid "Empathy should auto-away when idle"
msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje "
+"odsotnosti."
#: ../data/org.gnome.Empathy.gschema.xml.h:7
msgid "Empathy default download folder"
@@ -74,11 +86,17 @@ msgstr "Privzeta mapa za shranjevanje prejetih datotek."
#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
#: ../data/org.gnome.Empathy.gschema.xml.h:10
msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "MagiÄno Å¡tevilo, uporabljeno za preverjanje ali naj se naloge ÄiÅ¡Äenja izvedejo"
+msgstr ""
+"MagiÄno Å¡tevilo, uporabljeno za preverjanje ali naj se naloge ÄiÅ¡Äenja "
+"izvedejo"
#: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
-msgstr "Å tevilo empathy-sanity-cleaning.c preverja ali naj se naloge ÄiÅ¡Äenja izvedejo ali ne. Tega kljuÄa ni priporoÄljivo spreminjati roÄno."
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"Å tevilo empathy-sanity-cleaning.c preverja ali naj se naloge ÄiÅ¡Äenja "
+"izvedejo ali ne. Tega kljuÄa ni priporoÄljivo spreminjati roÄno."
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
@@ -126,8 +144,12 @@ msgid "Display incoming events in the status area"
msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja."
#: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru da možnost ni izbrana, bodo prikazani takoj."
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru da možnost ni "
+"izbrana, bodo prikazani takoj."
#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
@@ -198,7 +220,8 @@ msgid "Play a sound when a contact logs out"
msgstr "Predvajaj zvok ob odjavi stika"
#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
#: ../data/org.gnome.Empathy.gschema.xml.h:42
@@ -231,15 +254,20 @@ msgstr "OnemogoÄi pojavna obvestila ob odsotnosti"
#: ../data/org.gnome.Empathy.gschema.xml.h:49
msgid "Whether to show popup notifications when away or busy."
-msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
+msgstr ""
+"Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
#: ../data/org.gnome.Empathy.gschema.xml.h:50
msgid "Pop up notifications if the chat isn't focused"
msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žariÅ¡Äu."
#: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je klepetalno okno že odprto, vendar ni v žariÅ¡Äu."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je "
+"klepetalno okno že odprto, vendar ni v žariÅ¡Äu."
#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
@@ -286,32 +314,45 @@ msgid "Chat window theme variant"
msgstr "RazliÄica teme klepetalnega okna"
#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "RazliÄica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"RazliÄica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
#: ../data/org.gnome.Empathy.gschema.xml.h:64
msgid "Path of the Adium theme to use"
msgstr "Pot do želene teme Adium "
#: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
-msgstr "Pot do želene teme Adium, kadar je ta doloÄena za klepet. Možnost je opuÅ¡Äena."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Pot do želene teme Adium, kadar je ta doloÄena za klepet. Možnost je "
+"opuÅ¡Äena."
#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "OmogoÄi razvojna orodja WebKit"
#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web Inspector."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web "
+"Inspector."
#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr "Obvesti druge uporabnike, da jim tipkate besedilo"
#: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
-msgstr "Ali naj se pošilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. Trenutno ne vpliva na stanje 'odsoten'."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Ali naj se pošilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. "
+"Trenutno ne vpliva na stanje 'odsoten'."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
@@ -326,15 +367,18 @@ msgid "Spell checking languages"
msgstr "Jeziki za Ärkovanje"
#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")."
#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "OmogoÄi Ärkovalnik"
#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid "Whether to check words typed against the languages you want to check with."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
msgstr "Ali naj se preverja Ärkovanje besed v želenih jezikih."
#: ../data/org.gnome.Empathy.gschema.xml.h:76
@@ -342,16 +386,22 @@ msgid "Nick completed character"
msgstr "Znak na koncu vzdevka"
#: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov "
+"(zavihek) v skupinskem klepetu."
#: ../data/org.gnome.Empathy.gschema.xml.h:78
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
#: ../data/org.gnome.Empathy.gschema.xml.h:80
msgid "Last account selected in Join Room dialog"
@@ -359,7 +409,9 @@ msgstr "Zadnji izbran raÄun v pogovornem oknu pridruženja klepetalnici"
#: ../data/org.gnome.Empathy.gschema.xml.h:81
msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Pot predmeta vodila D-Bus zadnjega izbranega raÄuna pri pridruženju klepetalnici."
+msgstr ""
+"Pot predmeta vodila D-Bus zadnjega izbranega raÄuna pri pridruženju "
+"klepetalnici."
#: ../data/org.gnome.Empathy.gschema.xml.h:82
msgid "Camera device"
@@ -367,7 +419,8 @@ msgstr "Naprava kamere"
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
+msgstr ""
+"Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
@@ -390,8 +443,12 @@ msgid "Show hint about closing the main window"
msgstr "Pokaži namig ob zapiranju glavnega okna"
#: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z "
+"gumbom 'x' v nazivni vrstici."
#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
@@ -399,7 +456,8 @@ msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
#: ../data/org.gnome.Empathy.gschema.xml.h:91
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
+msgstr ""
+"Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
#: ../data/org.gnome.Empathy.gschema.xml.h:92
msgid "Empathy can use the network to guess the location"
@@ -411,11 +469,14 @@ msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
#: ../data/org.gnome.Empathy.gschema.xml.h:94
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
+msgstr ""
+"Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
#: ../data/org.gnome.Empathy.gschema.xml.h:95
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+msgstr ""
+"Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega "
+"omrežja."
#: ../data/org.gnome.Empathy.gschema.xml.h:96
msgid "Empathy can use the GPS to guess the location"
@@ -430,8 +491,10 @@ msgid "Empathy should reduce the location's accuracy"
msgstr "Program Empathy naj zmanjÅ¡a natanÄnost doloÄevanja nahajanja"
#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja."
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja."
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
@@ -457,8 +520,7 @@ msgstr "Prišlo je do napake med prenosom datoteke"
msgid "The other participant is unable to transfer the file"
msgstr "Drug uporabnik ne more prenesti datoteke"
-#: ../libempathy/empathy-ft-handler.c:751
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
msgid "Unknown reason"
msgstr "Neznan vzrok"
@@ -478,8 +540,7 @@ msgstr "Izbrana datoteka ni obiÄajna datoteka"
msgid "The selected file is empty"
msgstr "Izbrana datoteka je prazna"
-#: ../libempathy/empathy-keyring.c:85
-#: ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
msgid "Password not found"
msgstr "Gesla ni mogoÄe najti"
@@ -493,8 +554,7 @@ msgstr "Geslo raÄuna hipnega sporoÄanja za %s (%s)"
msgid "Password for chatroom '%s' on account %s (%s)"
msgstr "Geslo za klepetalnico '%s' na raÄunu %s (%s)"
-#: ../libempathy/empathy-message.c:403
-#: ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
#, c-format
msgid "Missed call from %s"
msgstr "Zgrešen klic od %s"
@@ -598,25 +658,21 @@ msgstr "Neznano"
msgid "No reason specified"
msgstr "Ni doloÄenega razloga"
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
msgid "Status is set to offline"
msgstr "Stanje je nastavljeno na brez povezave"
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
#: ../libempathy-gtk/empathy-call-utils.c:47
#: ../libempathy-gtk/empathy-new-message-dialog.c:80
msgid "Network error"
msgstr "Napaka omrežja"
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
msgid "Authentication failed"
msgstr "Overitev ni uspela"
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
msgid "Encryption error"
msgstr "Napaka Å¡ifriranja"
@@ -624,38 +680,31 @@ msgstr "Napaka Å¡ifriranja"
msgid "Name in use"
msgstr "Ime je v uporabi"
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
msgid "Certificate not provided"
msgstr "Potrdilo ni na voljo"
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
msgid "Certificate untrusted"
msgstr "Potrdilo ni overjeno"
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
msgid "Certificate expired"
msgstr "Potrdilo je preteklo"
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
msgid "Certificate not activated"
msgstr "Potrdilo ni potrjeno"
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
msgid "Certificate hostname mismatch"
msgstr "Neustrezno potrdilo gostitelja"
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
msgid "Certificate fingerprint mismatch"
msgstr "Neustrezen prstni odtis potrdila"
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
msgid "Certificate self-signed"
msgstr "Potrdilo je samo-podpisano"
@@ -688,7 +737,8 @@ msgid "This account is already connected to the server"
msgstr "RaÄun je s strežnikom že povezan"
#: ../libempathy/empathy-utils.c:350
-msgid "Connection has been replaced by a new connection using the same resource"
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
#: ../libempathy/empathy-utils.c:353
@@ -704,12 +754,18 @@ msgid "Certificate has been revoked"
msgstr "Potrdilo je preklicano"
#: ../libempathy/empathy-utils.c:359
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
#: ../libempathy/empathy-utils.c:362
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je doloÄena s Å¡ifrirno knjižnico."
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, "
+"ki je doloÄena s Å¡ifrirno knjižnico."
#: ../libempathy/empathy-utils.c:366
msgid "Your software is too old"
@@ -728,11 +784,11 @@ msgstr "Uporabniki v bližini"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook klepetanje"
@@ -834,7 +890,7 @@ msgstr "Strežnik"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Vrata"
@@ -964,8 +1020,12 @@ msgid "Servers"
msgstr "Strežniki"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "VeÄina strežnikov IRC ne zahteva gesla, zato ga, Äe niste prepriÄani, ne uporabite."
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"VeÄina strežnikov IRC ne zahteva gesla, zato ga, Äe niste prepriÄani, ne "
+"uporabite."
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Nickname"
@@ -1000,11 +1060,13 @@ msgstr "kakšno je vaše uporabniško ime Facebook?"
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
msgstr ""
"To je vaÅ¡e uporabniÅ¡ko ime in ne obiÄajna Facebook prijava.\n"
"V primeru da ste facebook.com/<b>badger</b>, vnesite <b>badger</b>.\n"
-"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za izbor uporabniškega imena, v kolikor ga še nimate."
+"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za "
+"izbor uporabniškega imena, v kolikor ga še nimate."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "What is your Facebook password?"
@@ -1362,8 +1424,12 @@ msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
#: ../libempathy-gtk/empathy-chat.c:1067
-msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
-msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to "
+"trenutna klepetalnica"
#: ../libempathy-gtk/empathy-chat.c:1071
msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1382,15 +1448,23 @@ msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporoÄilo>: poÅ¡lje sporoÄilo DEJANJA v trenutni pogovor"
#: ../libempathy-gtk/empathy-chat.c:1083
-msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
-msgstr "/say <sporoÄilo>: poÅ¡lje <sporoÄilo> v trenutni pogovor. Možnost se uporablja za poÅ¡iljanje sporoÄila, ki se zaÄne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+"/say <sporoÄilo>: poÅ¡lje <sporoÄilo> v trenutni pogovor. Možnost se "
+"uporablja za poÅ¡iljanje sporoÄila, ki se zaÄne z '/'. Primer: \"/say /join "
+"se uporablja za pridruževanje novi klepetalnici\""
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID stika>: pokaže podrobnosti stika"
#: ../libempathy-gtk/empathy-chat.c:1091
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov naÄin uporabe."
#: ../libempathy-gtk/empathy-chat.c:1110
@@ -1410,15 +1484,13 @@ msgstr "Neznan ukaz, za veÄ si vpiÅ¡ite /help"
msgid "insufficient balance to send message"
msgstr "nezadostno stanje na raÄunu za poÅ¡iljanje sporoÄil"
-#: ../libempathy-gtk/empathy-chat.c:1542
-#: ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
#: ../libempathy-gtk/empathy-chat.c:1619
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med poÅ¡iljanjem sporoÄila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1544
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
#: ../libempathy-gtk/empathy-chat.c:1623
#, c-format
msgid "Error sending message: %s"
@@ -1429,7 +1501,9 @@ msgstr "Napaka med poÅ¡iljanjem sporoÄila: %s"
#: ../libempathy-gtk/empathy-chat.c:1550
#, c-format
msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr "Nezadostno stanje na raÄuni za poÅ¡iljanje sporoÄila. <a href='%s'>PoviÅ¡aj</a>."
+msgstr ""
+"Nezadostno stanje na raÄuni za poÅ¡iljanje sporoÄila. <a href='%s'>PoviÅ¡aj</"
+"a>."
#: ../libempathy-gtk/empathy-chat.c:1590
msgid "not capable"
@@ -1459,8 +1533,7 @@ msgstr "ni del programa"
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1680
-#: ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Tema:"
@@ -1574,12 +1647,9 @@ msgstr "%s je preimenovan v %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989
-#: ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517
-#: ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Prekinjena povezava"
@@ -1610,8 +1680,7 @@ msgstr "Klepetalnica je zaÅ¡Äitena z geslom:"
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:4077
-#: ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
msgid "Connected"
msgstr "Povezano"
@@ -1653,7 +1722,7 @@ msgstr "Uredi blokirane stike"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1758,12 +1827,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Želel bi videti, kdaj ste prisotni v klepetu. Hvala!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "Shrani podobo"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Ni mogoÄe shraniti podobe"
@@ -1815,8 +1884,12 @@ msgid "Groups"
msgstr "Skupine"
#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
-msgstr "Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, lahko pa tudi nobene."
+msgid ""
+"Select the groups you want this contact to appear in. Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, "
+"lahko pa tudi nobene."
#: ../libempathy-gtk/empathy-groups-widget.c:358
msgid "_Add Group"
@@ -1845,7 +1918,9 @@ msgstr "Ali želite blokirati %s?"
#: ../libempathy-gtk/empathy-subscription-dialog.c:125
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "Ali ste prepriÄani, da želite blokirati ponovno vzpostavitev stika med '%s' in vami?"
+msgstr ""
+"Ali ste prepriÄani, da želite blokirati ponovno vzpostavitev stika med '%s' "
+"in vami?"
#: ../libempathy-gtk/empathy-individual-dialogs.c:253
msgid "The following identity will be blocked:"
@@ -1893,125 +1968,130 @@ msgstr "Paket gnome-contacts ni nameÅ¡Äen"
#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
msgid "Please install gnome-contacts to access contacts details."
-msgstr "Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
+msgstr ""
+"Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Izbor raÄuna za klicanje"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "KliÄi"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Mobilni telefon"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Delo"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "DomaÄa mapa"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Blokiraj stik"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Izbriši in _blokiraj"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ali zares želite odstraniti stik '%s'?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
-msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
-msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi "
+"stiki, ki so opredeljeni kot povezani."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Odstranjevanje stika"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Odstrani"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Klepet"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_ZvoÄni klic"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video klic"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "Predhodni po_govori"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Pošlji datoteko"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Souporaba namizja"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Priljubljeno"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "_Podrobnosti"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Uredi"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Vabila v klepetalnico"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "_Povabi v klepetalnico"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "_Dodaj stik ..."
@@ -2145,16 +2225,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B %Y ob %R UTC"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Vzdevek:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "DoloÄilo:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2175,15 +2255,15 @@ msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
msgid "New Network"
msgstr "Novo omrežje"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
msgid "Choose an IRC network"
msgstr "Izbor IRC omrežja"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
msgid "Reset _Networks List"
msgstr "Ponastavi seznam _omrežij"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Izbor"
@@ -2192,21 +2272,31 @@ msgstr "Izbor"
msgid "new server"
msgstr "nov strežnik"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
-msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v istem omrežju. V primeru da želite uporabljati to možnost, preverite spodnje podatke."
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v "
+"istem omrežju. V primeru da želite uporabljati to možnost, preverite spodnje "
+"podatke."
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
msgid "People nearby"
msgstr "Uporabniki v bližini"
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr "Te podrobnosti je mogoÄe spreminjati in onemogoÄiti tudi kasneje preko menija <span style=\"italic\">Uredi → RaÄuni</span> v seznamu stikov."
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Te podrobnosti je mogoÄe spreminjati in onemogoÄiti tudi kasneje preko "
+"menija <span style=\"italic\">Uredi → RaÄuni</span> v seznamu stikov."
#: ../libempathy-gtk/empathy-log-window.c:622
msgid "History"
@@ -2231,25 +2321,25 @@ msgid "Chat with %s"
msgstr "Klepet s stikom %s"
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %d. %B %Y"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
@@ -2258,7 +2348,7 @@ msgstr[1] "%s sekunda"
msgstr[2] "%s sekundi"
msgstr[3] "%s sekunde"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
@@ -2267,80 +2357,82 @@ msgstr[1] "%s minuta"
msgstr[2] "%s minuti"
msgstr[3] "%s minute"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Klic zaÄet %s, konÄan %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "Danes"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "VÄeraj"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%e. %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "Kadarkoli"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "Kdorkoli"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "Kdo"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "Kdaj"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Karkoli"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "Besedilni klepet"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Klici"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "Dohodni klici"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "Odhodni klici"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "Prezrti klici"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "Kaj"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr "Ali ste prepriÄani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
+msgstr ""
+"Ali ste prepriÄani, da želite izbrisati vse podatke beležanja predhodnih "
+"pogovorov?"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "PoÄisti vse"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "Izbriši iz:"
@@ -2349,8 +2441,7 @@ msgid "_File"
msgstr "_Datoteka"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
msgid "_Edit"
msgstr "_Uredi"
@@ -2363,13 +2454,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Klepet"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2490,7 +2580,8 @@ msgid ""
"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
msgstr ""
"<b>Trenutno sporoÄilo: %s</b>\n"
-"<small><i>Pritisnite vnosno tipko za nastavitev novega sporoÄila, ali pa pritisnite tipko Esc za preklic dejanja.</i></small>"
+"<small><i>Pritisnite vnosno tipko za nastavitev novega sporoÄila, ali pa "
+"pritisnite tipko Esc za preklic dejanja.</i></small>"
#: ../libempathy-gtk/empathy-presence-chooser.c:393
msgid "Set status"
@@ -2597,12 +2688,12 @@ msgstr "_Odkloni"
msgid "_Accept"
msgstr "_Sprejmi"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "SporoÄilo je bilo nazadnje spremenjeno ob %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "ObiÄajno"
@@ -2635,7 +2726,8 @@ msgid "The certificate is self-signed."
msgstr "Potrdilo je samo-podpisano."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr "Potrdilo je preklicano s strani izdajatelja in overitelja potrdila."
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2694,8 +2786,12 @@ msgstr "Ni dovolj prostora za shranjevanje datoteke"
#: ../libempathy-gtk/empathy-ui-utils.c:1256
#, c-format
-msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
-msgstr "%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na voljo le %s. Izbrati bo treba drugo mesto."
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na "
+"voljo le %s. Izbrati bo treba drugo mesto."
#: ../libempathy-gtk/empathy-ui-utils.c:1302
#, c-format
@@ -2711,15 +2807,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Osebni podatki</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "_Odpri povezavo"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Pregled HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Trenutne jezikovne nastavitve"
@@ -2895,6 +2996,13 @@ msgstr "Najpogostejši stiki"
msgid "Ungrouped"
msgstr "Brez skupine"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Stika ni mogoÄe najti: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Ni sporoÄil o napakah"
@@ -2904,16 +3012,38 @@ msgid "Instant Message (Empathy)"
msgstr "Hipno sporoÄanje (Empathy)"
#: ../src/empathy-about-dialog.c:81
-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 Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Empathy je prosta programska oprema; program lahko razÅ¡irjate oz. spreminjate pod pogoji SploÅ¡nega dovoljenja GNU (GNU General Public License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali (po svoji izbiri) katerekoli poznejÅ¡e razliÄice."
+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 "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy je prosta programska oprema; program lahko razširjate oz. "
+"spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General Public "
+"License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali "
+"(po svoji izbiri) katerekoli poznejÅ¡e razliÄice."
#: ../src/empathy-about-dialog.c:85
-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 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details."
-msgstr "Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License."
+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 "
+"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
+"details."
+msgstr ""
+"Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
+"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
+"DOLOÄŒEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License."
#: ../src/empathy-about-dialog.c:89
-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 Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja GNU (GNU General Public License); v nasprotnem primeru pišite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+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 "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja "
+"GNU (GNU General Public License); v nasprotnem primeru pišite na: Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
#: ../src/empathy-about-dialog.c:109
msgid "An Instant Messaging client for GNOME"
@@ -2925,15 +3055,20 @@ msgstr "Matej UrbanÄiÄ <mateju@svn.gnome.org>"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj"
+msgstr ""
+"Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ne prikaži pogovornega okna, Äe so na voljo le raÄunov \"uporabnikov v bližini\" "
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Ne prikaži pogovornega okna, Äe so na voljo le raÄunov \"uporabnikov v "
+"bližini\" "
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)"
+msgstr ""
+"Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -2960,8 +3095,7 @@ msgstr "Obstajajo neshranjene spremembe vaÅ¡ega %s raÄuna."
msgid "Your new account has not been saved yet."
msgstr "Novi raÄun Å¡e ni bil shranjen."
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
msgid "Connecting…"
msgstr "Povezovanje ..."
@@ -2984,8 +3118,14 @@ msgid "Unknown Status"
msgstr "Neznano stanje"
#: ../src/empathy-accounts-dialog.c:492
-msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
-msgstr "Ta raÄun je onemogoÄen, ker deluje na starem, nepodprtem ozadnjem programu. Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos raÄuna."
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Ta raÄun je onemogoÄen, ker deluje na starem, nepodprtem ozadnjem programu. "
+"Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos "
+"raÄuna."
#: ../src/empathy-accounts-dialog.c:502
msgid "Offline — Account Disabled"
@@ -2995,20 +3135,20 @@ msgstr "Brez povezave - raÄun je onemogoÄen"
msgid "Edit Connection Parameters"
msgstr "Uredi parametre povezave"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Uredi parametre povezave ..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ali želite odstraniti %s iz raÄunalnika?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "To ne bo odstranilo vaÅ¡ega raÄuna s strežnika."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3017,24 +3157,24 @@ msgstr ""
"Ali ste prepriÄani, da želite nadaljevati?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_OmogoÄi"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Preimenuj"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "Pre_skoÄi"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Poveži"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3043,7 +3183,7 @@ msgstr ""
"Ali ste prepriÄani, da želite nadaljevati?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "SporoÄanje in raÄuni VoIP"
@@ -3056,8 +3196,12 @@ msgid "Loading account information"
msgstr "Nalaganje podrobnosti raÄuna"
#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "To add a new account, you first have to install a backend for each protocol you want to use."
-msgstr "Za dodajanje novega raÄuna morate najprej namestiti zaledje za vsak protokol, ki ga želite uporabiti."
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Za dodajanje novega raÄuna morate najprej namestiti zaledje za vsak "
+"protokol, ki ga želite uporabiti."
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol backends installed"
@@ -3090,18 +3234,24 @@ msgstr "Napaka delovanja upravljalnika raÄunov"
#: ../src/empathy.c:625
#, c-format
msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
"\n"
"%s"
msgstr ""
-"PriÅ¡lo je do napake med povezovanjem z upravljalnikom raÄunov Telepathy. Javljena je napaka:\n"
+"PriÅ¡lo je do napake med povezovanjem z upravljalnikom raÄunov Telepathy. "
+"Javljena je napaka:\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "V pogovoru"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy odjemalec zvoka in slike"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy odjemalec zvoka in slike"
@@ -3110,37 +3260,27 @@ msgstr "Empathy odjemalec zvoka in slike"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s je klical med drugim pogovorom."
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124
-#: ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Dohodni klic"
-#: ../src/empathy-call-window.c:1490
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Dohodni video klic od %s"
-#: ../src/empathy-call-window.c:1490
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1564
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Zavrni"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1565
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3148,119 +3288,133 @@ msgstr "Odgovori"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1934
#, c-format
msgid "Call with %s"
msgstr "Klic z %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2186
msgid "The IP address as seen by the machine"
msgstr "Naslov IP kot ga zazna strojna oprema"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2188
msgid "The IP address as seen by a server on the Internet"
msgstr "Naslov IP kot ga zazna strežnik v omrežju"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2190
msgid "The IP address of the peer as seen by the other side"
msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2192
msgid "The IP address of a relay server"
msgstr "Naslov IP posredovalnega strežnika"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2194
msgid "The IP address of the multicast group"
msgstr "Naslov IP skupine za veÄsmerno oddajanje"
-#: ../src/empathy-call-window.c:2522
-#: ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524
-#: ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Neznano"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2966
msgid "On hold"
msgstr "Zadržano"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2970
msgid "Mute"
msgstr "Utišaj"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2972
msgid "Duration"
msgstr "Trajanje"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2975
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3071
msgid "Technical Details"
msgstr "TehniÄne podrobnosti"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3110
#, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
msgstr "Program stika %s ne prepozna zvoÄnih zapisov podprtih na vaÅ¡em sistemu"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3115
#, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3121
#, c-format
-msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
-msgstr "Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v "
+"omrežju, ki ne dovoli neposrednih povezav."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3127
msgid "There was a failure on the network"
msgstr "Prišlo je do napake na omrežju"
-#: ../src/empathy-call-window.c:3039
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3131
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
msgstr "ZvoÄni zapisi za ta klic niso nameÅ¡Äeni"
-#: ../src/empathy-call-window.c:3042
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3134
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
msgstr "Video zapisi za ta klic niso nameÅ¡Äeni"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3146
#, c-format
-msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
-msgstr "PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz menija pomoÄi."
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a "
+"href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz "
+"menija pomoÄi."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3155
msgid "There was a failure in the call engine"
msgstr "Prišlo je do napake v klicnem programniku"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3158
msgid "The end of the stream was reached"
msgstr "Dosežen je konec pretoka"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3198
msgid "Can't establish audio stream"
msgstr "Ni mogoÄe vzpostaviti zvoÄnega pretoka"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3208
msgid "Can't establish video stream"
msgstr "Ni mogoÄe vzpostaviti video pretoka"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3245
#, c-format
msgid "Your current balance is %s."
msgstr "Trenutno stanje je %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3249
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Na raÄunu ni dovolj visokega zneska za vzpostavitev klica."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3251
msgid "Top Up"
msgstr "Povišaj"
@@ -3284,13 +3438,11 @@ msgstr "_Nastavitve"
msgid "_View"
msgstr "_Pogled"
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
msgid "_Help"
msgstr "Pomo_Ä"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
msgid "_Contents"
msgstr "_Vsebina"
@@ -3299,79 +3451,86 @@ msgid "_Debug"
msgstr "_RazhroÅ¡Äevanje"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Zamenjaj videokamero"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "SkrÄi"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Razpni"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "OnemogoÄi videokamero"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Odloži"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Odloži trenutni klic"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Video klic"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "ZaÄni video klic"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "ZaÄni zvoÄni klic"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Pokaži Å¡tevilÄnico"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Pokaži Å¡tevilÄnico na zaslonu"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Preklopi prenos videa"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Preklopi prenos zvoka"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Kodek kodiranja:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Kodek odkodiranja:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Oddaljeni odjemalec:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Krajevni odjemalec:"
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Zvok"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "- sporoÄilnik Empathy"
@@ -3391,43 +3550,61 @@ msgstr "Samodejno povezovanje"
msgid "Manage Favorite Rooms"
msgstr "Upravljanje priljubljenih klepetalnic"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Ali naj se okno zapre?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
-msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
-msgstr "Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja "
+"sporoÄila ne bodo prikazana do ponovne povezave."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
-msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
-msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
-msgstr[0] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
-msgstr[1] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
-msgstr[2] "Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
-msgstr[3] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
-
-#: ../src/empathy-chat-window.c:310
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. "
+"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
+msgstr[1] ""
+"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja "
+"sporoÄila ne bodo prikazana do ponovne povezave."
+msgstr[2] ""
+"Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. "
+"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
+msgstr[3] ""
+"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. "
+"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Ali naj se prekine povezava s klepetalnico %s?"
-#: ../src/empathy-chat-window.c:312
-msgid "You will not receive any further messages from this chat room until you rejoin it."
-msgstr "Nadaljnja sporoÄila s te klepetalnice ne bodo prikazana do ponovne povezave."
+#: ../src/empathy-chat-window.c:319
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Nadaljnja sporoÄila s te klepetalnice ne bodo prikazana do ponovne povezave."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Zapri okno"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Zapusti klepetalnico"
-#: ../src/empathy-chat-window.c:665
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3436,7 +3613,7 @@ msgstr[1] "%s (%d neprebrano)"
msgstr[2] "%s (%d neprebrani)"
msgstr[3] "%s (%d neprebrana)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3445,7 +3622,7 @@ msgstr[1] "%s (in %u drug)"
msgstr[2] "%s (in %u druga)"
msgstr[3] "%s (in %u drugi)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3454,7 +3631,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
msgstr[2] "%s (%d neprebrani od drugih)"
msgstr[3] "%s (%d neprebrana od drugih)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3463,11 +3640,11 @@ msgstr[1] "%s (%d neprebrano od vseh)"
msgstr[2] "%s (%d neprebrani od vseh)"
msgstr[3] "%s (%d neprebrana od vseh)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3476,7 +3653,7 @@ msgstr[1] "PoÅ¡iljanje %d sporoÄila"
msgstr[2] "PoÅ¡iljanje %d sporoÄil"
msgstr[3] "PoÅ¡iljanje %d sporoÄil"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Pisanje sporoÄila."
@@ -3500,8 +3677,7 @@ msgstr "_Priljubljena klepetalnica"
msgid "Notify for All Messages"
msgstr "Obvesti o vseh novih sporoÄilih"
-#: ../src/empathy-chat-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "_Show Contact List"
msgstr "_Pokaži seznam stikov"
@@ -3567,68 +3743,90 @@ msgstr "Odziv odložiÅ¡Äa Pastebin"
#: ../src/empathy-debug-window.c:1675
msgid "Data too large for a single paste. Please save logs to file."
-msgstr "PreveÄ je podatkov za enkratno lepljenje. Beleženje dnevnika je priporoÄljivo shraniti v datoteko."
+msgstr ""
+"PreveÄ je podatkov za enkratno lepljenje. Beleženje dnevnika je "
+"priporoÄljivo shraniti v datoteko."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "RazhroÅ¡Äevalno okno"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "PoÅ¡lji na odložiÅ¡Äe Pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Premor"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Raven"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "RazhroÅ¡Äevanje"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Podrobnosti"
-#: ../src/empathy-debug-window.c:2001
-#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "SporoÄilo"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Opozorilo"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "KritiÄno"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Napaka"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"ÄŒeprav dnevniki ne vkljuÄujejo gesel, lahko vsebujejo obÄutljive podatke, "
+"kot so seznam stikov ter prejeta in poslana sporoÄila elektronske poÅ¡te.\n"
+"V kolikor teh podrobnosti ne želite videti v javnem poroÄilu o hroÅ¡Äu, je "
+"vidnost teh mogoÄe omejiti le za razvijalce programa Empathy. To storite "
+"preko izbir na spletiÅ¡Äu za <a href=\"https://bugzilla.gnome.org/enter_bug."
+"cgi?product=empathy\">objavo poroÄila</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "ÄŒas"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domena"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategorija"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Raven"
-#: ../src/empathy-debug-window.c:2073
-msgid "The selected connection manager does not support the remote debugging extension."
-msgstr "Izbrani upravljalnik povezav ne podpira razÅ¡iritve za oddaljeno razhroÅ¡Äevanje."
+#: ../src/empathy-debug-window.c:2100
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno "
+"razhroÅ¡Äevanje."
#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
@@ -3648,8 +3846,7 @@ msgstr "%s vas kliÄe. Ali se želite javiti?"
msgid "_Reject"
msgstr "_Zavrni"
-#: ../src/empathy-event-manager.c:549
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
msgid "_Answer"
msgstr "_Odgovori"
@@ -3690,8 +3887,7 @@ msgstr "Povabljeni ste v %s"
msgid "Incoming file transfer from %s"
msgstr "PrihajajoÄ prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:973
-#: ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Zahtevano geslo"
@@ -3781,19 +3977,16 @@ msgstr "\"%s\" poslano %s"
msgid "File transfer completed"
msgstr "Prenos datoteke je konÄan"
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
msgid "Waiting for the other participant's response"
msgstr "Čakanje na odziv drugega udeleženca"
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Preverjanje celovitosti \"%s\""
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "Ustvarjanje razpršila \"%s\""
@@ -3823,8 +4016,12 @@ msgid "_Import"
msgstr "_Uvozi"
#: ../src/empathy-import-dialog.c:88
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov programa Pidgin."
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov "
+"programa Pidgin."
#: ../src/empathy-import-dialog.c:209
msgid "Import Accounts"
@@ -3896,20 +4093,31 @@ msgid "Join Room"
msgstr "Pridruži se klepetalnici"
#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali veÄ klepetalnic s seznama."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno "
+"ali veÄ klepetalnic s seznama."
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "_Room:"
msgstr "_Klepetalnica:"
#: ../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&apos;s server"
-msgstr "Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se klepetalnica nahaja na strežniku raÄuna"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se "
+"klepetalnica nahaja na strežniku raÄuna"
#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
-msgstr "Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se klepetalnica nahaja na strežniku raÄuna"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se "
+"klepetalnica nahaja na strežniku raÄuna"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "_Server:"
@@ -4032,8 +4240,7 @@ msgstr "Pokaži skupine"
msgid "Show account balances"
msgstr "Pokaži stanje raÄuna"
-#: ../src/empathy-preferences.ui.h:4
-#: ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
msgid "Contact List"
msgstr "Seznam stikov"
@@ -4122,16 +4329,30 @@ msgid "Use _echo cancellation to improve call quality"
msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
#: ../src/empathy-preferences.ui.h:27
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Odpravljanje odmevov omogoÄi ÄistejÅ¡i zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru da med pogovorom zasliÅ¡ite nenavadne zvoke ali Å¡ume, onemogoÄite odpravljanje odmevov in ponovno vzpostavite klic."
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Odpravljanje odmevov omogoÄi ÄistejÅ¡i zvok glasu med klicanjem, vendar pa se "
+"lahko na nekaterih sistemih pojavijo težave. V primeru da med pogovorom "
+"zasliÅ¡ite nenavadne zvoke ali Å¡ume, onemogoÄite odpravljanje odmevov in "
+"ponovno vzpostavite klic."
#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "O_bjavi mesto mojim stikom"
#: ../src/empathy-preferences.ui.h:31
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place."
-msgstr "ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno decimalno mesto."
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov "
+"natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno "
+"decimalno mesto."
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
@@ -4159,7 +4380,9 @@ msgid "Location sources:"
msgstr "Mesta virov:"
#: ../src/empathy-preferences.ui.h:40
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
msgstr "Na seznamu jezikov so le tisti, za katere imate nameÅ¡Äene slovarje."
#: ../src/empathy-preferences.ui.h:41
@@ -4182,62 +4405,86 @@ msgstr "RazliÄica:"
msgid "Themes"
msgstr "Teme"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Vpis gesla"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Prekini povezavo"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Ustrezno je treba nastaviti raÄun za prikaz stikov."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "RaÄunov %s ni mogoÄe uporabljati, dokler ni posodobljena programska oprema %s."
+msgstr ""
+"RaÄunov %s ni mogoÄe uporabljati, dokler ni posodobljena programska oprema "
+"%s."
+
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:674
+msgid "Facebook"
+msgstr "Facebook"
-#: ../src/empathy-roster-window.c:636
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "RaÄun %s zahteva overitev"
+
+#: ../src/empathy-roster-window.c:700
+msgid "Online Accounts"
+msgstr "Spletni raÄuni"
+
+#: ../src/empathy-roster-window.c:747
msgid "Update software..."
msgstr "Posodobitev programske opreme ..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:753
msgid "Reconnect"
msgstr "Ponovno se poveži"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:757
msgid "Edit Account"
msgstr "Uredi raÄun"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:762
msgid "Close"
msgstr "Zapri"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:904
msgid "Top up account"
msgstr "PoviÅ¡aj znesek na raÄunu"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1590
msgid "You need to enable one of your accounts to see contacts here."
msgstr "OmogoÄiti je treba enega izmed raÄunov za prikaz stikov."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1598
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "OmogoÄiti je treba raÄun %s za prikaz stikov."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1676
msgid "Change your presence to see contacts here"
msgstr "Spremenite nastavitve za prikaz stikov."
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1685
msgid "No match found"
msgstr "Ni najdenih zadetkov."
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "Ni Å¡e dodanih stikov"
+
+#: ../src/empathy-roster-window.c:1695
msgid "No online contacts"
msgstr "Ni prijavljenih stikov"
@@ -4314,6 +4561,14 @@ msgstr "Nastavitve raÄuna"
msgid "Go _Online"
msgstr "Brez _povezave"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Pokaži _nepovezane stike"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "_Dodaj stik ..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Nov pogovor ..."
@@ -4326,12 +4581,12 @@ msgstr "Nov k_lic ..."
msgid "Status"
msgstr "Stanje"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
msgid "Done"
msgstr "KonÄano"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
msgid "Please enter your account details"
msgstr "Vnesite podrobnosti raÄuna"
@@ -4344,6 +4599,9 @@ msgstr "Uredi možnosti raÄuna %s"
msgid "Integrate your IM accounts"
msgstr "Podpora razliÄnim raÄunom IM"
+#~ msgid "i"
+#~ msgstr "i"
+
#~ msgid "Manage Messaging and VoIP accounts"
#~ msgstr "Upravljanje s sporoÄanjem in raÄuni VoIP"
@@ -4443,8 +4701,8 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Details"
#~ msgstr "Podrobnosti"
-#~ msgctxt "codec"
+#~ msgctxt "codec"
#~ msgid "Unknown"
#~ msgstr "Neznano"
@@ -4558,15 +4816,15 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Contacts selected in the list on the left will be linked together."
#~ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
-#~ msgctxt "Link individual (contextual menu)"
+#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link Contacts…"
#~ msgstr "_Poveži stike ..."
#~ msgid "Link Contacts"
#~ msgstr "Poveži stike"
-#~ msgctxt "Unlink individual (button)"
+#~ msgctxt "Unlink individual (button)"
#~ msgid "_Unlink…"
#~ msgstr "_Odstrani povezavo ..."
@@ -4586,8 +4844,8 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgstr ""
#~ "Ali ste prepriÄani, da želite odstraniti povezane stike? S tem se bodo "
#~ "stiki razdelil na posamezne stike."
-#~ msgctxt "Unlink individual (button)"
+#~ msgctxt "Unlink individual (button)"
#~ msgid "_Unlink"
#~ msgstr "_Odstrani povezavo"
@@ -4694,9 +4952,6 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Socket type not supported"
#~ msgstr "Vrsta vtiÄnice ni podprta"
-#~ msgid "My Web Accounts"
-#~ msgstr "Moji spletni raÄuni"
-
#~ msgid "The account %s is edited via %s."
#~ msgstr "RaÄun %s se ureja preko %s."
@@ -4714,8 +4969,8 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Personal Information"
#~ msgstr "Osebni podatki"
-#~ msgctxt "Edit contact (contextual menu)"
+#~ msgctxt "Edit contact (contextual menu)"
#~ msgid "_Edit"
#~ msgstr "_Uredi"
@@ -4753,9 +5008,6 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Favorite People"
#~ msgstr "Priljubljene osebe"
-#~ msgid "Select a contact"
-#~ msgstr "Izberi stik"
-
#~ msgid "Contact ID:"
#~ msgstr "ID stika:"
@@ -4773,20 +5025,20 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "The selected contact is offline."
#~ msgstr "Izbrani stik ni povezan v omrežje."
-#~ msgctxt "encoding video codec"
+#~ msgctxt "encoding video codec"
#~ msgid "Unknown"
#~ msgstr "Neznano"
-#~ msgctxt "encoding audio codec"
+#~ msgctxt "encoding audio codec"
#~ msgid "Unknown"
#~ msgstr "Neznano"
-#~ msgctxt "decoding video codec"
+#~ msgctxt "decoding video codec"
#~ msgid "Unknown"
#~ msgstr "Neznano"
-#~ msgctxt "decoding audio codec"
+#~ msgctxt "decoding audio codec"
#~ msgid "Unknown"
#~ msgstr "Neznano"
@@ -4861,8 +5113,8 @@ msgstr "Podpora razliÄnim raÄunom IM"
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Uporabi _Yahoo! Japan"
-#~ msgctxt "Link individual (contextual menu)"
+#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Poveži ..."
diff --git a/po/sr.po b/po/sr.po
index 0bc01d8b1..d08be9003 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,5 +1,5 @@
# Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2013.
# This file is distributed under the same license as the Empathy package.
# From Pidgin translation:
# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,14 +11,14 @@
# Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
# Милош Поповић <gpopac@gmail.com>, 2010.
# Бранко Кокановић <branko.kokanovic@gmail.com>, 2011.
-# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2011, 2012.
+# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
"y&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-29 19:49+0200\n"
+"POT-Creation-Date: 2013-01-09 14:05+0000\n"
+"PO-Revision-Date: 2013-01-18 10:24+0200\n"
"Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <gnom@prevod.org>\n"
"Language: sr\n"
@@ -47,6 +47,10 @@ msgstr ""
"ЋаÑкајте на Гугл разговору, ФејÑбуку, МСÐ-у и на многим другим ÑервиÑима за "
"ћаÑкање"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "ћаÑкање;разговор;бп;им;порука;ирц;воип;гразговор;фејÑбук;џабер;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Да ли ће бити коришћен управник мрежом"
@@ -423,8 +427,8 @@ msgstr "Уређај камерице"
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr ""
-"ОÑновна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
-"video0“."
+"ОÑновна видео камерица која ће бити коришћена у видео позивима, нпр. "
+"„/dev/video0“."
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
@@ -784,11 +788,11 @@ msgstr "Људи у околини"
msgid "Yahoo! Japan"
msgstr "Јаху! Јапан"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
msgid "Google Talk"
msgstr "Гугл разговор"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "ФејÑбук ћаÑкање"
@@ -890,7 +894,7 @@ msgstr "Сервер"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "Прикључник"
@@ -954,7 +958,7 @@ msgstr "_КориÑничко име"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> кориÑничко_име"
+msgstr "<b>Пример:</b> кориÑничко-име"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise User ID?"
@@ -1532,7 +1536,7 @@ msgstr "није подржано"
msgid "unknown"
msgstr "непознато"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Тема:"
@@ -1646,9 +1650,9 @@ msgstr "%s је Ñада познат као %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Веза је прекинута"
@@ -1721,7 +1725,7 @@ msgstr "Измени блокиране пријатеље"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1826,12 +1830,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Молим Ð²Ð°Ñ Ð¾Ð±Ð°Ð²ÐµÑтите ме када Ñте на мрежи. Хвала!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "Сачувај Ñлику"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Ðе могу да Ñачувам Ñлику"
@@ -1971,47 +1975,47 @@ msgstr "ИнÑталирајте „gnome-contacts“ да приÑтупите
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Изаберите налог који ће бити коришћен за позив"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Позив"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Мобилни"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "ПоÑао"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "КУЋÐ"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Блокирај контакт"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Избриши и _блокирај"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Да ли Ñте Ñигурни да желите да уклоните пријатеља „%s“?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2020,75 +2024,75 @@ msgstr ""
"Да ли Ñтварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и Ñве "
"контакте који Ñу везани за овај контакт."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Уклањам пријатеља"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Уклони"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "Ћа_Ñкање"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_СМС"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Ðудио позив"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Видео позив"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Претходни разговори"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Пошаљи датотеку"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Подели моју радну површ"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Омиљени"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "_Подаци"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Уреди"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Позивам Ð²Ð°Ñ Ñƒ ову Ñобу"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "Позов_и у Ñобу за ћаÑкање"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "Дод_ај пријатеља…"
@@ -2222,16 +2226,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%e.%d.%Y у %R КУВ"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Ðадимак:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Идентификатор:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2252,15 +2256,15 @@ msgstr "Ðа вези преко телефона или мобилног уре
msgid "New Network"
msgstr "Ðова мрежа"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
msgid "Choose an IRC network"
msgstr "Одаберите ИРЦ мрежу"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
msgid "Reset _Networks List"
msgstr "РеÑетуј _мрежни ÑпиÑак"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Изабери"
@@ -2269,7 +2273,7 @@ msgstr "Изабери"
msgid "new server"
msgstr "нови Ñервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "ССЛ"
@@ -2319,25 +2323,25 @@ msgid "Chat with %s"
msgstr "ЋаÑкање Ñа %s"
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
@@ -2346,7 +2350,7 @@ msgstr[1] "%s Ñекунде"
msgstr[2] "%s Ñекунди"
msgstr[3] "једне Ñекунде"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
@@ -2355,81 +2359,81 @@ msgstr[1] "%s минута"
msgstr[2] "%s минута"
msgstr[3] "једног минута"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Позив је започет %s, а завршен је %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "ДанаÑ"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "Јуче"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%e. %B %Y."
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "Било кад"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "Било ко"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "Ко"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "Када"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Било шта"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "ПиÑана ћаÑкања"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Позиви"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "Долазни позиви"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "Одлазећи позиви"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "Пропуштени позиви"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "Шта"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr ""
"Да ли Ñте Ñигурни да желите да обришете Ñве дневнике претходних разговора?"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "ОчиÑти Ñве"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "Обриши од:"
@@ -2451,12 +2455,12 @@ msgid "Profile"
msgstr "Профил"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "ЋаÑкање"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Видео"
@@ -2685,12 +2689,12 @@ msgstr "_Одбиј"
msgid "_Accept"
msgstr "_Прихвати"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "Порука је уређена %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "Ðормално"
@@ -2805,15 +2809,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>Лични подаци</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "Умножи _адреÑу везе"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "Отвори _везу"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "ИÑпитај ХТМЛ"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Текући локалитет"
@@ -2982,7 +2991,6 @@ msgid "Vietnamese"
msgstr "вијетнамÑки"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "Ðајбољи пријатељи"
@@ -2990,6 +2998,13 @@ msgstr "Ðајбољи пријатељи"
msgid "Ungrouped"
msgstr "ÐегрупиÑано"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Сервер не може да нађе контакт: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Ðема порука о грешкама"
@@ -3046,6 +3061,7 @@ msgstr ""
"Ðикола Котур <kotnik@ns-linux.org>\n"
"Милош Поповић <gpopac@gmail.com>\n"
"Бранко Кокановић <branko.kokanovic@gmail.com>\n"
+"МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n"
"\n"
"Превод.орг — превод на ÑрпÑки језик."
@@ -3090,7 +3106,7 @@ msgstr "ПоÑтоје неÑачуване измене на вашем налÐ
msgid "Your new account has not been saved yet."
msgstr "Ваш нови налог још није Ñачуван."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
msgid "Connecting…"
msgstr "Повезујем Ñе…"
@@ -3130,20 +3146,20 @@ msgstr "Ðеповезан — Ðалог је онемогућен"
msgid "Edit Connection Parameters"
msgstr "Уредите параметре повезивања"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Уреди параметре повезивања..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Да ли Ñте Ñигурни да желите да уклоните „%s“ Ñа вашег рачунара?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Ово неће уклонити ваш налог на Ñерверу."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3152,24 +3168,24 @@ msgstr ""
"Да ли Ñигурно желите да наÑтавите?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_Укључен"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Преименуј"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_ПреÑкочи"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Повежи Ñе"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3178,7 +3194,7 @@ msgstr ""
"Да ли Ñигурно желите да наÑтавите?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Ðалози за допиÑивање и VoIP"
@@ -3240,11 +3256,16 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "Долазни позив"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "— Интернет пиÑмоноша Ðудио/Видео клијент"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Интернет пиÑмоноша Ðудио/Видео клијент"
@@ -3253,33 +3274,27 @@ msgstr "Интернет пиÑмоноша Ðудио/Видео клијент
msgid "%s just tried to call you, but you were in another call."
msgstr "%s је покушао да Ð²Ð°Ñ Ð·Ð¾Ð²Ðµ, али Ñте ви били на другој вези."
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "и"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Долазни позив"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Долазни видео позив од %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Позива Ð²Ð°Ñ â€ž%s“"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1564
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Одбаци"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1565
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3287,74 +3302,74 @@ msgstr "Јави Ñе"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1934
#, c-format
msgid "Call with %s"
msgstr "Позив Ñа кориÑником %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2186
msgid "The IP address as seen by the machine"
msgstr "ИП адреÑа како је види овај рачунар"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2188
msgid "The IP address as seen by a server on the Internet"
msgstr "ИП адреÑа како је види Ñервер на интернету"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2190
msgid "The IP address of the peer as seen by the other side"
msgstr "ИП адреÑа вршњака како је види друга Ñтрана"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2192
msgid "The IP address of a relay server"
msgstr "ИП адреÑа релејног Ñервера"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2194
msgid "The IP address of the multicast group"
msgstr "ИП адреÑа групе за вишеÑтруко емитовање"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Ðепознато"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2966
msgid "On hold"
msgstr "Ðа чекању"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2970
msgid "Mute"
msgstr "Утишај"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2972
msgid "Duration"
msgstr "Трајање"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2975
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3071
msgid "Technical Details"
msgstr "Технички детаљи"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3115
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3121
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3363,23 +3378,23 @@ msgstr ""
"Ðе могу да уÑпоÑтавим везу Ñа %s. Можда је неко од Ð²Ð°Ñ Ð´Ð²Ð¾Ñ˜Ðµ на мрежи која "
"не дозвољава директне везе."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3127
msgid "There was a failure on the network"
msgstr "Дошло је до грешке у мрежи"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3131
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Звучни формати потребни за овај позив ниÑу инÑталирани на вашем рачунару"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3134
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Видео формати потребни за овај позив ниÑу инÑталирани на вашем рачунару"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3146
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3390,32 +3405,32 @@ msgstr ""
"„%s“>ову грешку</a> и прикачите дневнике покупљене из прозора „Отклањање "
"грешака“ у изборнику „Помоћ“."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3155
msgid "There was a failure in the call engine"
msgstr "Дошло је до грешке у мотору за позиве"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3158
msgid "The end of the stream was reached"
msgstr "ДоÑтигнут је крај тока"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3198
msgid "Can't establish audio stream"
msgstr "Ðе могу да уÑпоÑтавим звучни ток"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3208
msgid "Can't establish video stream"
msgstr "Ðе могу да уÑпоÑтавим видео ток"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3245
#, c-format
msgid "Your current balance is %s."
msgstr "Ваше тренутно Ñтање је %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3249
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Извините, али немате довољно кредита за овај позив."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3251
msgid "Top Up"
msgstr "Допуни"
@@ -3452,78 +3467,86 @@ msgid "_Debug"
msgstr "_Уклањање грешака"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_ГÑтример"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Телепатија"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Размени камеру"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Умањи ме"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Увећај ме"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "ИÑкључите камерицу"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Прекини"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Прекините тренутни позив"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Видео позив"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "Започните видео позив"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "Започните аудио позив"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Прикажи бројчаник"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Прикажите бројчаник"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "Укључи/иÑкључи Ð¿Ñ€ÐµÐ½Ð¾Ñ Ð²Ð¸Ð´ÐµÐ°"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "Укључи/иÑкључи Ð¿Ñ€ÐµÐ½Ð¾Ñ Ð·Ð²ÑƒÐºÐ°"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Кодек за кодирање:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Кодек за декодирање:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Удаљени кандидат:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Локални кандидат:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Звук"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "— ПиÑмоноша програм за ћаÑкање"
@@ -3543,11 +3566,11 @@ msgstr "ÐутоматÑко повезивање"
msgid "Manage Favorite Rooms"
msgstr "Уреди омиљене Ñобе"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Да затворим овај прозор?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3556,7 +3579,7 @@ msgstr ""
"Затварањем овог прозора биће напуштено %s. Ðећете примати никакве будуће "
"поруке Ñве док Ñе поново не придружите."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3577,12 +3600,12 @@ msgstr[3] ""
"Затварањем овог прозора биће напуштена једна Ñоба за ћаÑкање. Ðећете примати "
"никакве будуће поруке Ñве док Ñе поново не придружите."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Да напуÑтим %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3590,15 +3613,15 @@ msgstr ""
"Ðећете примати никакве будуће поруке из ове Ñобе за ћаÑкање Ñве док јој Ñе "
"поново не придружите."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Затвори прозор"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "ÐапуÑти Ñобу"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3607,7 +3630,7 @@ msgstr[1] "%s (%d непрочитане)"
msgstr[2] "%s (%d непрочитаних)"
msgstr[3] "%s (једна непрочитана)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3616,7 +3639,7 @@ msgstr[1] "%s (и %u друге)"
msgstr[2] "%s (и %u других)"
msgstr[3] "%s (и једна друга)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3625,7 +3648,7 @@ msgstr[1] "%s (%d непрочитане од оÑталих)"
msgstr[2] "%s (%d непрочитаних од оÑталих)"
msgstr[3] "%s (једна непрочитана од оÑталих)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3634,11 +3657,11 @@ msgstr[1] "%s (%d непрочитане од Ñвих)"
msgstr[2] "%s (%d непрочитаних од Ñвих)"
msgstr[3] "%s (једна непрочитана од Ñвих)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "СМС:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3647,7 +3670,7 @@ msgstr[1] "Шаљем %d поруке"
msgstr[2] "Шаљем %d порука"
msgstr[3] "Шаљем једну поруку"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Пише поруку."
@@ -3739,63 +3762,83 @@ msgstr "Одговор канте одлагања"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Подаци Ñу превелики за једно одлагање. Сачувајте запиÑнике у датотеку."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Прозор за отклањање грешака"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Пошаљи у канту одлагања"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Пауза"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Ðиво "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Уклањање грешака"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Подаци"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Порука"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Упозорење"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "Критичан"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Грешка"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Чак и ако они не прикажу лозинке, дневници могу да Ñадрже оÑетљиве податке "
+"као што је ваш ÑпиÑак контаката или поруке које Ñте недавно поÑлали или "
+"примили.\n"
+"Ðко не желите да видите такве податке доÑтупне у јавном извештају о "
+"грешкама, можете да изаберете да ограничите видљивоÑÑ‚ ваших грешака "
+"програмерима Интернет пиÑмоноше када извештавате о њима приказујући напредна "
+"поља у <a "
+"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">извештају о "
+"грешци</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Време"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Домен"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Категорија"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Ðиво"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3861,7 +3904,7 @@ msgstr "Позвани Ñте да Ñе придружите у %s"
msgid "Incoming file transfer from %s"
msgstr "Долазни Ð¿Ñ€ÐµÐ½Ð¾Ñ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ од %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Потребна је лозинка"
@@ -4213,7 +4256,7 @@ msgstr "Приказује групе"
msgid "Show account balances"
msgstr "Приказује помоћника налога"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
msgid "Contact List"
msgstr "СпиÑак пријатеља"
@@ -4379,65 +4422,89 @@ msgstr "Варијанта:"
msgid "Themes"
msgstr "Теме"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "УнеÑите лозинку"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Прекини везу"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Морате да подеÑите налог да биÑте овде видели контакте."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Извините, %s налози не могу бити коришћени Ñве док не ажурирате ваш %s "
"Ñофтвер."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Виндоуз уживо"
+
+#: ../src/empathy-roster-window.c:674
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "ФејÑбук"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s налог захтева овлашћење"
+
+#: ../src/empathy-roster-window.c:700
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "Ðалози на мрежи"
+
+#: ../src/empathy-roster-window.c:747
msgid "Update software..."
msgstr "Ðжурирај Ñофтвер..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:753
msgid "Reconnect"
msgstr "Поново Ñе повежи"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:757
msgid "Edit Account"
msgstr "Измени налог"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:762
msgid "Close"
msgstr "Затвори"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:904
msgid "Top up account"
msgstr "Допуните кредит налога"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1590
msgid "You need to enable one of your accounts to see contacts here."
msgstr ""
"Морате да укључите један од ваших налога да биÑте овде видели контакте."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1598
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Морате да укључите %s да биÑте овде видели контакте."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1676
msgid "Change your presence to see contacts here"
msgstr "Измените ваше приÑуÑтво да видите контакте"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1685
msgid "No match found"
msgstr "Ðема поклапања"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "Још увек ниÑте додали ниједан контакт"
+
+#: ../src/empathy-roster-window.c:1695
msgid "No online contacts"
msgstr "Ðема конаката на мрежи"
@@ -4514,6 +4581,16 @@ msgstr "Подешавања налога"
msgid "Go _Online"
msgstr "Иди _на мрежу"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "Прикажи _контакте ван мреже"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Додај контакт..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Ðови разговор…"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 4f6df8c64..9080ae33a 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,5 +1,5 @@
# Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2013.
# This file is distributed under the same license as the Empathy package.
# From Pidgin translation:
# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,14 +11,14 @@
# Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
# Miloš Popović <gpopac@gmail.com>, 2010.
# Branko Kokanović <branko.kokanovic@gmail.com>, 2011.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
"y&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-27 08:31+0000\n"
-"PO-Revision-Date: 2012-09-29 19:49+0200\n"
+"POT-Creation-Date: 2013-01-09 14:05+0000\n"
+"PO-Revision-Date: 2013-01-18 10:24+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <gnom@prevod.org>\n"
"Language: sr\n"
@@ -47,6 +47,10 @@ msgstr ""
"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
"ćaskanje"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "ćaskanje;razgovor;bp;im;poruka;irc;voip;grazgovor;fejsbuk;džaber;"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "Da li će biti korišćen upravnik mrežom"
@@ -423,8 +427,8 @@ msgstr "Uređaj kamerice"
#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr ""
-"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
-"video0“."
+"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. "
+"„/dev/video0“."
#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
@@ -784,11 +788,11 @@ msgstr "Ljudi u okolini"
msgid "Yahoo! Japan"
msgstr "Jahu! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
msgid "Google Talk"
msgstr "Gugl razgovor"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Fejsbuk ćaskanje"
@@ -890,7 +894,7 @@ msgstr "Server"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "PrikljuÄnik"
@@ -954,7 +958,7 @@ msgstr "_KorisniÄko ime"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> korisniÄko_ime"
+msgstr "<b>Primer:</b> korisniÄko-ime"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise User ID?"
@@ -1532,7 +1536,7 @@ msgstr "nije podržano"
msgid "unknown"
msgstr "nepoznato"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "Tema:"
@@ -1646,9 +1650,9 @@ msgstr "%s je sada poznat kao %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "Veza je prekinuta"
@@ -1721,7 +1725,7 @@ msgstr "Izmeni blokirane prijatelje"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1826,12 +1830,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "Molim vas obavestite me kada ste na mreži. Hvala!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "SaÄuvaj sliku"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "Ne mogu da saÄuvam sliku"
@@ -1971,47 +1975,47 @@ msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:177
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
msgid "Select account to use to place the call"
msgstr "Izaberite nalog koji će biti korišćen za poziv"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "Poziv"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "Mobile"
msgstr "Mobilni"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:424
msgid "Work"
msgstr "Posao"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:426
msgid "HOME"
msgstr "KUĆA"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:669
msgid "_Block Contact"
msgstr "_Blokiraj kontakt"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Delete and _Block"
msgstr "Izbriši i _blokiraj"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:796
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2020,75 +2024,75 @@ msgstr ""
"Da li stvarno želite da uklonite uvezani kontakt „%s“? Ovo će ukloniti i sve "
"kontakte koji su vezani za ovaj kontakt."
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:807
msgid "Removing contact"
msgstr "Uklanjam prijatelja"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-menu.c:871
#: ../libempathy-gtk/empathy-individual-view.c:2453
msgid "_Remove"
msgstr "_Ukloni"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "Ća_skanje"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio poziv"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video poziv"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Prethodni razgovori"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
msgid "Send File"
msgstr "Pošalji datoteku"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
msgid "Share My Desktop"
msgstr "Podeli moju radnu površ"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "Omiljeni"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
msgid "Infor_mation"
msgstr "_Podaci"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Uredi"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
-#: ../src/empathy-chat-window.c:1233
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "Pozivam vas u ovu sobu"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
msgid "_Invite to Chat Room"
msgstr "Pozov_i u sobu za ćaskanje"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
msgid "_Add Contact…"
msgstr "Dod_aj prijatelja…"
@@ -2222,16 +2226,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%e.%d.%Y u %R KUV"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "Nadimak:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identifikator:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2252,15 +2256,15 @@ msgstr "Na vezi preko telefona ili mobilnog uređaja"
msgid "New Network"
msgstr "Nova mreža"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
msgid "Choose an IRC network"
msgstr "Odaberite IRC mrežu"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
msgid "Reset _Networks List"
msgstr "Resetuj _mrežni spisak"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Izaberi"
@@ -2269,7 +2273,7 @@ msgstr "Izaberi"
msgid "new server"
msgstr "novi server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2319,25 +2323,25 @@ msgid "Chat with %s"
msgstr "Ćaskanje sa %s"
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
@@ -2346,7 +2350,7 @@ msgstr[1] "%s sekunde"
msgstr[2] "%s sekundi"
msgstr[3] "jedne sekunde"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
@@ -2355,81 +2359,81 @@ msgstr[1] "%s minuta"
msgstr[2] "%s minuta"
msgstr[3] "jednog minuta"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Poziv je zapoÄet %s, a zavrÅ¡en je %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "Danas"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "JuÄe"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%e. %B %Y."
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "Bilo kad"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "Bilo ko"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "Ko"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "Kada"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Bilo Å¡ta"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "Pisana ćaskanja"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Pozivi"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "Dolazni pozivi"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "Odlazeći pozivi"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "Propušteni pozivi"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "Å ta"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr ""
"Da li ste sigurni da želite da obrišete sve dnevnike prethodnih razgovora?"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "OÄisti sve"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "Obriši od:"
@@ -2451,12 +2455,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Ćaskanje"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "Video"
@@ -2685,12 +2689,12 @@ msgstr "_Odbij"
msgid "_Accept"
msgstr "_Prihvati"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "Poruka je uređena %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "Normalno"
@@ -2805,15 +2809,20 @@ msgid "<b>Personal Details</b>"
msgstr "<b>LiÄni podaci</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "Umnoži _adresu veze"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "Otvori _vezu"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Ispitaj HTML"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "Tekući lokalitet"
@@ -2982,7 +2991,6 @@ msgid "Vietnamese"
msgstr "vijetnamski"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contacts"
msgid "Top Contacts"
msgstr "Najbolji prijatelji"
@@ -2990,6 +2998,13 @@ msgstr "Najbolji prijatelji"
msgid "Ungrouped"
msgstr "Negrupisano"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Server ne može da nađe kontakt: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "Nema poruka o greškama"
@@ -3046,6 +3061,7 @@ msgstr ""
"Nikola Kotur <kotnik@ns-linux.org>\n"
"Miloš Popović <gpopac@gmail.com>\n"
"Branko Kokanović <branko.kokanovic@gmail.com>\n"
+"Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
"\n"
"Prevod.org — prevod na srpski jezik."
@@ -3090,7 +3106,7 @@ msgstr "Postoje nesaÄuvane izmene na vaÅ¡em nalogu %s."
msgid "Your new account has not been saved yet."
msgstr "VaÅ¡ novi nalog joÅ¡ nije saÄuvan."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
msgid "Connecting…"
msgstr "Povezujem se…"
@@ -3130,20 +3146,20 @@ msgstr "Nepovezan — Nalog je onemogućen"
msgid "Edit Connection Parameters"
msgstr "Uredite parametre povezivanja"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_Uredi parametre povezivanja..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vaÅ¡eg raÄunara?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "Ovo neće ukloniti vaš nalog na serveru."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3152,24 +3168,24 @@ msgstr ""
"Da li sigurno želite da nastavite?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_UkljuÄen"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "Preimenuj"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_PreskoÄi"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_Poveži se"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3178,7 +3194,7 @@ msgstr ""
"Da li sigurno želite da nastavite?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "Nalozi za dopisivanje i VoIP"
@@ -3240,11 +3256,16 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "Dolazni poziv"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "— Internet pismonoša Audio/Video klijent"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Internet pismonoša Audio/Video klijent"
@@ -3253,33 +3274,27 @@ msgstr "Internet pismonoša Audio/Video klijent"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s je pokušao da vas zove, ali ste vi bili na drugoj vezi."
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Dolazni poziv"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "Dolazni video poziv od %s"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "Poziva vas „%s“"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1564
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "Odbaci"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1565
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3287,74 +3302,74 @@ msgstr "Javi se"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1934
#, c-format
msgid "Call with %s"
msgstr "Poziv sa korisnikom %s"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2186
msgid "The IP address as seen by the machine"
msgstr "IP adresa kako je vidi ovaj raÄunar"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2188
msgid "The IP address as seen by a server on the Internet"
msgstr "IP adresa kako je vidi server na internetu"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2190
msgid "The IP address of the peer as seen by the other side"
msgstr "IP adresa vršnjaka kako je vidi druga strana"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2192
msgid "The IP address of a relay server"
msgstr "IP adresa relejnog servera"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2194
msgid "The IP address of the multicast group"
msgstr "IP adresa grupe za višestruko emitovanje"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "Nepoznato"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2966
msgid "On hold"
msgstr "Na Äekanju"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2970
msgid "Mute"
msgstr "Utišaj"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2972
msgid "Duration"
msgstr "Trajanje"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2975
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3071
msgid "Technical Details"
msgstr "TehniÄki detalji"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "Program %s ne razume nijedan zvuÄni format koji podržava vaÅ¡ raÄunar"
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3115
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "Program %s ne razume nijedan video format koji podržava vaÅ¡ raÄunar"
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3121
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3363,23 +3378,23 @@ msgstr ""
"Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
"ne dozvoljava direktne veze."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3127
msgid "There was a failure on the network"
msgstr "Došlo je do greške u mreži"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3131
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"ZvuÄni formati potrebni za ovaj poziv nisu instalirani na vaÅ¡em raÄunaru"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3134
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Video formati potrebni za ovaj poziv nisu instalirani na vaÅ¡em raÄunaru"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3146
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3390,32 +3405,32 @@ msgstr ""
"„%s“>ovu greÅ¡ku</a> i prikaÄite dnevnike pokupljene iz prozora „Otklanjanje "
"grešaka“ u izborniku „Pomoć“."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3155
msgid "There was a failure in the call engine"
msgstr "Došlo je do greške u motoru za pozive"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3158
msgid "The end of the stream was reached"
msgstr "Dostignut je kraj toka"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3198
msgid "Can't establish audio stream"
msgstr "Ne mogu da uspostavim zvuÄni tok"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3208
msgid "Can't establish video stream"
msgstr "Ne mogu da uspostavim video tok"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3245
#, c-format
msgid "Your current balance is %s."
msgstr "Vaše trenutno stanje je %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3249
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Izvinite, ali nemate dovoljno kredita za ovaj poziv."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3251
msgid "Top Up"
msgstr "Dopuni"
@@ -3452,78 +3467,86 @@ msgid "_Debug"
msgstr "_Uklanjanje grešaka"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_Gstrimer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepatija"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "Razmeni kameru"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Umanji me"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Uvećaj me"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "IskljuÄite kamericu"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "Prekini"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "Prekinite trenutni poziv"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "Video poziv"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "ZapoÄnite video poziv"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "ZapoÄnite audio poziv"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "Prikaži brojÄanik"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "Prikažite brojÄanik"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "UkljuÄi/iskljuÄi prenos videa"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "UkljuÄi/iskljuÄi prenos zvuka"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "Kodek za kodiranje:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "Kodek za dekodiranje:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "Udaljeni kandidat:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "Lokalni kandidat:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Zvuk"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
msgstr "— Pismonoša program za ćaskanje"
@@ -3543,11 +3566,11 @@ msgstr "Automatsko povezivanje"
msgid "Manage Favorite Rooms"
msgstr "Uredi omiljene sobe"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "Da zatvorim ovaj prozor?"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3556,7 +3579,7 @@ msgstr ""
"Zatvaranjem ovog prozora biće napušteno %s. Nećete primati nikakve buduće "
"poruke sve dok se ponovo ne pridružite."
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3577,12 +3600,12 @@ msgstr[3] ""
"Zatvaranjem ovog prozora biće napuštena jedna soba za ćaskanje. Nećete primati "
"nikakve buduće poruke sve dok se ponovo ne pridružite."
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "Da napustim %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3590,15 +3613,15 @@ msgstr ""
"Nećete primati nikakve buduće poruke iz ove sobe za ćaskanje sve dok joj se "
"ponovo ne pridružite."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "Zatvori prozor"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "Napusti sobu"
-#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3607,7 +3630,7 @@ msgstr[1] "%s (%d neproÄitane)"
msgstr[2] "%s (%d neproÄitanih)"
msgstr[3] "%s (jedna neproÄitana)"
-#: ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3616,7 +3639,7 @@ msgstr[1] "%s (i %u druge)"
msgstr[2] "%s (i %u drugih)"
msgstr[3] "%s (i jedna druga)"
-#: ../src/empathy-chat-window.c:696
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3625,7 +3648,7 @@ msgstr[1] "%s (%d neproÄitane od ostalih)"
msgstr[2] "%s (%d neproÄitanih od ostalih)"
msgstr[3] "%s (jedna neproÄitana od ostalih)"
-#: ../src/empathy-chat-window.c:705
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3634,11 +3657,11 @@ msgstr[1] "%s (%d neproÄitane od svih)"
msgstr[2] "%s (%d neproÄitanih od svih)"
msgstr[3] "%s (jedna neproÄitana od svih)"
-#: ../src/empathy-chat-window.c:942
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:950
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
@@ -3647,7 +3670,7 @@ msgstr[1] "Å aljem %d poruke"
msgstr[2] "Å aljem %d poruka"
msgstr[3] "Å aljem jednu poruku"
-#: ../src/empathy-chat-window.c:970
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "Piše poruku."
@@ -3739,63 +3762,83 @@ msgstr "Odgovor kante odlaganja"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "Podaci su preveliki za jedno odlaganje. SaÄuvajte zapisnike u datoteku."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "Prozor za otklanjanje grešaka"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "Pošalji u kantu odlaganja"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "Pauza"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "Nivo "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "Uklanjanje grešaka"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "Podaci"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "Poruka"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "Upozorenje"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "KritiÄan"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "Greška"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Čak i ako oni ne prikažu lozinke, dnevnici mogu da sadrže osetljive podatke "
+"kao što je vaš spisak kontakata ili poruke koje ste nedavno poslali ili "
+"primili.\n"
+"Ako ne želite da vidite takve podatke dostupne u javnom izveštaju o "
+"greÅ¡kama, možete da izaberete da ograniÄite vidljivost vaÅ¡ih greÅ¡aka "
+"programerima Internet pismonoše kada izveštavate o njima prikazujući napredna "
+"polja u <a "
+"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">izveštaju o "
+"grešci</a>."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "Vreme"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "Domen"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "Kategorija"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "Nivo"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3861,7 +3904,7 @@ msgstr "Pozvani ste da se pridružite u %s"
msgid "Incoming file transfer from %s"
msgstr "Dolazni prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "Potrebna je lozinka"
@@ -4213,7 +4256,7 @@ msgstr "Prikazuje grupe"
msgid "Show account balances"
msgstr "Prikazuje pomoćnika naloga"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
msgid "Contact List"
msgstr "Spisak prijatelja"
@@ -4379,65 +4422,89 @@ msgstr "Varijanta:"
msgid "Themes"
msgstr "Teme"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "Unesite lozinku"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "Prekini vezu"
-#: ../src/empathy-roster-window.c:442
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "Morate da podesite nalog da biste ovde videli kontakte."
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr ""
"Izvinite, %s nalozi ne mogu biti korišćeni sve dok ne ažurirate vaš %s "
"softver."
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Vindouz uživo"
+
+#: ../src/empathy-roster-window.c:674
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "Fejsbuk"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s nalog zahteva ovlašćenje"
+
+#: ../src/empathy-roster-window.c:700
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "Nalozi na mreži"
+
+#: ../src/empathy-roster-window.c:747
msgid "Update software..."
msgstr "Ažuriraj softver..."
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:753
msgid "Reconnect"
msgstr "Ponovo se poveži"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:757
msgid "Edit Account"
msgstr "Izmeni nalog"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:762
msgid "Close"
msgstr "Zatvori"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:904
msgid "Top up account"
msgstr "Dopunite kredit naloga"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1590
msgid "You need to enable one of your accounts to see contacts here."
msgstr ""
"Morate da ukljuÄite jedan od vaÅ¡ih naloga da biste ovde videli kontakte."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1598
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Morate da ukljuÄite %s da biste ovde videli kontakte."
-#: ../src/empathy-roster-window.c:1556
+#: ../src/empathy-roster-window.c:1676
msgid "Change your presence to see contacts here"
msgstr "Izmenite vaše prisustvo da vidite kontakte"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1685
msgid "No match found"
msgstr "Nema poklapanja"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "Još uvek niste dodali nijedan kontakt"
+
+#: ../src/empathy-roster-window.c:1695
msgid "No online contacts"
msgstr "Nema konakata na mreži"
@@ -4514,6 +4581,16 @@ msgstr "Podešavanja naloga"
msgid "Go _Online"
msgstr "Idi _na mrežu"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "Prikaži _kontakte van mreže"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Dodaj kontakt..."
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "_Novi razgovor…"
diff --git a/po/ta.po b/po/ta.po
index bfdb14075..198938736 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -11,15 +11,15 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.master.ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-09 12:39+0530\n"
-"PO-Revision-Date: 2012-12-09 12:45+0530\n"
-"Last-Translator: Dr.T.Vasudevan <drtvasudevan@gmail.com>\n"
-"Language-Team: American English <gnome-tamil-translation@googlegroups.com>\n"
+"POT-Creation-Date: 2012-11-15 16:31+0530\n"
+"PO-Revision-Date: 2012-11-15 17:23+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
"\n"
"\n"
@@ -29,479 +29,24 @@ msgstr ""
"\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "எமà¯à®ªà®¤à®¿"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "கூகà¯à®³à¯ டாகà¯, ஃபேஸà¯à®ªà¯à®•à¯, எமà¯à®Žà®¸à¯à®Žà®©à¯, மறà¯à®±à¯à®®à¯ பல அரடà¯à®Ÿà¯ˆ சேவைகளில௠அரடà¯à®Ÿà¯ˆ அடிகà¯à®•. "
#: ../data/empathy.desktop.in.in.h:2
-msgid "IM Client"
-msgstr "஠எம௠சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
+msgid "Empathy"
+msgstr "எமà¯à®ªà®¤à®¿"
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
msgstr "எமà¯à®ªà®¤à®¿ இணைய செயà¯à®¤à®¿à®¯à®¾à®³à®°à¯ "
#: ../data/empathy.desktop.in.in.h:4
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"கூகà¯à®³à¯ டாகà¯, ஃபேஸà¯à®ªà¯à®•à¯, எமà¯à®Žà®¸à¯à®Žà®©à¯, மறà¯à®±à¯à®®à¯ பல அரடà¯à®Ÿà¯ˆ சேவைகளில௠அரடà¯à®Ÿà¯ˆ அடிகà¯à®•. "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:1
-msgid "Connection managers should be used"
-msgstr "இணைபà¯à®ªà¯ மேலாளரை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"இணைபà¯à®ªà¯ மேலாளரà¯à®•à®³à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• இணைகà¯à®•/ மீணà¯à®Ÿà¯à®®à¯ இணைகà¯à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ "
-"இலà¯à®²à¯ˆà®¯à®¾"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:3
-msgid "Empathy should auto-connect on startup"
-msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ தானியஙà¯à®•à®¿à®¯à®¾à®• இணைகà¯à®• வேணà¯à®Ÿà¯à®®à¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:4
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"எமà¯à®ªà®¤à®¿ தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ கணகà¯à®•à¯à®•à®³à®¿à®²à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• உளà¯à®¨à¯à®´à¯ˆà®¯ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:5
-msgid "Empathy should auto-away when idle"
-msgstr "சà¯à®®à¯à®®à®¾ இரà¯à®•à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ தானியஙà¯à®•à®¿à®¯à®¾à®• வெளியே இரà¯à®ªà¯à®ªà®¤à®¾à®• வேணà¯à®Ÿà¯à®®à¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"பயனர௠சà¯à®®à¯à®®à®¾ இரà¯à®•à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• எமà¯à®ªà®¤à®¿ வெளியே பாஙà¯à®•à®¿à®±à¯à®•à¯ செலà¯à®² "
-"வேணà¯à®Ÿà¯à®®à®¾ "
-"இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:7
-msgid "Empathy default download folder"
-msgstr "எமà¯à®ªà®¤à®¿ à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ தரவிறகà¯à®• அடைவà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:8
-msgid "The default folder to save file transfers in."
-msgstr "இடமாறà¯à®±à®¿à®¯ கோபà¯à®ªà¯à®•à®³à¯ˆ சேமிகà¯à®• à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அடைவà¯"
-
-#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.h:10
-msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr ""
-" சà¯à®¤à¯à®¤à®®à¯ செயà¯à®¯à¯à®®à¯ செயலà¯à®•à®³à¯ இயகà¯à®•à®ªà®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾ என தீரà¯à®®à®¾à®©à®¿à®•à¯à®• மநà¯à®¤à®¿à®° எணà¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c இநà¯à®¤ எணà¯à®£à¯ˆ சà¯à®¤à¯à®¤à®®à¯ செயà¯à®¯à¯à®®à¯ செயலà¯à®•à®³à¯ இயகà¯à®•à®ªà®Ÿ "
-"வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾ என தீரà¯à®®à®¾à®©à®¿à®•à¯à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•à®¿à®±à®¤à¯. கைமà¯à®±à¯ˆà®¯à®¾à®• பயனரà¯à®•à®³à¯ இநà¯à®¤ "
-"எணà¯à®£à¯ˆ மாறà¯à®±à®•à¯à®•à¯‚டாதà¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:12
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show offline contacts"
-msgstr " வலை தொடரà¯à®ªà®¿à®²à¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:13
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ இணைபà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:14
-msgid "Show Balance in contact list"
-msgstr "தொடரà¯à®ªà¯à®•à®³à¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ மீதியை காடà¯à®Ÿà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:15
-msgid "Whether to show account balances in the contact list."
-msgstr " தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ கணகà¯à®•à¯ மீதியை காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:16
-msgid "Hide main window"
-msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மறை "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:17
-msgid "Hide the main window."
-msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மறை "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:18
-msgid "Default directory to select an avatar image from"
-msgstr "அவதாரம௠படம௠தேநà¯à®¤à¯†à®Ÿà¯à®•à¯à®• à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அடைவà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:19
-msgid "The last directory that an avatar image was chosen from."
-msgstr "அவதாரம௠படம௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கடைசி அடைவ௠"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:20
-msgid "Open new chats in separate windows"
-msgstr "பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆà®•à®³à¯ˆ தனி சாளரதà¯à®¤à®¿à®²à¯ திற"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:21
-msgid "Always open a separate chat window for new chats."
-msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆà®•à¯à®•à¯ பà¯à®¤à®¿à®¯ சாளரம௠திற"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:22
-msgid "Display incoming events in the status area"
-msgstr "உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ நிலைபà¯à®ªà®²à®• இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ நிலை அறிவிபà¯à®ªà¯ இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•. இலà¯à®²à¯ˆ என அமைநà¯à®¤à®¾à®²à¯ "
-"பயனரà¯à®•à¯à®•à¯ உடனே "
-"காடà¯à®Ÿà¯à®•."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:24
-msgid "The position for the chat window side pane"
-msgstr "அரடà¯à®Ÿà¯ˆ சாளரதà¯à®¤à®¿à®©à¯ பகà¯à®•à®ªà¯ பலக இடம௠"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:25
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "அரடà¯à®Ÿà¯ˆ பகà¯à®•à®ªà¯ பலகதà¯à®¤à®¿à®©à¯ சேமிதà¯à®¤ இடம௠(பிகà¯à®¸à®²à¯à®•à®³à®¿à®²à¯)"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:26
-msgid "Show contact groups"
-msgstr "தொடரà¯à®ªà¯ கà¯à®´à¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿà¯ "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:27
-msgid "Whether to show groups in the contact list."
-msgstr " தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ கà¯à®´à¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:28
-msgid "Use notification sounds"
-msgstr "அறிவிபà¯à®ªà¯ ஒலிகளை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:29
-msgid "Whether to play a sound to notify of events."
-msgstr "நிகழà¯à®µà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:30
-msgid "Disable sounds when away"
-msgstr "வெளியே உளà¯à®³ போத௠ஒலியை செயல௠நீகà¯à®•à¯à®•"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:31
-msgid "Whether to play sound notifications when away or busy."
-msgstr "வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠ஒலி அறிகà¯à®•à¯ˆà®•à®³à¯ˆ இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:32
-msgid "Play a sound for incoming messages"
-msgstr "உளà¯à®µà®°à¯à®®à¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:33
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "செயà¯à®¤à®¿à®•à®³à¯ உளà¯à®µà®°à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:34
-msgid "Play a sound for outgoing messages"
-msgstr "வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:35
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "செயà¯à®¤à®¿à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:36
-msgid "Play a sound for new conversations"
-msgstr "உளà¯à®µà®°à¯à®®à¯ உரையாடலà¯à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:37
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "பà¯à®¤à®¿à®¯ உரையாடலà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:38
-msgid "Play a sound when a contact logs in"
-msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:39
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:40
-msgid "Play a sound when a contact logs out"
-msgstr "தொடரà¯à®ªà¯ வெளி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:42
-msgid "Play a sound when we log in"
-msgstr "நாம௠உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:43
-msgid "Whether to play a sound when logging into a network."
-msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:44
-msgid "Play a sound when we log out"
-msgstr "நாம௠வெளி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:45
-msgid "Whether to play a sound when logging out of a network."
-msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:46
-msgid "Enable popup notifications for new messages"
-msgstr "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ தà¯à®³à¯à®³à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:47
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:48
-msgid "Disable popup notifications when away"
-msgstr "வெளியே உளà¯à®³ போத௠தà¯à®³à¯à®³à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயல௠நீகà¯à®•à¯à®•"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:49
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:50
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à¯ˆà®¯à®¾à®©à®¾à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ அரடà¯à®Ÿà¯ˆ திறநà¯à®¤à¯ இரà¯à®¨à¯à®¤à¯ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ "
-"இலà¯à®²à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯à®®à¯ தà¯à®³à¯à®³à¯ "
-"அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:52
-msgid "Pop up notifications when a contact logs in"
-msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:53
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà®¿à®²à¯ வரà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:54
-msgid "Pop up notifications when a contact logs out"
-msgstr "தொடரà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:55
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:56
-msgid "Use graphical smileys"
-msgstr "வரைகலை சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:57
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "உரையாடலà¯à®•à®³à®¿à®²à¯ சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ வரைகலை படஙà¯à®•à®³à®¾à®• மாறà¯à®± வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:58
-msgid "Show contact list in rooms"
-msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠அறைகளில௠காடà¯à®Ÿà¯ "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:59
-msgid "Whether to show the contact list in chat rooms."
-msgstr "அரடà¯à®Ÿà¯ˆ அறையில௠தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:60
-msgid "Chat window theme"
-msgstr "அரடà¯à®Ÿà¯ˆ சாளர கரà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "அரடà¯à®Ÿà¯ˆ சாளரஙà¯à®•à®³à®¿à®²à¯ உரையாடலà¯à®•à®³à¯ˆ காடà¯à®Ÿ பயனà¯à®ªà®Ÿà¯à®®à¯ கரà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:62
-msgid "Chat window theme variant"
-msgstr "அரடà¯à®Ÿà¯ˆ சாளர மாறà¯à®±à¯ கரà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "அரடà¯à®Ÿà¯ˆ சாளரஙà¯à®•à®³à®¿à®²à¯ உரையாடலà¯à®•à®³à¯ˆ காடà¯à®Ÿ பயனà¯à®ªà®Ÿà¯à®®à¯ மாறà¯à®±à¯ கரà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:64
-msgid "Path of the Adium theme to use"
-msgstr "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà®¿à®¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯à®•à¯à®•à¯ பாதை"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
-msgstr ""
-"அரடà¯à®Ÿà¯ˆ அறைகளில௠எடியம௠கரà¯à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾à®©à®¾à®²à¯ அதன௠பாதை. கை "
-"விடபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:66
-msgid "Enable WebKit Developer Tools"
-msgstr "வெபà¯à®•à®¿à®Ÿà¯ உரà¯à®µà®¾à®•à¯à®•à¯à®µà¯‹à®°à¯ கரà¯à®µà®¿à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"வெப௠ஆயà¯à®µà®¾à®³à®°à¯ போனà¯à®± வெபà¯à®•à®¿à®Ÿà¯ உரà¯à®µà®¾à®•à¯à®•à¯à®µà¯‹à®°à¯ கரà¯à®µà®¿à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:68
-msgid "Inform other users when you are typing to them"
-msgstr "மறà¯à®± பயனரà¯à®•à®³à¯à®•à¯à®•à¯ அவரà¯à®•à®³à¯à®•à¯à®•à®¾à®• தடà¯à®Ÿà®šà¯à®šà¯à®®à¯ போத௠தெரிவிகà¯à®•à®µà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"'உரà¯à®µà®¾à®•à¯à®•à®®à¯ ' அலà¯à®²à®¤à¯ 'இடைநிறà¯à®¤à¯à®¤à®®à¯' அரடà¯à®Ÿà¯ˆ நிலைகளை அனà¯à®ªà¯à®ªà®µà®¾. இத௠நடபà¯à®ªà¯ "
-"'போயாயிறà¯à®±à¯' "
-"நிலையை பாதிகà¯à®•à®¾à®¤à¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:70
-msgid "Use theme for chat rooms"
-msgstr "அரடà¯à®Ÿà¯ˆ அறைகளà¯à®•à¯à®•à¯ கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:71
-msgid "Whether to use the theme for chat rooms."
-msgstr "அரடà¯à®Ÿà¯ˆ அறைகளில௠கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:72
-msgid "Spell checking languages"
-msgstr "எழà¯à®¤à¯à®¤à¯à®ªà¯à®ªà®¿à®´à¯ˆ திரà¯à®¤à¯à®¤ மொழி"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"சொல௠திரà¯à®¤à¯à®¤à®¿ மொழிகளை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ காற௠பà¯à®³à¯à®³à®¿à®¯à®¾à®²à¯ பிரிதà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ (எ-டà¯. "
-"\"en, fr, nl "
-"\")"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:74
-msgid "Enable spell checker"
-msgstr "சொல௠திரà¯à®¤à¯à®¤à®¿à®¯à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "நீஙà¯à®•à®³à¯ விரà¯à®®à¯à®ªà®¿à®¯ மொழிகளில௠உளà¯à®³à®¿à®Ÿà¯à®Ÿ சொறà¯à®•à®³à¯ˆ சோதிகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:76
-msgid "Nick completed character"
-msgstr "செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯ˆ பூரà¯à®¤à¯à®¤à®¿ செயà¯à®¯à¯à®®à¯ எழà¯à®¤à¯à®¤à¯à®°à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"கà¯à®´à¯ அரடà¯à®Ÿà¯ˆà®¯à®¿à®²à¯ செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯ கீறà¯à®±à®¿à®²à¯ செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯à®•à¯à®•à¯à®ªà¯à®ªà®¿à®©à¯ சேரà¯à®•à¯à®• வேணà¯à®Ÿà®¿à®¯ "
-"எழà¯à®¤à¯à®¤à¯à®°à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:78
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ அரடà¯à®Ÿà¯ˆ சாரளதà¯à®¤à®¿à®²à¯ சினà¯à®©à®®à®¾à®• தொடரà¯à®ªà®¿à®©à¯ அவதாரதà¯à®¤à¯ˆ காடà¯à®Ÿ "
-"வேணà¯à®Ÿà¯à®®à¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"எமà¯à®ªà®¤à®¿ தொடரà¯à®ªà®¿à®©à¯ அவதாரதà¯à®¤à¯ˆ அரடà¯à®Ÿà¯ˆ அறை சினà¯à®©à®®à®¾à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:80
-msgid "Last account selected in Join Room dialog"
-msgstr "அறையில௠சேர௠உரையாடலில௠கடைசியாக தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கணகà¯à®•à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:81
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "ஒர௠அறையில௠சேர கடைசியாக தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கணகà¯à®•à®¿à®©à¯ டி-பஸ௠பொரà¯à®³à¯ பாதை"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:82
-msgid "Camera device"
-msgstr "கேமரா சாதனமà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:83
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "விடியோ அழைபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ கேமரா சாதனமà¯. எ-கா. /dev/video0."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:84
-msgid "Camera position"
-msgstr "கேமரா நிலை"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:85
-msgid "Position the camera preview should be during a call."
-msgstr "அழைபà¯à®ªà®¿à®©à¯ போத௠காமிரா à®®à¯à®©à¯ பாரà¯à®µà¯ˆ இரà¯à®ªà¯à®ªà¯à®•à¯à®•à¯ இடமà¯."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:86
-msgid "Echo cancellation support"
-msgstr "எதிரொலி நீகà¯à®•à®¿ ஆதரவà¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:87
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "பலà¯à®¸à¯à®†à®Ÿà®¿à®¯à¯‹ எதிரொலி நீகà¯à®•à®¿ வடிபà¯à®ªà®¿à®¯à¯ˆ செயலாகà¯à®•à®µà®¾"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:88
-msgid "Show hint about closing the main window"
-msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடிவத௠கà¯à®±à®¿à®¤à¯à®¤à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ காடà¯à®Ÿà¯ "
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"தலைபà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®¿à®²à¯ x பொதà¯à®¤à®¾à®©à®¾à®²à¯ à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடà¯à®µà®¤à¯ˆ கà¯à®±à®¿à®¤à¯à®¤ உரையாடலை "
-"காடà¯à®Ÿ "
-"வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:90
-msgid "Empathy can publish the user's location"
-msgstr "பயனரின௠இடதà¯à®¤à¯ˆ தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ காடà¯à®Ÿ இயலà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:91
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "பயனரின௠இடதà¯à®¤à¯ˆ தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ எமà¯à®ªà®¤à®¿ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• அலைபேசி வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• அலைபேசி வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• ஜிபிஎஸ௠஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• ஜிபிஎஸ௠஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
-msgid "Empathy should reduce the location's accuracy"
-msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடததின௠கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• வேணà¯à®Ÿà¯à®®à¯."
+msgid "IM Client"
+msgstr "஠எம௠சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"அநà¯à®¤à®°à®™à¯à®•à®¤à¯à®¤à¯ˆ காபà¯à®ªà®¾à®±à¯à®± தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• "
-"வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "அரடà¯à®Ÿà¯ˆ;பேசà¯à®šà¯;செயà¯à®¤à®¿;à®à®†à®°à¯à®šà®¿;வாயà¯à®ªà¯;ஜிடாகà¯;பேஸà¯à®ªà¯à®•à¯;ஜாபரà¯;"
#: ../libempathy/empathy-ft-handler.c:733
msgid "No reason was specified"
@@ -732,8 +277,7 @@ msgid "This account is already connected to the server"
msgstr "இநà¯à®¤ கணகà¯à®•à¯ à®à®±à¯à®•à®©à®µà¯‡ சேவையகதà¯à®¤à¯à®•à¯à®•à¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
#: ../libempathy/empathy-utils.c:350
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+msgid "Connection has been replaced by a new connection using the same resource"
msgstr "இணைபà¯à®ªà¯ அதே à®®à¯à®²à®¤à¯à®¤à¯à®Ÿà®©à¯ பà¯à®¤à®¿à®¯ இணைபà¯à®ªà®¾à®²à¯ மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯."
#: ../libempathy/empathy-utils.c:353
@@ -749,11 +293,9 @@ msgid "Certificate has been revoked"
msgstr "சானà¯à®±à®¿à®¤à®´à¯ ரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
#: ../libempathy/empathy-utils.c:359
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
-"சானà¯à®±à®¿à®¤à®´à¯ பாதà¯à®•à®¾à®ªà¯à®ªà®¿à®²à¯à®²à®¾à®¤ சைபர௠அலà¯à®•à¯‹à®°à®¿à®¤à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•à®¿à®±à®¤à¯. இத௠"
-"மறையாகà¯à®•à®¤à¯à®¤à®¿à®²à¯ "
+"சானà¯à®±à®¿à®¤à®´à¯ பாதà¯à®•à®¾à®ªà¯à®ªà®¿à®²à¯à®²à®¾à®¤ சைபர௠அலà¯à®•à¯‹à®°à®¿à®¤à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•à®¿à®±à®¤à¯. இத௠மறையாகà¯à®•à®¤à¯à®¤à®¿à®²à¯ "
"பலகீனமானதà¯."
#: ../libempathy/empathy-utils.c:362
@@ -761,8 +303,7 @@ msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
-"சேவயகதà¯à®¤à®¿à®©à¯ சானà¯à®±à®¿à®¤à®´à®¿à®©à¯ நீளம௠அலà¯à®²à®¤à¯ சஙà¯à®•à®¿à®²à®¿à®¯à®¿à®©à¯ ஆழம௠மறையாகà¯à®• நூலகம௠"
-"வரயறà¯à®¤à¯à®¤ மதிபà¯à®ªà¯ˆ "
+"சேவயகதà¯à®¤à®¿à®©à¯ சானà¯à®±à®¿à®¤à®´à®¿à®©à¯ நீளம௠அலà¯à®²à®¤à¯ சஙà¯à®•à®¿à®²à®¿à®¯à®¿à®©à¯ ஆழம௠மறையாகà¯à®• நூலகம௠வரயறà¯à®¤à¯à®¤ மதிபà¯à®ªà¯ˆ "
"தாணà¯à®Ÿà®¿à®¯à®¤à¯."
#: ../libempathy/empathy-utils.c:366
@@ -782,7 +323,7 @@ msgstr "à®…à®°à¯à®•à®¿à®²à¯ உளà¯à®³ மகà¯à®•à®³à¯"
msgid "Yahoo! Japan"
msgstr "யாஹூ! ஜபà¯à®ªà®¾à®©à¯"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:619
msgid "Google Talk"
msgstr "கூகà¯à®³à¯ டாக௠"
@@ -795,100 +336,100 @@ msgid "All accounts"
msgstr "அனைதà¯à®¤à¯ கணகà¯à®•à¯à®•à®³à¯"
#: ../libempathy-gtk/empathy-account-widget-aim.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:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "(_w) கடவà¯à®šà¯à®šà¯Šà®²à¯"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>உதாரணமà¯:</b> என௠திரைபà¯à®ªà¯†à®¯à®°à¯"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "(_N) திரை பெயரà¯"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>உதாரணமà¯:</b> என௠திரைபà¯à®ªà¯†à®¯à®°à¯"
-
-#. remember password ticky box
-#: ../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:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ நினைவ௠கொளà¯à®³à®µà¯à®®à¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Pass_word"
+msgstr "(_w) கடவà¯à®šà¯à®šà¯Šà®²à¯"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
#: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_P தà¯à®±à¯ˆ"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Remember Password"
+msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ நினைவ௠கொளà¯à®³à®µà¯à®®à¯"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "(_S) சேவையகமà¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ நினைவ௠கொளà¯à®³à®µà¯à®®à¯"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "Screen _Name"
+msgstr "(_N) திரை பெயரà¯"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ"
+msgid "What is your AIM password?"
+msgstr "உஙà¯à®•à®³à®¤à¯ AIM கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
msgid "What is your AIM screen name?"
msgstr "உஙà¯à®•à®³à®¤à¯ AIM திரை பெயர௠எனà¯à®©?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "உஙà¯à®•à®³à®¤à¯ AIM கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "_Port"
+msgstr "_P தà¯à®±à¯ˆ"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ நினைவ௠கொளà¯à®³à®µà¯à®®à¯"
+msgid "_Server"
+msgstr "(_S) சேவையகமà¯"
#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../src/empathy-import-widget.c:322
msgid "Account"
msgstr "கணகà¯à®•à¯"
#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
msgid "Server"
msgstr "சேவையகமà¯"
#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "தà¯à®±à¯ˆ"
@@ -943,119 +484,142 @@ msgstr "%s கணகà¯à®•à¯"
msgid "New account"
msgstr "பà¯à®¤à®¿à®¯ கணகà¯à®•à¯"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "உளà¯à®¨à¯à®´à¯ˆ அடையாளம௠(_D)"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
msgid "<b>Example:</b> username"
msgstr "<b>உதாரணமà¯:</b>பயனரà¯à®ªà¯†à®¯à®°à¯"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "Login I_D"
+msgstr "உளà¯à®¨à¯à®´à¯ˆ அடையாளம௠(_D)"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise User ID?"
msgstr "உஙà¯à®•à®³à®¤à¯ GroupWise பயனர௠ID எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise password?"
msgstr "உஙà¯à®•à®³à®¤à¯ GroupWise கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN"
-msgstr "(_U) à®à®šà®¿à®•à¯à®¯à¯‚ (ICQ) யà¯à®à®Žà®©à¯"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
msgid "<b>Example:</b> 123456789"
msgstr "<b>உதாரணமà¯:</b> 123456789"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "Ch_aracter set"
msgstr "_a எழà¯à®¤à¯à®¤à¯à®°à¯ தொகà¯à®¤à®¿"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+msgid "ICQ _UIN"
+msgstr "(_U) à®à®šà®¿à®•à¯à®¯à¯‚ (ICQ) யà¯à®à®Žà®©à¯"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ UIN?"
msgstr "உஙà¯à®•à®³à®¤à¯ ICQ UIN எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ password?"
msgstr "உஙà¯à®•à®³à®¤à¯ ICQ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "வலையமைபà¯à®ªà¯"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯à®¤à¯Šà®•à¯à®¤à®¿"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "Add…"
msgstr "சேரà¯..."
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "நீகà¯à®•à®µà¯à®®à¯ "
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "மேலே"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set"
+msgstr "எழà¯à®¤à¯à®¤à¯à®°à¯à®¤à¯Šà®•à¯à®¤à®¿"
#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Down"
msgstr "கீழே"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "சேவையகஙà¯à®•à®³à¯"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid ""
"Most IRC servers don't need a password, so if you're not sure, don't enter a "
"password."
msgstr ""
-"à®à®±à®¤à¯à®¤à®¾à®´ எலà¯à®²à®¾ à®à®†à®°à¯à®šà®¿ சேவையகஙà¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ தேவை இலà¯à®²à¯ˆ, ஆகவே நிசà¯à®šà®¯à®®à®¾à®• "
-"இலà¯à®²à¯ˆ எனில௠"
+"à®à®±à®¤à¯à®¤à®¾à®´ எலà¯à®²à®¾ à®à®†à®°à¯à®šà®¿ சேவையகஙà¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ தேவை இலà¯à®²à¯ˆ, ஆகவே நிசà¯à®šà®¯à®®à®¾à®• இலà¯à®²à¯ˆ எனில௠"
"கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ உளà¯à®³à®¿à®Ÿ வேணà¯à®Ÿà®¾à®®à¯"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Network"
+msgstr "வலையமைபà¯à®ªà¯"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Nickname"
msgstr "பà¯à®©à¯ˆà®ªà¯à®ªà¯†à®¯à®°à¯"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Quit message"
msgstr "வெளிசà¯à®šà¯†à®²à¯ செயà¯à®¤à®¿"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Real name"
msgstr "உணà¯à®®à¯ˆà®¯à®¾à®© பெயரà¯"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "நீகà¯à®•à®µà¯à®®à¯ "
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "Servers"
+msgstr "சேவையகஙà¯à®•à®³à¯"
+
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Up"
+msgstr "மேலே"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
msgid "Username"
msgstr " பயனர௠பெயரà¯"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "எநà¯à®¤ à®à®†à®°à¯à®šà®¿ வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
msgid "What is your IRC nickname?"
msgstr "உஙà¯à®•à®³à®¤à¯ IRC திரை பெயர௠எனà¯à®©?"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+msgid "Which IRC network?"
+msgstr "எநà¯à®¤ à®à®†à®°à¯à®šà®¿ வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "உஙà¯à®•à®³à®¤à¯ பேஸà¯à®ªà¯à®•à¯ பயனர௠பெயர௠எனà¯à®©?"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>உதாரணமà¯:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>உதாரணமà¯:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "(_y) மறையாகà¯à®•à®®à¯ தேவை (டிஎலà¯à®Žà®¸à¯/எஸà¯à®Žà®¸à¯à®Žà®²à¯)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "_g எஸà¯à®Žà®¸à¯à®Žà®²à¯ சானà¯à®±à®¿à®¤à®´à¯à®•à®³à¯ பிழைகளை உதாசீனம௠செயà¯."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Override server settings"
+msgstr "சேவையக அமைபà¯à®ªà¯ˆ உதாசீனம௠செயà¯"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty"
+msgstr "(_t) à®®à¯à®•à¯à®•à®¿à®¯à®¤à¯à®¤à¯à®µà®®à¯"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "Reso_urce"
+msgstr "(_u) மூலவளமà¯"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1064,103 +628,78 @@ msgid ""
msgstr ""
"இ த௠உஙà¯à®•à®³à¯ பயனர௠பெயரà¯. உஙà¯à®•à®³à¯ பேஸà¯à®ªà¯à®•à¯ பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ அலà¯à®².\n"
" நீஙà¯à®•à®³à¯ facebook.com/<b>badger</b>, ஆனால௠<b>badger</b> என உளà¯à®³à®¿à®Ÿà¯à®•.\n"
-" <a href=\"http://www.facebook.com/username/\">இநà¯à®¤ பகà¯à®•à®®à¯ </a> à® "
-"பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿ à®’ "
+" <a href=\"http://www.facebook.com/username/\">இநà¯à®¤ பகà¯à®•à®®à¯ </a> ஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿ à®’ "
"ர௠பேஸà¯à®ªà¯à®•à¯ பயனர௠பெயரை பெறவà¯.à®®à¯"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Use old SS_L"
+msgstr "(_L) பழைய எஸà¯à®Žà®¸à¯à®Žà®²à¯ "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook password?"
msgstr "உஙà¯à®•à®³à®¤à¯ பேஸà¯à®ªà¯à®•à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Facebook username?"
+msgstr "உஙà¯à®•à®³à®¤à¯ பேஸà¯à®ªà¯à®•à¯ பயனர௠பெயர௠எனà¯à®©?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google ID?"
msgstr "உஙà¯à®•à®³à®¤à¯ கூகà¯à®³à¯ à®à®Ÿà®¿ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>உதாரணமà¯:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Google password?"
msgstr "உஙà¯à®•à®³à®¤à¯ கூகà¯à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>உதாரணமà¯:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "_g எஸà¯à®Žà®¸à¯à®Žà®²à¯ சானà¯à®±à®¿à®¤à®´à¯à®•à®³à¯ பிழைகளை உதாசீனம௠செயà¯."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "(_t) à®®à¯à®•à¯à®•à®¿à®¯à®¤à¯à®¤à¯à®µà®®à¯"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "(_u) மூலவளமà¯"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "(_y) மறையாகà¯à®•à®®à¯ தேவை (டிஎலà¯à®Žà®¸à¯/எஸà¯à®Žà®¸à¯à®Žà®²à¯)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "சேவையக அமைபà¯à®ªà¯ˆ உதாசீனம௠செயà¯"
-
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "(_L) பழைய எஸà¯à®Žà®¸à¯à®Žà®²à¯ "
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your Jabber ID?"
msgstr "உஙà¯à®•à®³à®¤à¯ ஜாபà¯à®ªà®°à¯ ID எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "உஙà¯à®•à®³à®¤à¯ வேணà¯à®Ÿà®¿à®¯ ஜாபà¯à®ªà®°à®¿à®©à¯ ID எனà¯à®©?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your Jabber password?"
msgstr "உஙà¯à®•à®³à®¤à¯ ஜாபà¯à®ªà®°à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your desired Jabber ID?"
+msgstr "உஙà¯à®•à®³à®¤à¯ வேணà¯à®Ÿà®¿à®¯ ஜாபà¯à®ªà®°à®¿à®©à¯ ID எனà¯à®©?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber password?"
msgstr "உஙà¯à®•à®³à®¤à¯ வேணà¯à®Ÿà®¿à®¯ ஜாபà¯à®ªà®°à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_k பà¯à®©à¯ˆà®ªà¯à®ªà¯†à®¯à®°à¯"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "(_L) கடைசி பெயரà¯"
+msgid "E-_mail address"
+msgstr "_m மினà¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "(_F) à®®à¯à®¤à®²à¯ பெயரà¯"
+msgid "Nic_kname"
+msgstr "_k பà¯à®©à¯ˆà®ªà¯à®ªà¯†à®¯à®°à¯"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "வெளியிடபà¯à®ªà®Ÿà¯à®Ÿ பெயர௠(_P)"
+msgid "_First Name"
+msgstr "(_F) à®®à¯à®¤à®²à¯ பெயரà¯"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID"
msgstr "(_J) ஜபà¯à®ªà®¾à®°à¯ à®à®Ÿà®¿ (ID)"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "_m மினà¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿"
+msgid "_Last Name"
+msgstr "(_L) கடைசி பெயரà¯"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+msgid "_Published Name"
+msgstr "வெளியிடபà¯à®ªà®Ÿà¯à®Ÿ பெயர௠(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>உதாரணமà¯:</b> user@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live ID?"
msgstr "உஙà¯à®•à®³à®¤à¯ சாளரதà¯à®¤à®¿à®©à¯ லைவ௠கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live password?"
msgstr "உஙà¯à®•à®³à®¤à¯ சாளரதà¯à®¤à®¿à®©à¯ லைவ௠கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
@@ -1193,113 +732,113 @@ msgstr "தேரà¯à®µà¯à®•à®³à¯"
msgid "None"
msgstr "ஒனà¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "(_U) பயனர௠பெயரà¯"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
msgstr "<b>உதாரணமà¯:</b> user@my.sip.server"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username"
+msgstr "உறà¯à®¤à®¿ செயà¯à®¯ பயனரின௠பெயரà¯"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
+msgstr "பைணà¯à®Ÿà®¿à®™à¯ ஠காணà¯à®™à¯à®•à®³à¯"
+
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "இநà¯à®¤ கணகà¯à®•à¯ˆ எலà¯à®²à®¾ தரைஇணைபà¯à®ªà¯à®•à®³à¯ மறà¯à®±à¯à®®à¯ அலைபேசிகளà¯à®•à¯à®•à¯à®®à¯ செயலாகà¯à®•à¯"
+msgid "Discover the STUN server automatically"
+msgstr "ஸà¯à®Ÿà®©à¯ சேவையகதà¯à®¤à¯ˆ தானிஙà¯à®•à®¿à®¯à®¾à®• கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "நேட௠டà¯à®°à®¾à®µà¯†à®°à¯à®šà®²à¯ தேரà¯à®µà¯à®•à®³à¯"
+msgid "Ignore TLS Errors"
+msgstr "டிஎலà¯à®Žà®¸à¯ பிழைகளை உதாசீனம௠செயà¯à®•"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "பதிலாள௠தேரà¯à®µà¯à®•à®³à¯"
+msgid "Interval (seconds)"
+msgstr "இடைவெளி (வினாடிகளிலà¯)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "இதர தேரà¯à®µà¯à®•à®³à¯"
+msgid "Keep-Alive Options"
+msgstr "உயிரà¯à®Ÿà®©à¯ வைதà¯à®¤à®¿à®°à¯à®•à¯à®• தேரà¯à®µà¯"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "ஸà¯à®Ÿà®©à¯ சேவையகமà¯"
+msgid "Local IP Address"
+msgstr "உளà¯à®³à®®à¯ˆ à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "ஸà¯à®Ÿà®©à¯ சேவையகதà¯à®¤à¯ˆ தானிஙà¯à®•à®¿à®¯à®¾à®• கணà¯à®Ÿà¯à®ªà®¿à®Ÿà®¿"
+msgid "Loose Routing"
+msgstr "தளரà¯à®¨à¯à®¤ வழியாகà¯à®•à®®à¯"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "பைணà¯à®Ÿà®¿à®™à¯ ஠காணà¯à®™à¯à®•à®³à¯"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "உயிரà¯à®Ÿà®©à¯ வைதà¯à®¤à®¿à®°à¯à®•à¯à®• தேரà¯à®µà¯"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Mechanism"
msgstr "பொறிமà¯à®±à¯ˆ"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "இடைவெளி (வினாடிகளிலà¯)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "உறà¯à®¤à®¿ செயà¯à®¯ பயனரின௠பெயரà¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "இதர தேரà¯à®µà¯à®•à®³à¯"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "போகà¯à®•à¯à®µà®°à®¤à¯à®¤à¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "நேட௠டà¯à®°à®¾à®µà¯†à®°à¯à®šà®²à¯ தேரà¯à®µà¯à®•à®³à¯"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "தளரà¯à®¨à¯à®¤ வழியாகà¯à®•à®®à¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Proxy Options"
+msgstr "பதிலாள௠தேரà¯à®µà¯à®•à®³à¯"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "டிஎலà¯à®Žà®¸à¯ பிழைகளை உதாசீனம௠செயà¯à®•"
+msgid "STUN Server"
+msgstr "ஸà¯à®Ÿà®©à¯ சேவையகமà¯"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "உளà¯à®³à®®à¯ˆ à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
+msgid "Transport"
+msgstr "போகà¯à®•à¯à®µà®°à®¤à¯à®¤à¯"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "உஙà¯à®•à®³à®¤à¯ SIP உடà¯à®ªà¯à®•à¯ ID எனà¯à®©?"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "இநà¯à®¤ கணகà¯à®•à¯ˆ எலà¯à®²à®¾ தரைஇணைபà¯à®ªà¯à®•à®³à¯ மறà¯à®±à¯à®®à¯ அலைபேசிகளà¯à®•à¯à®•à¯à®®à¯ செயலாகà¯à®•à¯"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "What is your SIP account password?"
msgstr "உஙà¯à®•à®³à®¤à¯ SIP கணகà¯à®•à®¿à®©à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "(_w) கடவà¯à®šà¯à®šà¯Šà®²à¯:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "What is your SIP login ID?"
+msgstr "உஙà¯à®•à®³à®¤à¯ SIP உடà¯à®ªà¯à®•à¯ ID எனà¯à®©?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "(_I) யாகூ à®à®Ÿà®¿:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "_Username"
+msgstr "(_U) பயனர௠பெயரà¯"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "_a எழà¯à®¤à¯à®¤à¯à®°à¯ தொகà¯à®¤à®¿:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "I_gnore conference and chat room invitations"
msgstr "_g அரடà¯à®Ÿà¯ˆ அறை மறà¯à®±à¯à®®à¯ கலநà¯à®¤à¯à®°à¯ˆà®¯à®¾à®Ÿà®²à¯ அழைபà¯à®ªà¯à®•à®³à¯ˆ உதாசீனம௠செயà¯à®•"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "(_R) அறை படà¯à®Ÿà®¿à®¯à®²à¯ உளà¯à®³à®®à¯ˆà®µà¯:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "Pass_word:"
+msgstr "(_w) கடவà¯à®šà¯à®šà¯Šà®²à¯:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_a எழà¯à®¤à¯à®¤à¯à®°à¯ தொகà¯à®¤à®¿:"
+msgid "What is your Yahoo! ID?"
+msgstr "உஙà¯à®•à®³à®¤à¯ Yahoo! ID எனà¯à®©?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_P தà¯à®±à¯ˆ:"
+msgid "What is your Yahoo! password?"
+msgstr "உஙà¯à®•à®³à®¤à¯ Yahoo! கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Yahoo! I_D:"
+msgstr "(_I) யாகூ à®à®Ÿà®¿:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "உஙà¯à®•à®³à®¤à¯ Yahoo! ID எனà¯à®©?"
+msgid "_Port:"
+msgstr "_P தà¯à®±à¯ˆ:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "உஙà¯à®•à®³à®¤à¯ Yahoo! கடவà¯à®šà¯à®šà¯Šà®²à¯ எனà¯à®©?"
+msgid "_Room List locale:"
+msgstr "(_R) அறை படà¯à®Ÿà®¿à®¯à®²à¯ உளà¯à®³à®®à¯ˆà®µà¯:"
#: ../libempathy-gtk/empathy-avatar-chooser.c:545
#: ../libempathy-gtk/empathy-avatar-chooser.c:630
@@ -1454,8 +993,7 @@ msgid ""
"join a new chat room\""
msgstr ""
"/say <message>: send <message> நடபà¯à®ªà¯ உரையாடலà¯à®•à¯à®•à¯. இத௠'/' உடன௠தà¯à®µà®™à¯à®•à¯à®®à¯ "
-"செயà¯à®¤à®¿à®¯à¯ˆ அனà¯à®ªà¯à®ªà®ªà¯à®ªà®¯à®©à¯à®ªà®Ÿà¯à®®à¯.உதாரணமாக: \"/say /join பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆ அறையில௠சேர "
-"உதவà¯à®®à¯.\""
+"செயà¯à®¤à®¿à®¯à¯ˆ அனà¯à®ªà¯à®ªà®ªà¯à®ªà®¯à®©à¯à®ªà®Ÿà¯à®®à¯.உதாரணமாக: \"/say /join பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆ அறையில௠சேர உதவà¯à®®à¯.\""
#: ../libempathy-gtk/empathy-chat.c:1088
msgid "/whois <contact ID>: display information about a contact"
@@ -1466,8 +1004,7 @@ msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-"/help [<command>]: அனைதà¯à®¤à¯ ஆதரவà¯à®³à¯à®³ கடà¯à®Ÿà®³à¯ˆà®•à®³à¯ˆà®¯à¯à®®à¯ காடà¯à®Ÿà¯à®•. <command> à® à®…à®±à¯à®¤à®¿ "
-"இடà¯à®Ÿà¯ "
+"/help [<command>]: அனைதà¯à®¤à¯ ஆதரவà¯à®³à¯à®³ கடà¯à®Ÿà®³à¯ˆà®•à®³à¯ˆà®¯à¯à®®à¯ காடà¯à®Ÿà¯à®•. <command> à® à®…à®±à¯à®¤à®¿ இடà¯à®Ÿà¯ "
"இரà¯à®ªà¯à®ªà®¿à®©à¯ பயனை காடà¯à®Ÿà¯à®•."
#: ../libempathy-gtk/empathy-chat.c:1110
@@ -1534,7 +1071,7 @@ msgstr "à®…à®®à¯à®²à®¾à®•à¯à®•à®µà®¿à®²à¯à®²à¯ˆ"
msgid "unknown"
msgstr "தெரியாத"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "தலைபà¯à®ªà¯:"
@@ -1648,9 +1185,9 @@ msgstr "%s இபà¯à®ªà¯‹à®¤à¯ %s ஆனாரà¯"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2886 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532
+#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
+#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà®Ÿà¯à®Ÿà®¤à¯"
@@ -1724,8 +1261,8 @@ msgstr "தடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ தொடரà¯à®ªà¯à®•à®³à¯ˆ தà
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
#: ../libempathy-gtk/empathy-individual-widget.c:1485
-#: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "கணகà¯à®•à¯:"
@@ -1837,49 +1374,49 @@ msgstr "அவதாரதà¯à®¤à¯ˆ சேமி"
msgid "Unable to save avatar"
msgstr "அவதாரதà¯à®¤à¯ˆ சேமிகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
-#. Identifier to connect to Instant Messaging network
-#. Setup id label
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
-msgid "Identifier"
-msgstr "இனஙà¯à®•à®¾à®Ÿà¯à®Ÿà®¿"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>இடமà¯</b> (date) போதà¯\t"
#. Setup nickname entry
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
#: ../libempathy-gtk/empathy-user-info.c:449
msgid "Alias"
msgstr "பà¯à®©à¯ˆà®ªà¯à®ªà¯†à®¯à®°à¯"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Client"
+msgstr "சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "தொடரà¯à®ªà¯ விவரஙà¯à®•à®³à¯"
+msgid "Client Information"
+msgstr "சாரà¯à®¨à¯à®¤à¯‹à®©à¯ தகவலà¯"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
-msgid "Information requested…"
-msgstr "தகவல௠வேணà¯à®Ÿà¯à®¤à®²à¯"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>இடமà¯</b> (date) போதà¯\t"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "தொடரà¯à®ªà¯ விவரஙà¯à®•à®³à¯"
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Client Information"
-msgstr "சாரà¯à®¨à¯à®¤à¯‹à®©à¯ தகவலà¯"
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "இனஙà¯à®•à®¾à®Ÿà¯à®Ÿà®¿"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr "தகவல௠வேணà¯à®Ÿà¯à®¤à®²à¯"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS"
msgstr "OS"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "Version"
msgstr "பதிபà¯à®ªà¯"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client"
-msgstr "சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
-
#: ../libempathy-gtk/empathy-groups-widget.c:327
msgid "Groups"
msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯"
@@ -1889,8 +1426,7 @@ msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
-"இநà¯à®¤ தொடரà¯à®ªà¯ வர வேனà¯à®Ÿà®¿à®¯ கà¯à®´à¯à®µà¯ˆ தேரà¯à®µà¯ செயà¯à®•. நீஙà¯à®•à®³à¯ ஒனà¯à®±à¯à®•à¯à®•à¯ மேறà¯à®ªà®Ÿà¯à®Ÿ "
-"கà¯à®´à¯à®•à¯à®•à®³à¯ˆ தேரà¯à®µà¯ "
+"இநà¯à®¤ தொடரà¯à®ªà¯ வர வேனà¯à®Ÿà®¿à®¯ கà¯à®´à¯à®µà¯ˆ தேரà¯à®µà¯ செயà¯à®•. நீஙà¯à®•à®³à¯ ஒனà¯à®±à¯à®•à¯à®•à¯ மேறà¯à®ªà®Ÿà¯à®Ÿ கà¯à®´à¯à®•à¯à®•à®³à¯ˆ தேரà¯à®µà¯ "
"செயà¯à®¯à®²à®¾à®®à¯ அலà¯à®²à®¤à¯ ஒனà¯à®±à¯ˆà®¯à¯à®®à¯ தேரà¯à®µà¯ செயà¯à®¯à®¾à®¤à®¿à®°à¯à®•à¯à®•à®²à®¾à®®à¯."
#: ../libempathy-gtk/empathy-groups-widget.c:358
@@ -1977,8 +1513,8 @@ msgid "Select account to use to place the call"
msgstr "அழைபà¯à®ªà¯ˆ அமைகà¯à®• கணகà¯à®•à¯ˆ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯"
#: ../libempathy-gtk/empathy-individual-menu.c:357
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "அழை"
@@ -2013,8 +1549,7 @@ msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
msgstr ""
-"நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à®¾à®• சஙà¯à®•à®¿à®²à®¿à®¤à¯ தொடரà¯à®ªà¯ '%s' ஠நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾? இநà¯à®¤ "
-"தொடரà¯à®ªà¯à®Ÿà®©à¯à®šà®™à¯à®•à®¿à®²à®¿ "
+"நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à®¾à®• சஙà¯à®•à®¿à®²à®¿à®¤à¯ தொடரà¯à®ªà¯ '%s' ஠நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾? இநà¯à®¤ தொடரà¯à®ªà¯à®Ÿà®©à¯à®šà®™à¯à®•à®¿à®²à®¿ "
"போல௠இணைநà¯à®¤ அனைதà¯à®¤à¯ தொடரà¯à®ªà¯à®•à®³à¯à®®à¯ நீகà¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯ என௠அறிக."
#: ../libempathy-gtk/empathy-individual-menu.c:807
@@ -2049,7 +1584,6 @@ msgid "_Video Call"
msgstr "(_V) விடியோ அழைபà¯à®ªà¯"
#: ../libempathy-gtk/empathy-individual-menu.c:1376
-#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "(_P) à®®à¯à®¨à¯à®¤à¯ˆà®¯ உரையாடலà¯à®•à®³à¯"
@@ -2077,7 +1611,7 @@ msgstr "திரà¯à®¤à¯à®¤à¯ (_E)"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "இநà¯à®¤ அறைகà¯à®•à¯ அழைபà¯à®ªà¯"
@@ -2204,7 +1738,7 @@ msgstr "கà¯à®¤à¯à®¤à¯à®¯à®°à®®à¯:"
#: ../libempathy-gtk/empathy-individual-widget.c:593
#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "இடமà¯"
@@ -2239,10 +1773,9 @@ msgstr[1] "%u தொடரà¯à®ªà¯à®•à®³à¯à®Ÿà®©à¯ உளà¯à®³ மறà¯à®±
msgid "<b>Location</b> at (date)"
msgstr "<b>இடமà¯</b> (date) போதà¯"
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
msgid "Online from a phone or mobile device"
-msgstr ""
-"ஒர௠தொலை பேசியில௠இரà¯à®¨à¯à®¤à¯‹ அலà¯à®²à®¤à¯ அலை பேகியில௠இரà¯à®¨à¯à®¤à¯‹ இணைபà¯à®ªà®¿à®²à¯ தொடரà¯à®ªà¯"
+msgstr "ஒர௠தொலை பேசியில௠இரà¯à®¨à¯à®¤à¯‹ அலà¯à®²à®¤à¯ அலை பேகியில௠இரà¯à®¨à¯à®¤à¯‹ இணைபà¯à®ªà®¿à®²à¯ தொடரà¯à®ªà¯"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
msgid "New Network"
@@ -2265,7 +1798,7 @@ msgstr "தேரà¯à®µà¯ செயà¯à®• "
msgid "new server"
msgstr "பà¯à®¤à®¿à®¯ சேவையகமà¯"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "எஸà¯à®Žà®¸à¯à®Žà®²à¯"
@@ -2275,10 +1808,8 @@ msgid ""
"same network as you. If you want to use this feature, please check that the "
"details below are correct."
msgstr ""
-"எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• உஙà¯à®•à®³à¯ˆà®ªà¯à®ªà¯‹à®²à®µà¯‡ உள௠வலையில௠உளà¯à®³à¯‹à®°à¯ˆ கணà¯à®Ÿà¯ பிடிதà¯à®¤à¯ "
-"அரடà¯à®Ÿà¯ˆ அடிகà¯à®• "
-"இயலà¯à®®à¯. இநà¯à®¤ à®…à®®à¯à®šà®¤à¯à®¤à¯ˆ நீஙà¯à®•à®³à¯ செயலாகà¯à®• விரà¯à®®à¯à®ªà®¿à®©à®¾à®²à¯ கீழ௠கணà¯à®Ÿà¯à®³à¯à®³ விவரஙà¯à®•à®³à¯ˆ "
-"சரி பாரà¯à®•à¯à®•à®µà¯à®®à¯. "
+"எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• உஙà¯à®•à®³à¯ˆà®ªà¯à®ªà¯‹à®²à®µà¯‡ உள௠வலையில௠உளà¯à®³à¯‹à®°à¯ˆ கணà¯à®Ÿà¯ பிடிதà¯à®¤à¯ அரடà¯à®Ÿà¯ˆ அடிகà¯à®• "
+"இயலà¯à®®à¯. இநà¯à®¤ à®…à®®à¯à®šà®¤à¯à®¤à¯ˆ நீஙà¯à®•à®³à¯ செயலாகà¯à®• விரà¯à®®à¯à®ªà®¿à®©à®¾à®²à¯ கீழ௠கணà¯à®Ÿà¯à®³à¯à®³ விவரஙà¯à®•à®³à¯ˆ சரி பாரà¯à®•à¯à®•à®µà¯à®®à¯. "
#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
msgid "People nearby"
@@ -2289,8 +1820,7 @@ msgid ""
"You can change these details later or disable this feature by choosing <span "
"style=\"italic\">Edit → Accounts</span> in the Contact List."
msgstr ""
-"தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ <span style=\"italic\">Edit → Accounts</span> à® "
-"தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤à¯ "
+"தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ <span style=\"italic\">Edit → Accounts</span> ஠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤à¯ "
"நீஙà¯à®•à®³à¯ இநà¯à®¤ விவரஙà¯à®•à®³à¯ˆ மாறà¯à®±à®²à®¾à®®à¯ அலà¯à®²à®¤à¯ இநà¯à®¤ à®…à®®à¯à®šà®¤à¯à®¤à¯ˆ செயல௠நீகà¯à®•à®²à®¾à®®à¯."
#: ../libempathy-gtk/empathy-log-window.c:622
@@ -2393,7 +1923,7 @@ msgid "Text chats"
msgstr "உரை அரடà¯à®Ÿà¯ˆà®•à®³à¯"
#: ../libempathy-gtk/empathy-log-window.c:3040
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:3
msgid "Calls"
msgstr "அழைபà¯à®ªà¯à®•à®³à¯"
@@ -2426,39 +1956,39 @@ msgid "Delete from:"
msgstr "இலிரà¯à®¨à¯à®¤à¯ நீகà¯à®•à¯:"
#: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "_File"
-msgstr "கோபà¯à®ªà¯ (_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-msgid "_Edit"
-msgstr "திரà¯à®¤à¯à®¤à¯ (_E)"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">à®à®±à¯à®±à¯à®•à®¿à®±à®¤à¯...</span>"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:4
+msgid "Chat"
+msgstr "அரடà¯à®Ÿà¯ˆ"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "Delete All History..."
msgstr "அனைதà¯à®¤à¯ சரிதà¯à®¤à®¿à®°à®¤à¯à®¤à¯ˆà®¯à¯à®®à¯ அழி..."
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Profile"
msgstr "வரிவà¯à®°à¯"
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
-msgid "Chat"
-msgstr "அரடà¯à®Ÿà¯ˆ"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
msgid "Video"
msgstr "வீடியோ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:11
+msgid "_Edit"
+msgstr "திரà¯à®¤à¯à®¤à¯ (_E)"
+
#: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "page 2"
-msgstr "பகà¯à®•à®®à¯ 2"
+msgid "_File"
+msgstr "கோபà¯à®ªà¯ (_F)"
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">à®à®±à¯à®±à¯à®•à®¿à®±à®¤à¯...</span>"
+msgid "page 2"
+msgstr "பகà¯à®•à®®à¯ 2"
#: ../libempathy-gtk/empathy-new-account-dialog.c:129
msgid "What kind of chat account do you have?"
@@ -2569,8 +2099,7 @@ msgid ""
"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
msgstr ""
"<b>தறà¯à®ªà¯‹à®¤à¯ˆà®¯ செயà¯à®¤à®¿: %s</b>\n"
-"<small><i>பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿à®¯à¯ˆ அமைகà¯à®• எனà¯à®Ÿà®°à¯ விசையை à®…à®´à¯à®¤à¯à®¤à®µà¯à®®à¯ அலà¯à®²à®¤à¯ ரதà¯à®¤à¯ செயà¯à®¯ "
-"எஸà¯à®•à¯‡à®ªà¯ "
+"<small><i>பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿à®¯à¯ˆ அமைகà¯à®• எனà¯à®Ÿà®°à¯ விசையை à®…à®´à¯à®¤à¯à®¤à®µà¯à®®à¯ அலà¯à®²à®¤à¯ ரதà¯à®¤à¯ செயà¯à®¯ எஸà¯à®•à¯‡à®ªà¯ "
"விசையை à®…à®´à¯à®¤à¯à®¤à®µà¯à®®à¯.</i></small>"
#: ../libempathy-gtk/empathy-presence-chooser.c:393
@@ -2600,20 +2129,20 @@ msgid "Find:"
msgstr "தேடà¯à®•:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "_Previous"
-msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ (_P)"
+msgid "Mat_ch case"
+msgstr "மேலà¯/கீழ௠நிலையை பொரà¯à®¤à¯à®¤à¯à®• (_c)"
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "_Next"
-msgstr "அடà¯à®¤à¯à®¤à¯ (_N)"
+msgid "Phrase not found"
+msgstr "சொறà¯à®±à¯Šà®Ÿà®°à¯ காணபà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Mat_ch case"
-msgstr "மேலà¯/கீழ௠நிலையை பொரà¯à®¤à¯à®¤à¯à®• (_c)"
+msgid "_Next"
+msgstr "அடà¯à®¤à¯à®¤à¯ (_N)"
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "சொறà¯à®±à¯Šà®Ÿà®°à¯ காணபà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
+msgid "_Previous"
+msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ (_P)"
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
@@ -2716,8 +2245,7 @@ msgid "The certificate is self-signed."
msgstr "சானà¯à®±à®¿à®¤à®´à¯ தானே கையெழà¯à®¤à¯à®¤à®¿à®Ÿà¯à®Ÿà®¤à¯"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
msgstr "இநà¯à®¤ சானà¯à®±à®¿à®¤à®´à¯ வழஙà¯à®•à¯à®®à¯ அதிகாரிகளால௠ரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2973,7 +2501,7 @@ msgstr "வியடà¯à®©à®¾à®®à¯"
#: ../libempathy-gtk/empathy-roster-model.h:29
msgid "Top Contacts"
-msgstr "à®®à¯à®•à¯à®•à®¿à®¯ தொடரà¯à®ªà¯à®•à®³à¯."
+msgstr "à®®à¯à®•à¯à®•à®¿à®¯ தொடரà¯à®ªà¯à®•à®³à¯"
#: ../libempathy-gtk/empathy-roster-model.h:31
msgid "Ungrouped"
@@ -2994,10 +2522,8 @@ msgid ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"எமà¯à®ªà®¤à®¿ இலவச மென௠பொரà¯à®³à®¾à®•à¯à®®à¯. நீஙà¯à®•à®³à¯ இலவச மென௠பொரà¯à®³à¯ அமைபà¯à®ªà®¿à®©à®¾à®²à¯ "
-"வெளியிடபà¯à®ªà®Ÿà¯à®Ÿ ஜிஎனà¯à®¯à¯ "
-"பொத௠அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®© இநà¯à®¤ 2ம௠பதிபà¯à®ªà¯ அலà¯à®²à®¤à¯ அடà¯à®¤à¯à®¤ பதிபà¯à®ªà¯à®•à®³à¯ விதிகளின௠படி "
-"நீஙà¯à®•à®³à¯ "
+"எமà¯à®ªà®¤à®¿ இலவச மென௠பொரà¯à®³à®¾à®•à¯à®®à¯. நீஙà¯à®•à®³à¯ இலவச மென௠பொரà¯à®³à¯ அமைபà¯à®ªà®¿à®©à®¾à®²à¯ வெளியிடபà¯à®ªà®Ÿà¯à®Ÿ ஜிஎனà¯à®¯à¯ "
+"பொத௠அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®© இநà¯à®¤ 2ம௠பதிபà¯à®ªà¯ அலà¯à®²à®¤à¯ அடà¯à®¤à¯à®¤ பதிபà¯à®ªà¯à®•à®³à¯ விதிகளின௠படி நீஙà¯à®•à®³à¯ "
"(விரà¯à®ªà¯à®ªà®ªà¯à®ªà®Ÿà®¿) மாறà¯à®±à®²à®¾à®®à¯. அலà¯à®²à®¤à¯ மீணà¯à®Ÿà¯à®®à¯ பறிமாறலாமà¯"
#: ../src/empathy-about-dialog.c:85
@@ -3007,10 +2533,8 @@ msgid ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
msgstr ""
-"எமà¯à®ªà®¤à®¿ உபயோகபà¯à®ªà®Ÿà¯à®®à¯ எனà¯à®± எதிரà¯à®ªà®¾à®°à¯à®ªà¯à®ªà¯à®Ÿà®©à¯ வெளியிடபà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯. ஆனால௠விறà¯à®• "
-"தகà¯à®¤à®¿, "
-"கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ செயலà¯à®•à¯à®•à®¾à®© தகà¯à®¤à®¿ உளà¯à®ªà®Ÿ எநà¯à®¤ உதà¯à®¤à®¿à®°à®µà®¾à®¤à®®à¯à®®à¯ அளிகà¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. மேற௠"
-"கொணà¯à®Ÿà¯ "
+"எமà¯à®ªà®¤à®¿ உபயோகபà¯à®ªà®Ÿà¯à®®à¯ எனà¯à®± எதிரà¯à®ªà®¾à®°à¯à®ªà¯à®ªà¯à®Ÿà®©à¯ வெளியிடபà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯. ஆனால௠விறà¯à®• தகà¯à®¤à®¿, "
+"கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ செயலà¯à®•à¯à®•à®¾à®© தகà¯à®¤à®¿ உளà¯à®ªà®Ÿ எநà¯à®¤ உதà¯à®¤à®¿à®°à®µà®¾à®¤à®®à¯à®®à¯ அளிகà¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. மேற௠கொணà¯à®Ÿà¯ "
"விவரஙà¯à®•à®³à¯à®•à¯à®•à¯ ஜிஎனà¯à®¯à¯ பொத௠அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®© விதிகளை பாரà¯à®•à¯à®•à®µà¯à®®à¯"
#: ../src/empathy-about-dialog.c:89
@@ -3019,10 +2543,8 @@ msgid ""
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr ""
-"இநà¯à®¤ எமà¯à®ªà®¤à®¿ நிரலà¯à®Ÿà®©à¯ ஜிஎனà¯à®¯à¯ பொத௠அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®© விதிகளின௠பிரதி உஙà¯à®•à®³à¯à®•à¯à®•à¯ "
-"கிடைதà¯à®¤à®¿à®°à¯à®•à¯à®• "
-"வேணà¯à®Ÿà¯à®®à¯. இலà¯à®²à¯ˆà®¯à®¾à®©à®¾à®²à¯ கீழ௠கணà¯à®Ÿ à®®à¯à®•à®µà®°à®¿à®•à¯à®•à¯ கடிதம௠எழà¯à®¤à®µà¯à®®à¯. Free Software "
-"Foundation, "
+"இநà¯à®¤ எமà¯à®ªà®¤à®¿ நிரலà¯à®Ÿà®©à¯ ஜிஎனà¯à®¯à¯ பொத௠அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®© விதிகளின௠பிரதி உஙà¯à®•à®³à¯à®•à¯à®•à¯ கிடைதà¯à®¤à®¿à®°à¯à®•à¯à®• "
+"வேணà¯à®Ÿà¯à®®à¯. இலà¯à®²à¯ˆà®¯à®¾à®©à®¾à®²à¯ கீழ௠கணà¯à®Ÿ à®®à¯à®•à®µà®°à®¿à®•à¯à®•à¯ கடிதம௠எழà¯à®¤à®µà¯à®®à¯. Free Software Foundation, "
"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
#: ../src/empathy-about-dialog.c:109
@@ -3036,23 +2558,18 @@ msgstr "I. Felix <ifelix@redhat.com>. Dr. T. Vasudevan <agnihot3@gmail.com>"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
-"எநà¯à®¤ உரையாடலையà¯à®®à¯ காடà¯à®Ÿ வேணà¯à®Ÿà®¾à®®à¯, வேலை செயà¯à®¯ வேணà¯à®Ÿà®¾à®®à¯ (-எ-கா "
-"இறகà¯à®•à¯à®®à®¤à®¿) மறà¯à®±à¯à®®à¯ "
+"எநà¯à®¤ உரையாடலையà¯à®®à¯ காடà¯à®Ÿ வேணà¯à®Ÿà®¾à®®à¯, வேலை செயà¯à®¯ வேணà¯à®Ÿà®¾à®®à¯ (-எ-கா இறகà¯à®•à¯à®®à®¤à®¿) மறà¯à®±à¯à®®à¯ "
"வெளியேறà¯à®•"
#: ../src/empathy-accounts.c:186
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
-"à®…à®°à¯à®•à®¿à®²à¯ உளà¯à®³ நபரà¯à®•à®³à¯ கணகà¯à®•à¯à®•à®³à¯ இரà¯à®ªà¯à®ªà¯ அலà¯à®²à®¾à®¤à¯ வேற௠எநà¯à®¤ உரையாடலையà¯à®®à¯ "
-"காடà¯à®Ÿ "
+"à®…à®°à¯à®•à®¿à®²à¯ உளà¯à®³ நபரà¯à®•à®³à¯ கணகà¯à®•à¯à®•à®³à¯ இரà¯à®ªà¯à®ªà¯ அலà¯à®²à®¾à®¤à¯ வேற௠எநà¯à®¤ உரையாடலையà¯à®®à¯ காடà¯à®Ÿ "
"வேணà¯à®Ÿà®¾à®®à¯, "
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"கொடà¯à®¤à¯à®¤ கணகà¯à®•à¯ˆ à®®à¯à®¤à®²à®¿à®²à¯ தேரà¯à®µà¯ செயà¯à®¯à®µà¯à®®à¯ (eg, "
-"gabble/jabber/foo_40example_2eorg0)"
+msgstr "கொடà¯à®¤à¯à®¤ கணகà¯à®•à¯ˆ à®®à¯à®¤à®²à®¿à®²à¯ தேரà¯à®µà¯ செயà¯à®¯à®µà¯à®®à¯ (eg, gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3079,7 +2596,7 @@ msgstr "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà®¾à®¤ மாறà¯à®±à®™à¯à®•à®³à¯ à
msgid "Your new account has not been saved yet."
msgstr "உஙà¯à®•à®³à¯ கணகà¯à®•à¯ இனà¯à®©à¯à®®à¯ சேமிகà¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
msgid "Connecting…"
msgstr "இணைகà¯à®•à®¿à®±à®¤à¯"
@@ -3107,8 +2624,7 @@ msgid ""
"backend. Please install telepathy-haze and restart your session to migrate "
"the account."
msgstr ""
-"இநà¯à®¤ கணகà¯à®•à¯ பழைய ஆதரவிலà¯à®²à®¾à®¤ பினà¯à®ªà¯à®²à®¤à¯à®¤à¯ˆ சாரà¯à®¨à¯à®¤à¯ இரà¯à®ªà¯à®ªà®¤à®¾à®²à¯ செயல௠"
-"நீகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯. இநà¯à®¤ கணகà¯à®•à¯ˆ "
+"இநà¯à®¤ கணகà¯à®•à¯ பழைய ஆதரவிலà¯à®²à®¾à®¤ பினà¯à®ªà¯à®²à®¤à¯à®¤à¯ˆ சாரà¯à®¨à¯à®¤à¯ இரà¯à®ªà¯à®ªà®¤à®¾à®²à¯ செயல௠நீகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯. இநà¯à®¤ கணகà¯à®•à¯ˆ "
"இடம௠மாறà¯à®± டெலிபதி-ஹேஸ௠஠நிறà¯à®µà®¿ அமரà¯à®µà¯ˆ மற௠தà¯à®µà®•à¯à®•à®®à¯ செயà¯à®¯à®µà¯à®®à¯."
#: ../src/empathy-accounts-dialog.c:502
@@ -3119,21 +2635,20 @@ msgstr "இணைபà¯à®ªà¯ விலகி —கணகà¯à®•à¯ à®®à¯à®Ÿà®•
msgid "Edit Connection Parameters"
msgstr "இணைபà¯à®ªà¯ அளபà¯à®°à¯à®ªà¯à®•à®³à¯ˆ திரà¯à®¤à¯à®¤à¯à®•"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "_E இணைபà¯à®ªà¯ அளவà¯à®°à¯à®•à¯à®•à®³à¯ˆ திரà¯à®¤à¯à®¤à¯..."
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
-msgstr ""
-"நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à¯ கà¯à®´à¯ '%s' ஠உஙà¯à®•à®³à¯ கணினியிலிரà¯à®¨à¯à®¤à¯ நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾?"
+msgstr "நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à¯ கà¯à®´à¯ '%s' ஠உஙà¯à®•à®³à¯ கணினியிலிரà¯à®¨à¯à®¤à¯ நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾?"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "இத௠உஙà¯à®•à®³à¯ கணகà¯à®•à¯ˆ சேவையகதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ நீகà¯à®•à®¾à®¤à¯"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3142,24 +2657,24 @@ msgstr ""
"மாறà¯à®±à®™à¯à®•à®³à¯ˆ விலகà¯à®•à®¿à®µà®¿à®Ÿà¯à®®à¯. நிசà¯à®šà®¯à®®à¯ தொடர வேணà¯à®Ÿà¯à®®à®¾?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "_E செயலாகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "மறà¯à®ªà¯†à®¯à®°à®¿à®Ÿà¯"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "_S தவிரà¯"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "_C இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3168,30 +2683,29 @@ msgstr ""
"மாறà¯à®±à®™à¯à®•à®³à¯ˆ விலகà¯à®•à®¿à®µà®¿à®Ÿà¯à®®à¯. நிசà¯à®šà®¯à®®à¯ தொடர வேணà¯à®Ÿà¯à®®à®¾?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "செயà¯à®¤à®¿ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ மறà¯à®±à¯à®®à¯ வோயà¯à®ªà¯ கணகà¯à®•à¯à®•à®³à¯"
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "_Import…"
-msgstr "_I இறகà¯à®•à¯à®®à®¤à®¿ செயà¯"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "கணகà¯à®•à¯ தகவல௠தகவலà¯à®•à®³à¯ à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©"
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "No protocol backends installed"
+msgstr "நெறிமà¯à®±à¯ˆ பினà¯à®ªà¯à®²à®™à¯à®•à®³à¯ à®à®¤à¯à®®à¯ நிறà¯à®µà®µà®¿à®²à¯à®²à¯ˆ"
+
#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr ""
-"ஒர௠பà¯à®¤à®¿à®¯ கணகà¯à®•à¯ தà¯à®µà®•à¯à®• ஒவà¯à®µà¯Šà®°à¯ நெறிமà¯à®±à¯ˆà®•à¯à®•à¯à®®à¯ நீஙà¯à®•à®³à¯ à®®à¯à®¤à®²à®¿à®²à¯ ஒர௠"
-"பினà¯à®ªà¯à®²à®¤à¯à®¤à¯ˆ அமைகà¯à®• "
+"ஒர௠பà¯à®¤à®¿à®¯ கணகà¯à®•à¯ தà¯à®µà®•à¯à®• ஒவà¯à®µà¯Šà®°à¯ நெறிமà¯à®±à¯ˆà®•à¯à®•à¯à®®à¯ நீஙà¯à®•à®³à¯ à®®à¯à®¤à®²à®¿à®²à¯ ஒர௠பினà¯à®ªà¯à®²à®¤à¯à®¤à¯ˆ அமைகà¯à®• "
"வேணà¯à®Ÿà¯à®®à¯."
#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol backends installed"
-msgstr "நெறிமà¯à®±à¯ˆ பினà¯à®ªà¯à®²à®™à¯à®•à®³à¯ à®à®¤à¯à®®à¯ நிறà¯à®µà®µà®¿à®²à¯à®²à¯ˆ"
+msgid "_Import…"
+msgstr "_I இறகà¯à®•à¯à®®à®¤à®¿ செயà¯"
#: ../src/empathy-auth-client.c:296
msgid " - Empathy authentication client"
@@ -3207,8 +2721,7 @@ msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ இணைகà¯à®• வேணà¯à
#: ../src/empathy.c:431
msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-"தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆà®¯à¯‹ அலà¯à®²à®¤à¯ வேற௠உரையாடலà¯à®•à®³à¯‹ காடà¯à®Ÿ வேணà¯à®Ÿà®¾à®®à¯"
+msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆà®¯à¯‹ அலà¯à®²à®¤à¯ வேற௠உரையாடலà¯à®•à®³à¯‹ காடà¯à®Ÿ வேணà¯à®Ÿà®¾à®®à¯"
#: ../src/empathy.c:447
msgid "- Empathy IM Client"
@@ -3230,47 +2743,50 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+msgid "In a call"
+msgstr "அழைபà¯à®ªà®¿à®²à¯"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- எமà¯à®ªà®¤à®¿ கேடà¯à®ªà¯Šà®²à®¿/ வீடியோ சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "எமà¯à®ªà®¤à®¿ கேடà¯à®ªà¯Šà®²à®¿/ வீடியோ சாரà¯à®¨à¯à®¤à¯‹à®©à¯"
#: ../src/empathy-call-observer.c:119
#, c-format
msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s உஙà¯à®•à®³à¯ˆ அழைகà¯à®• விரà¯à®®à¯à®ªà®¿à®©à®¾à®°à¯, ஆனால௠நீஙà¯à®•à®³à¯ வேற௠அழைபà¯à®ªà®¿à®²à¯ இரà¯à®¨à¯à®¤à¯€à®°à¯à®•à®³à¯."
+msgstr "%s உஙà¯à®•à®³à¯ˆ அழைகà¯à®• விரà¯à®®à¯à®ªà®¿à®©à®¾à®°à¯, ஆனால௠நீஙà¯à®•à®³à¯ வேற௠அழைபà¯à®ªà®¿à®²à¯ இரà¯à®¨à¯à®¤à¯€à®°à¯à®•à®³à¯."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "உளà¯à®µà®°à¯à®®à¯ அழைபà¯à®ªà¯"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "%s இடமிரà¯à®¨à¯à®¤à¯ உளà¯à®µà®°à¯à®®à¯ விடியோ அழைபà¯à®ªà¯"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "%s இடமிரà¯à®¨à¯à®¤à¯ உளà¯à®µà®°à¯à®®à¯ அழைபà¯à®ªà¯"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1559
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "à®à®±à¯à®•à®¾à®¤à¯‡"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1560
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3278,248 +2794,249 @@ msgstr "பதிலளி"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "%s ஆல௠அழை "
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2179
msgid "The IP address as seen by the machine"
msgstr "கணினி பாரà¯à®¤à¯à®¤à®ªà®Ÿà®¿ à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2181
msgid "The IP address as seen by a server on the Internet"
msgstr "இணையதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ சேவயகம௠பாரà¯à®¤à¯à®¤à®ªà®Ÿà®¿ à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2183
msgid "The IP address of the peer as seen by the other side"
msgstr "மறà¯à®± பகà¯à®•à®¤à¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ பாரà¯à®¤à¯à®¤à®ªà®Ÿà®¿ பியரின௠à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2185
msgid "The IP address of a relay server"
msgstr "மேலனà¯à®ªà¯à®ªà¯ சேவையகதà¯à®¤à®¿à®©à¯ à®à®ªà®¿ à®®à¯à®•à®µà®°à¯."
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2187
msgid "The IP address of the multicast group"
msgstr "பலà¯à®µà¯†à®³à®¿à®¯à¯€à®Ÿà¯à®Ÿà¯ கà¯à®´à¯à®µà®¿à®©à¯ à®à®ªà®¿ à®®à¯à®•à®µà®°à®¿"
-#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
-#: ../src/empathy-call-window.c:2527 ../src/empathy-call-window.c:2528
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.ui.h:19
msgid "Unknown"
msgstr "தெரியாத"
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-call-window.c:2959
msgid "On hold"
msgstr "தறà¯à®•à®¾à®²à®¿à®• நிறà¯à®¤à¯à®¤à®®à¯"
-#: ../src/empathy-call-window.c:2888
+#: ../src/empathy-call-window.c:2963
msgid "Mute"
msgstr "ஒலி நிறà¯à®¤à¯à®¤à®®à¯"
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2965
msgid "Duration"
msgstr "கால அளவà¯"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2968
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2989
+#: ../src/empathy-call-window.c:3064
msgid "Technical Details"
msgstr "தொடரà¯à®ªà¯ விவரஙà¯à®•à®³à¯"
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-call-window.c:3103
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
-"%s' இன௠மெனà¯à®ªà¯Šà®°à¯à®³à¯ உஙà¯à®•à®³à¯ கணினியில௠ஆதரவ௠உளà¯à®³ எநà¯à®¤ ஒலி இசை à®’à®´à¯à®™à¯à®•à¯à®•à®³à¯ˆà®¯à¯à®®à¯ "
-"பà¯à®°à®¿à®¨à¯à®¤à¯ "
+"%s' இன௠மெனà¯à®ªà¯Šà®°à¯à®³à¯ உஙà¯à®•à®³à¯ கணினியில௠ஆதரவ௠உளà¯à®³ எநà¯à®¤ ஒலி இசை à®’à®´à¯à®™à¯à®•à¯à®•à®³à¯ˆà®¯à¯à®®à¯ பà¯à®°à®¿à®¨à¯à®¤à¯ "
"கொளà¯à®³à®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-"%s' இன௠மெனà¯à®ªà¯Šà®°à¯à®³à¯ உஙà¯à®•à®³à¯ கணினியில௠ஆதரவ௠உளà¯à®³ எநà¯à®¤ விடியோ à®’à®´à¯à®™à¯à®•à¯à®•à®³à¯ˆà®¯à¯à®®à¯ "
-"பà¯à®°à®¿à®¨à¯à®¤à¯ "
+"%s' இன௠மெனà¯à®ªà¯Šà®°à¯à®³à¯ உஙà¯à®•à®³à¯ கணினியில௠ஆதரவ௠உளà¯à®³ எநà¯à®¤ விடியோ à®’à®´à¯à®™à¯à®•à¯à®•à®³à¯ˆà®¯à¯à®®à¯ பà¯à®°à®¿à®¨à¯à®¤à¯ "
"கொளà¯à®³à®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3114
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr ""
-" %s' கà¯à®•à¯ ஈனைகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ. உஙà¯à®•à®³à®¿à®²à¯ à®’à®°à¯à®µà®°à¯ நேரடி இணைபà¯à®ªà¯ˆ அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®¤ "
-"வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ "
+" %s' கà¯à®•à¯ ஈனைகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ. உஙà¯à®•à®³à®¿à®²à¯ à®’à®°à¯à®µà®°à¯ நேரடி இணைபà¯à®ªà¯ˆ அனà¯à®®à®¤à®¿à®•à¯à®•à®¾à®¤ வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ "
"இரà¯à®•à¯à®•à®²à®¾à®®à¯."
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-call-window.c:3120
msgid "There was a failure on the network"
msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ ஒர௠தோலà¯à®µà®¿"
-#: ../src/empathy-call-window.c:3049
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3124
+msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "இநà¯à®¤ அழைபà¯à®ªà¯à®•à¯à®•à¯ தேவையான ஒலி à®’à®´à¯à®™à¯à®•à¯à®•à¯à®•à¯ ஆதரவ௠உஙà¯à®•à®³à¯ கணினியில௠இலà¯à®²à¯ˆ."
-#: ../src/empathy-call-window.c:3052
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"இநà¯à®¤ அழைபà¯à®ªà¯à®•à¯à®•à¯ தேவையான விடியோ à®’à®´à¯à®™à¯à®•à¯à®•à¯à®•à¯ ஆதரவ௠உஙà¯à®•à®³à¯ கணினியில௠இலà¯à®²à¯ˆ."
+#: ../src/empathy-call-window.c:3127
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "இநà¯à®¤ அழைபà¯à®ªà¯à®•à¯à®•à¯ தேவையான விடியோ à®’à®´à¯à®™à¯à®•à¯à®•à¯à®•à¯ ஆதரவ௠உஙà¯à®•à®³à¯ கணினியில௠இலà¯à®²à¯ˆ."
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3139
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
msgstr ""
-"டெலிபதி உடà¯à®•à¯‚ற௠ஒனà¯à®±à®¿à®²à¯ எதிரà¯à®ªà®¾à®°à®¾à®¤ ஒனà¯à®±à¯ நிகழà¯à®¨à¯à®¤à®¤à¯. தயைசெயà¯à®¤à¯ <a href=\"%s\">"
-"report "
+"டெலிபதி உடà¯à®•à¯‚ற௠ஒனà¯à®±à®¿à®²à¯ எதிரà¯à®ªà®¾à®°à®¾à®¤ ஒனà¯à®±à¯ நிகழà¯à®¨à¯à®¤à®¤à¯. தயைசெயà¯à®¤à¯ <a href=\"%s\">report "
"this bug</a> மேலà¯à®®à¯ உதவி படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ உளà¯à®³ 'Debug' சாளரதà¯à®¤à®¿à®²à¯ காணà¯à®®à¯ பதிவேடà¯à®Ÿà¯ "
"உளà¯à®³à®Ÿà®•à¯à®•à®¤à¯à®¤à¯ˆ இணைகà¯à®•à®µà¯à®®à¯.."
-#: ../src/empathy-call-window.c:3073
+#: ../src/empathy-call-window.c:3148
msgid "There was a failure in the call engine"
msgstr "அழைபà¯à®ªà¯ பொறியில௠ஒர௠தோலà¯à®µà®¿"
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3151
msgid "The end of the stream was reached"
msgstr "ஓடையின௠இறà¯à®¤à®¿ எடà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3191
msgid "Can't establish audio stream"
msgstr "ஒலி ஓடையை நிறà¯à®µ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-call-window.c:3126
+#: ../src/empathy-call-window.c:3201
msgid "Can't establish video stream"
msgstr "விடியோ ஓடையை நிறà¯à®µ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-call-window.c:3163
+#: ../src/empathy-call-window.c:3238
#, c-format
msgid "Your current balance is %s."
msgstr "உஙà¯à®•à®³à¯ˆ நடபà¯à®ªà¯ வைபà¯à®ªà¯à®¤à¯à®¤à¯Šà®•à¯ˆ %s."
-#: ../src/empathy-call-window.c:3167
+#: ../src/empathy-call-window.c:3242
msgid "Sorry, you don’t have enough credit for that call."
msgstr "மனà¯à®©à®¿à®•à¯à®•à®µà¯à®®à¯, உஙà¯à®•à®³à¯ கணகà¯à®•à®¿à®²à¯ அநà¯à®¤ அழைபà¯à®ªà¯à®•à¯à®•à¯ போதிய பணமிலà¯à®²à¯ˆ"
-#: ../src/empathy-call-window.c:3169
+#: ../src/empathy-call-window.c:3244
msgid "Top Up"
msgstr "கடà¯à®Ÿà®£à®®à¯ செலà¯à®¤à¯à®¤à¯"
-#: ../src/empathy-call-window.ui.h:1
-msgid "_Call"
-msgstr "(_C) அழை"
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:1
+msgid "Audio"
+msgstr "கேடà¯à®ªà¯Šà®²à®¿"
#: ../src/empathy-call-window.ui.h:3
-msgid "_Microphone"
-msgstr "_M ஒலி வாஙà¯à®•à®¿"
+msgid "Decoding Codec:"
+msgstr "கà¯à®±à®¿à®®à¯à®±à¯ˆ மீளாகà¯à®•à®®à¯:"
#: ../src/empathy-call-window.ui.h:4
-msgid "_Camera"
-msgstr "_C கேமரா "
+msgid "Disable camera"
+msgstr "காமிரா செயல௠நீகà¯à®•à¯"
#: ../src/empathy-call-window.ui.h:5
-msgid "_Settings"
-msgstr "_S அமைபà¯à®ªà¯à®•à®³à¯"
+msgid "Display the dialpad"
+msgstr "டயல௠படà¯à®Ÿà®¿à®¯à¯ˆ காடà¯à®Ÿà¯ "
#: ../src/empathy-call-window.ui.h:6
-msgid "_View"
-msgstr "பாரà¯à®µà¯ˆ (_V)"
+msgid "Encoding Codec:"
+msgstr "கà¯à®±à®¿à®®à¯à®±à¯ˆ கà¯à®±à®¿à®®à¯à®±à¯ˆà®¯à®¾à®•à¯à®•à®®à¯:"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-msgid "_Help"
-msgstr "உதவி (_H)"
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "தà¯à®£à¯à®Ÿà®¿"
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-msgid "_Contents"
-msgstr "உளà¯à®³à®Ÿà®•à¯à®•à®™à¯à®•à®³à¯ (_C)"
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "நடபà¯à®ªà¯ அழைபà¯à®ªà¯ˆ தà¯à®£à¯à®Ÿà®¿"
#: ../src/empathy-call-window.ui.h:9
-msgid "_Debug"
-msgstr "(_D) வழ௠நீகà¯à®•à¯"
+msgid "Local Candidate:"
+msgstr "உளà¯à®³à®®à¯ˆ வேடà¯à®ªà®¾à®³à®°à¯:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Swap camera"
-msgstr "காமிராவை மாறà¯à®±à¯"
+msgid "Maximise me"
+msgstr "எனà¯à®©à¯ˆ அதிகபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
#: ../src/empathy-call-window.ui.h:11
msgid "Minimise me"
msgstr "எனà¯à®©à¯ˆ கà¯à®±à¯ˆà®µà®¾à®•à¯à®•à¯"
#: ../src/empathy-call-window.ui.h:12
-msgid "Maximise me"
-msgstr "எனà¯à®©à¯ˆ அதிகபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+msgid "Remote Candidate:"
+msgstr "தொலை வேடà¯à®ªà®¾à®³à®°à¯:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Disable camera"
-msgstr "காமிரா செயல௠நீகà¯à®•à¯"
+msgid "Show dialpad"
+msgstr "டயல௠அடà¯à®Ÿà¯ˆà®¯à¯ˆ காடà¯à®Ÿà¯"
#: ../src/empathy-call-window.ui.h:14
-msgid "Hang up"
-msgstr "தà¯à®£à¯à®Ÿà®¿"
+msgid "Start a video call"
+msgstr "விடியோ அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯"
#: ../src/empathy-call-window.ui.h:15
-msgid "Hang up current call"
-msgstr "நடபà¯à®ªà¯ அழைபà¯à®ªà¯ˆ தà¯à®£à¯à®Ÿà®¿"
+msgid "Start an audio call"
+msgstr "ஒலி அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯"
#: ../src/empathy-call-window.ui.h:16
-msgid "Video call"
-msgstr "விடியோ அழைபà¯à®ªà¯"
+msgid "Swap camera"
+msgstr "காமிராவை மாறà¯à®±à¯"
#: ../src/empathy-call-window.ui.h:17
-msgid "Start a video call"
-msgstr "விடியோ அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯"
-
-#: ../src/empathy-call-window.ui.h:19
-msgid "Start an audio call"
-msgstr "ஒலி அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯"
+msgid "Toggle audio transmission"
+msgstr "ஒலி அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ நிலை மாறà¯à®±à¯"
-#: ../src/empathy-call-window.ui.h:20
-msgid "Show dialpad"
-msgstr "டயல௠அடà¯à®Ÿà¯ˆà®¯à¯ˆ காடà¯à®Ÿà¯"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Toggle video transmission"
+msgstr "விடியோ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ நிலை மாறà¯à®±à¯"
#: ../src/empathy-call-window.ui.h:21
-msgid "Display the dialpad"
-msgstr "டயல௠படà¯à®Ÿà®¿à®¯à¯ˆ காடà¯à®Ÿà¯ "
+msgid "Video call"
+msgstr "விடியோ அழைபà¯à®ªà¯"
#: ../src/empathy-call-window.ui.h:22
-msgid "Toggle video transmission"
-msgstr "விடியோ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ நிலை மாறà¯à®±à¯"
+msgid "_Call"
+msgstr "(_C) அழை"
#: ../src/empathy-call-window.ui.h:23
-msgid "Toggle audio transmission"
-msgstr "ஒலி அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ˆ நிலை மாறà¯à®±à¯"
+msgid "_Camera"
+msgstr "_C கேமரா "
+
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-chat-window.ui.h:8
+msgid "_Contents"
+msgstr "உளà¯à®³à®Ÿà®•à¯à®•à®™à¯à®•à®³à¯ (_C)"
#: ../src/empathy-call-window.ui.h:25
-msgid "Encoding Codec:"
-msgstr "கà¯à®±à®¿à®®à¯à®±à¯ˆ கà¯à®±à®¿à®®à¯à®±à¯ˆà®¯à®¾à®•à¯à®•à®®à¯:"
+msgid "_Debug"
+msgstr "(_D) வழ௠நீகà¯à®•à¯"
#: ../src/empathy-call-window.ui.h:27
-msgid "Decoding Codec:"
-msgstr "கà¯à®±à®¿à®®à¯à®±à¯ˆ மீளாகà¯à®•à®®à¯:"
+msgid "_GStreamer"
+msgstr "_ ஜி ஸà¯à®Ÿà®¿à®°à¯€à®®à®°à¯"
-#: ../src/empathy-call-window.ui.h:28
-msgid "Remote Candidate:"
-msgstr "தொலை வேடà¯à®ªà®¾à®³à®°à¯:"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:13
+msgid "_Help"
+msgstr "உதவி (_H)"
#: ../src/empathy-call-window.ui.h:29
-msgid "Local Candidate:"
-msgstr "உளà¯à®³à®®à¯ˆ வேடà¯à®ªà®¾à®³à®°à¯:"
+msgid "_Microphone"
+msgstr "_M ஒலி வாஙà¯à®•à®¿"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
-msgid "Audio"
-msgstr "கேடà¯à®ªà¯Šà®²à®¿"
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Settings"
+msgstr "_S அமைபà¯à®ªà¯à®•à®³à¯"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Telepathy"
+msgstr "_T டெலிபதி"
+
+#: ../src/empathy-call-window.ui.h:32
+msgid "_View"
+msgstr "பாரà¯à®µà¯ˆ (_V)"
#: ../src/empathy-chat.c:102
msgid "- Empathy Chat Client"
@@ -3537,25 +3054,24 @@ msgstr "அறை"
msgid "Auto-Connect"
msgstr "தானியஙà¯à®•à®¿ இணை"
-#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
msgid "Manage Favorite Rooms"
msgstr "பிடிதà¯à®¤à®®à®¾à®© அறைகளை மேலாள"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடவா?"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
"until you rejoin it."
msgstr ""
-"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினாலà¯%s ஠விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠நà¯à®´à¯ˆà®µà¯ "
-"செயà¯à®¯à¯à®®à¯ வரை "
+"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினாலà¯%s ஠விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠நà¯à®´à¯ˆà®µà¯ செயà¯à®¯à¯à®®à¯ வரை "
"à®…à®™à¯à®•à®¿à®°à¯à®¨à¯à®¤à¯ எநà¯à®¤ செயà¯à®¤à®¿à®¯à¯à®®à¯ இனி வராதà¯."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3564,137 +3080,134 @@ msgid_plural ""
"Closing this window will leave %u chat rooms. You will not receive any "
"further messages until you rejoin them."
msgstr[0] ""
-"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினால௠ஒர௠அரடà¯à®Ÿà¯ˆ அறையை விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠"
-"நà¯à®´à¯ˆà®µà¯ "
+"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினால௠ஒர௠அரடà¯à®Ÿà¯ˆ அறையை விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠நà¯à®´à¯ˆà®µà¯ "
"செயà¯à®¯à¯à®®à¯ வரை à®…à®™à¯à®•à®¿à®°à¯à®¨à¯à®¤à¯ எநà¯à®¤ செயà¯à®¤à®¿à®¯à¯à®®à¯ இனி வராதà¯."
msgstr[1] ""
-"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினால௠%u அரடà¯à®Ÿà¯ˆ அறைகளை விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠"
-"நà¯à®´à¯ˆà®µà¯ "
+"இநà¯à®¤ சாளரதà¯à®¤à¯ˆ மூடினால௠%u அரடà¯à®Ÿà¯ˆ அறைகளை விடà¯à®Ÿà¯ வெளியேறà¯à®µà¯€à®°à¯à®•à®³à¯. நீஙà¯à®•à®³à¯ மற௠நà¯à®´à¯ˆà®µà¯ "
"செயà¯à®¯à¯à®®à¯ வரை à®…à®™à¯à®•à®¿à®°à¯à®¨à¯à®¤à¯ எநà¯à®¤ செயà¯à®¤à®¿à®¯à¯à®®à¯ இனி வராதà¯."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "%s ஠விடà¯à®Ÿà¯ வெளியேறவா?"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr ""
-"நீஙà¯à®•à®³à¯ இநà¯à®¤ அரடà¯à®Ÿà¯ˆ அறையில௠மற௠நà¯à®´à¯ˆà®µà¯ செயà¯à®¯à¯à®®à¯ வரை இஙà¯à®•à®¿à®°à¯à®¨à¯à®¤à¯ எநà¯à®¤ "
-"செயà¯à®¤à®¿à®¯à¯à®®à¯ இனி வராதà¯"
+"நீஙà¯à®•à®³à¯ இநà¯à®¤ அரடà¯à®Ÿà¯ˆ அறையில௠மற௠நà¯à®´à¯ˆà®µà¯ செயà¯à®¯à¯à®®à¯ வரை இஙà¯à®•à®¿à®°à¯à®¨à¯à®¤à¯ எநà¯à®¤ செயà¯à®¤à®¿à®¯à¯à®®à¯ இனி வராதà¯"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "சாளரதà¯à®¤à¯ˆ மூடà¯à®•"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "அறையை விடà¯à®Ÿà¯ வெளியேறà¯à®•"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d படிகà¯à®•à®¾à®¤à®¤à¯)"
msgstr[1] "%s (%d படிகà¯à®•à®¾à®¤à®¤à¯)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (மறà¯à®±à¯à®®à¯ %u மறà¯à®±à®µà®°à¯)"
msgstr[1] "%s (மறà¯à®±à¯à®®à¯ %u மறà¯à®±à®µà®°à¯à®•à®³à¯)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d மறà¯à®±à®µà®°à®¿à®Ÿà®®à¯ இரà¯à®¨à¯à®¤à¯ படிகà¯à®•à®¾à®¤à®¤à¯)"
msgstr[1] "%s (%d மறà¯à®±à®µà®°à®¿à®Ÿà®®à¯ இரà¯à®¨à¯à®¤à¯ படிகà¯à®•à®¾à®¤à®µà¯ˆ)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d எலà¯à®²à¯‹à®°à®¿à®Ÿà®®à®¿à®°à¯à®¨à¯à®¤à¯à®®à¯ படிகà¯à®•à®¾à®¤à®¤à¯)"
msgstr[1] "%s (%d எலà¯à®²à¯‹à®°à®¿à®Ÿà®®à®¿à®°à¯à®¨à¯à®¤à¯à®®à¯ படிகà¯à®•à®¾à®¤à®¤à¯)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "எஸà¯à®Žà®®à¯à®Žà®¸à¯:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "%d செயà¯à®¤à®¿ அனà¯à®ªà¯à®ªà¯à®•à®¿à®±à®¤à¯"
msgstr[1] "%d செயà¯à®¤à®¿à®•à®³à¯ அனà¯à®ªà¯à®ªà¯à®•à®¿à®±à®¤à¯"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "செயà¯à®¤à®¿à®•à®³à¯ தடà¯à®Ÿà®šà¯à®šà®¿à®Ÿà®²à¯"
#: ../src/empathy-chat-window.ui.h:1
-msgid "_Conversation"
-msgstr "உரையாடல௠(_C)"
-
-#: ../src/empathy-chat-window.ui.h:2
msgid "C_lear"
msgstr "தà¯à®Ÿà¯ˆ (_l)"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_o தொடரà¯à®ªà®¾à®³à®°à¯"
+
#: ../src/empathy-chat-window.ui.h:3
msgid "Insert _Smiley"
msgstr "ஸà¯à®®à¯ˆà®²à®¿à®¯à¯ˆ நà¯à®´à¯ˆ (_S)"
#: ../src/empathy-chat-window.ui.h:4
-msgid "_Favorite Chat Room"
-msgstr "பிடிதà¯à®¤à®®à®¾à®© அரடà¯à®Ÿà¯ˆ அறை (_F)"
+msgid "Invite _Participant…"
+msgstr "_P பஙà¯à®•à¯‡à®±à¯à®ªà®¾à®³à®°à¯ˆ அழை"
#: ../src/empathy-chat-window.ui.h:5
-msgid "Notify for All Messages"
-msgstr "எலà¯à®²à®¾ செயà¯à®¤à®¿à®•à®³à¯ˆà®¯à¯à®®à¯ அறிவி"
+msgid "Move Tab _Left"
+msgstr "ததà¯à®¤à®²à¯ˆ இடபà¯à®ªà®•à¯à®•à®®à¯ நகரà¯à®¤à¯à®¤à¯ (_L)"
-#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
-msgid "_Show Contact List"
-msgstr "(_S) தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠காடà¯à®Ÿà¯ "
+#: ../src/empathy-chat-window.ui.h:6
+msgid "Move Tab _Right"
+msgstr "ததà¯à®¤à®²à¯ˆ வலபà¯à®ªà®•à¯à®•à®®à¯ நகரà¯à®¤à¯à®¤à¯ (_R)"
#: ../src/empathy-chat-window.ui.h:7
-msgid "Invite _Participant…"
-msgstr "_P பஙà¯à®•à¯‡à®±à¯à®ªà®¾à®³à®°à¯ˆ அழை"
+msgid "Notify for All Messages"
+msgstr "எலà¯à®²à®¾ செயà¯à®¤à®¿à®•à®³à¯ˆà®¯à¯à®®à¯ அறிவி"
-#: ../src/empathy-chat-window.ui.h:8
-msgid "C_ontact"
-msgstr "_o தொடரà¯à®ªà®¾à®³à®°à¯"
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Conversation"
+msgstr "உரையாடல௠(_C)"
#: ../src/empathy-chat-window.ui.h:10
-msgid "_Tabs"
-msgstr "ததà¯à®¤à®²à¯à®•à®³à¯ (_T)"
-
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Previous Tab"
-msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ ததà¯à®¤à®²à¯ (_P)"
+msgid "_Detach Tab"
+msgstr "ததà¯à®¤à®²à¯ˆ தà¯à®£à¯à®Ÿà®¿ (_D)"
#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
+msgstr "பிடிதà¯à®¤à®®à®¾à®© அரடà¯à®Ÿà¯ˆ அறை (_F)"
+
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "அடà¯à®¤à¯à®¤ ததà¯à®¤à®²à¯ (_N)"
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Undo Close Tab"
-msgstr "_U கீறà¯à®±à¯ மூடலை மீளà¯"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "_Previous Tab"
+msgstr "à®®à¯à®¨à¯à®¤à¯ˆà®¯ ததà¯à®¤à®²à¯ (_P)"
-#: ../src/empathy-chat-window.ui.h:14
-msgid "Move Tab _Left"
-msgstr "ததà¯à®¤à®²à¯ˆ இடபà¯à®ªà®•à¯à®•à®®à¯ நகரà¯à®¤à¯à®¤à¯ (_L)"
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+msgid "_Show Contact List"
+msgstr "(_S) தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠காடà¯à®Ÿà¯ "
-#: ../src/empathy-chat-window.ui.h:15
-msgid "Move Tab _Right"
-msgstr "ததà¯à®¤à®²à¯ˆ வலபà¯à®ªà®•à¯à®•à®®à¯ நகரà¯à®¤à¯à®¤à¯ (_R)"
+#: ../src/empathy-chat-window.ui.h:17
+msgid "_Tabs"
+msgstr "ததà¯à®¤à®²à¯à®•à®³à¯ (_T)"
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Detach Tab"
-msgstr "ததà¯à®¤à®²à¯ˆ தà¯à®£à¯à®Ÿà®¿ (_D)"
+#: ../src/empathy-chat-window.ui.h:18
+msgid "_Undo Close Tab"
+msgstr "_U கீறà¯à®±à¯ மூடலை மீளà¯"
#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
@@ -3722,66 +3235,81 @@ msgstr "பேஸà¯à®Ÿà¯à®ªà®¿à®©à¯ எதிரà¯à®µà®¿à®©à¯ˆ"
#: ../src/empathy-debug-window.c:1675
msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
-"தரவ௠ஒறà¯à®±à¯ˆ ஒடà¯à®Ÿà®²à¯à®•à¯à®•à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®¤à¯. பதிவை தயைசெயà¯à®¤à¯ கோபà¯à®ªà¯à®•à¯à®•à¯ சேமிகà¯à®•à®µà¯à®®à¯."
+msgstr "தரவ௠ஒறà¯à®±à¯ˆ ஒடà¯à®Ÿà®²à¯à®•à¯à®•à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®¤à¯. பதிவை தயைசெயà¯à®¤à¯ கோபà¯à®ªà¯à®•à¯à®•à¯ சேமிகà¯à®•à®µà¯à®®à¯."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "வழ௠நீகà¯à®•à¯ சாளரமà¯"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "பேஸà¯à®Ÿà¯à®ªà®¿à®©à¯ கà¯à®•à¯ அனà¯à®ªà¯à®ªà¯ "
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "தாமதி"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "மடà¯à®Ÿà®®à¯"
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "வழà¯à®¨à¯€à®•à¯à®•à¯"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "தகவலà¯"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "செயà¯à®¤à®¿"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "ஆபதà¯à®¤à®¾à®©"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr " பிழை"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"கடவà¯à®šà¯à®šà¯Šà®±à¯à®•à®³à¯ˆ காடà¯à®Ÿà®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯à®®à¯ பதிவேடà¯à®•à®³à¯ அநà¯à®¤à®°à®™à¯à®• தகவலà¯à®•à®³à¯ˆ - உஙà¯à®•à®³à¯ தொடரà¯à®ªà¯à®•à®³à¯, நீஙà¯à®•à®³à¯ "
+"அனà¯à®ªà¯à®ªà®¿à®¯ பெறà¯à®± செயà¯à®¤à®¿à®•à®³à¯ போனà¯à®±à®©- அடகà¯à®•à®¿ உளà¯à®³à®©.\n"
+"அபà¯à®ªà®Ÿà®¿à®ªà¯à®ªà®Ÿà¯à®Ÿà®µà¯ˆ உஙà¯à®•à®³à¯ பொத௠வழ௠அறிகà¯à®•à¯ˆà®¯à®¿à®²à¯ இடம௠பெறகà¯à®•à¯‚டாத௠எனà¯à®±à¯ நீஙà¯à®•à®³à¯ நினைதà¯à®¤à®¾à®²à¯ எமà¯à®ªà®¤à®¿ "
+"உரà¯à®µà®¾à®•à¯à®•à¯à®µà¯‹à®°à¯à®•à¯à®•à¯ மடà¯à®Ÿà¯à®®à¯ அவை காணà¯à®®à¯à®ªà®Ÿà®¿ அமைகà¯à®•à®²à®¾à®®à¯. இதறà¯à®•à¯ <a href=\"https://bugzilla.gnome."
+"org/enter_bug.cgi?product=empathy\">bug report</a> இல௠மேமà¯à®ªà®Ÿà¯à®Ÿ பà¯à®²à®™à¯à®•à®³à¯ˆ காணà¯à®•."
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "நேரமà¯"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "களமà¯"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "வகை"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "மடà¯à®Ÿà®®à¯"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3969,8 +3497,7 @@ msgstr "கோபà¯à®ªà¯ பறிமாறà¯à®±à®™à¯à®•à®³à¯ "
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr ""
-"பூரà¯à®¤à¯à®¤à®¿à®¯à®¾à®©à®¤à¯, ரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯, தோலà¯à®µà®¿ அடைநà¯à®¤à®¤à¯ ஆகிய கோபà¯à®ªà¯ பரிமாறà¯à®±à®™à¯à®•à®³à¯ˆ "
-"படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ "
+"பூரà¯à®¤à¯à®¤à®¿à®¯à®¾à®©à®¤à¯, ரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯, தோலà¯à®µà®¿ அடைநà¯à®¤à®¤à¯ ஆகிய கோபà¯à®ªà¯ பரிமாறà¯à®±à®™à¯à®•à®³à¯ˆ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ "
"இரà¯à®¨à¯à®¤à¯ நீகà¯à®•à¯ "
#: ../src/empathy-import-dialog.c:76
@@ -3982,8 +3509,7 @@ msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr ""
-"கணகà¯à®•à¯à®•à®³à¯ à®à®¤à¯à®®à¯ இறகà¯à®•à¯à®®à®¤à®¿ செயà¯à®¯ இலà¯à®²à¯ˆ. எமà¯à®ªà®¤à®¿ இபà¯à®ªà¯‹à®¤à¯ˆà®•à¯à®•à¯ பிடà¯à®œà®¿à®©à¯ இலிரà¯à®¨à¯à®¤à¯ "
-"மடà¯à®Ÿà¯à®®à¯‡ "
+"கணகà¯à®•à¯à®•à®³à¯ à®à®¤à¯à®®à¯ இறகà¯à®•à¯à®®à®¤à®¿ செயà¯à®¯ இலà¯à®²à¯ˆ. எமà¯à®ªà®¤à®¿ இபà¯à®ªà¯‹à®¤à¯ˆà®•à¯à®•à¯ பிடà¯à®œà®¿à®©à¯ இலிரà¯à®¨à¯à®¤à¯ மடà¯à®Ÿà¯à®®à¯‡ "
"இறகà¯à®•à¯à®®à®¤à®¿à®•à®³à¯ˆ அனà¯à®®à®¤à®¿à®•à¯à®•à®¿à®±à®¤à¯."
#: ../src/empathy-import-dialog.c:209
@@ -4055,47 +3581,43 @@ msgstr "இலà¯à®²à¯ˆ"
msgid "Join Room"
msgstr "அறை இல௠சேர௠"
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"சேரà¯à®µà®¤à®±à¯à®•à®¾à®© அறை பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ உளà¯à®³ ஒனà¯à®±à¯‹ மேறà¯à®ªà®Ÿà¯à®Ÿ "
-"பெயரà¯à®•à®³à¯ˆà®¯à¯‹ "
-"சொடà¯à®•à¯à®•à¯à®•."
-
#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "_Room:"
-msgstr "(_R) அறை:"
+msgid "Couldn't load room list"
+msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯ˆ à®à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"சேரà¯à®µà®¤à®±à¯à®•à®¾à®© அறை பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ உளà¯à®³ ஒனà¯à®±à¯‹ மேறà¯à®ªà®Ÿà¯à®Ÿ பெயரà¯à®•à®³à¯ˆà®¯à¯‹ "
+"சொடà¯à®•à¯à®•à¯à®•."
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account&apos;s server"
msgstr ""
-"அறையை தரà¯à®®à¯ சேவையகதà¯à®¤à®¿à®©à¯ பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ அத௠நடபà¯à®ªà¯à®•à¯ கணகà¯à®•à¯ "
-"சேவையகதà¯à®¤à®¿à®²à¯ "
+"அறையை தரà¯à®®à¯ சேவையகதà¯à®¤à®¿à®©à¯ பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ அத௠நடபà¯à®ªà¯à®•à¯ கணகà¯à®•à¯ சேவையகதà¯à®¤à®¿à®²à¯ "
"இரà¯à®¨à¯à®¤à®¾à®²à¯ வெறà¯à®±à®¾à®• விடவà¯à®®à¯."
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account's server"
msgstr ""
-"அறையை தரà¯à®®à¯ சேவையகதà¯à®¤à®¿à®©à¯ பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ அத௠நடபà¯à®ªà¯ சேவையகதà¯à®¤à®¿à®²à¯ "
-"இரà¯à®¨à¯à®¤à®¾à®²à¯ "
+"அறையை தரà¯à®®à¯ சேவையகதà¯à®¤à®¿à®©à¯ பெயரை இஙà¯à®•à¯ உளà¯à®³à®¿à®Ÿà¯à®•. அலà¯à®²à®¤à¯ அத௠நடபà¯à®ªà¯ சேவையகதà¯à®¤à®¿à®²à¯ இரà¯à®¨à¯à®¤à®¾à®²à¯ "
"வெறà¯à®±à®¾à®• விடவà¯à®®à¯."
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "_Server:"
-msgstr "(_S) சேவையகமà¯:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯"
#: ../src/empathy-new-chatroom-dialog.ui.h:7
-msgid "Couldn't load room list"
-msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯ˆ à®à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
+msgid "_Room:"
+msgstr "(_R) அறை:"
#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "Room List"
-msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯"
+msgid "_Server:"
+msgstr "(_S) சேவையகமà¯:"
#: ../src/empathy-notifications-approver.c:188
msgid "Respond"
@@ -4199,181 +3721,181 @@ msgid "Preferences"
msgstr "விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
#: ../src/empathy-preferences.ui.h:2
-msgid "Show groups"
-msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿà¯ "
+msgid "Behavior"
+msgstr "நடதà¯à®¤à¯ˆ"
-#: ../src/empathy-preferences.ui.h:3
-msgid "Show account balances"
-msgstr "கணகà¯à®•à¯ வைபà¯à®ªà¯à®¤à¯à®¤à¯Šà®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿà¯"
+#: ../src/empathy-preferences.ui.h:5
+msgid "Chat Th_eme:"
+msgstr "(_e) அரடà¯à®Ÿà¯ˆ கரà¯à®¤à¯à®¤à¯:"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:6 ../src/empathy-roster-window.c:2166
msgid "Contact List"
msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
-#: ../src/empathy-preferences.ui.h:5
-msgid "Start chats in:"
-msgstr "அரடà¯à®Ÿà¯ˆà®¯à¯ˆ இதில௠தà¯à®µà®™à¯à®•à¯:"
-
-#: ../src/empathy-preferences.ui.h:6
-msgid "new ta_bs"
-msgstr "_b பà¯à®¤à®¿à®¯ கீறà¯à®±à¯à®•à®³à¯"
-
#: ../src/empathy-preferences.ui.h:7
-msgid "new _windows"
-msgstr " _w பà¯à®¤à®¿à®¯ சாளரஙà¯à®•à®³à¯"
+msgid "Disable notifications when _away or busy"
+msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயல௠நீகà¯à®•à¯"
#: ../src/empathy-preferences.ui.h:8
-msgid "Show _smileys as images"
-msgstr "(_s) சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ பிமà¯à®ªà®™à¯à®•à®³à®¾à®• காடà¯à®Ÿà¯"
+msgid "Disable sounds when _away or busy"
+msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ ஒலிகளை செயல௠நீகà¯à®•à¯"
#: ../src/empathy-preferences.ui.h:9
-msgid "Show contact _list in rooms"
-msgstr "(_l) அறைகளில௠தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠காடà¯à®Ÿà¯ "
+msgid "Display incoming events in the notification area"
+msgstr "உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ அறிவிபà¯à®ªà¯ இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•."
#: ../src/empathy-preferences.ui.h:10
-msgid "Log conversations"
-msgstr "உரையாடலà¯à®•à®³à¯ˆ பதிவேடà¯à®Ÿà®¿à®²à¯ கà¯à®±à®¿"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"எதிரொலி நீகà¯à®•à®®à¯ மறà¯à®±à®µà®°à¯ˆà®µà®¿à®Ÿ உஙà¯à®•à®³à¯ பேசà¯à®šà¯ˆ தà¯à®²à¯à®²à®¿à®¯à®®à®¾à®• ஆகà¯à®• உதவà¯à®•à®¿à®±à®¤à¯. அழைபà¯à®ªà¯à®•à®³à®¿à®©à¯ போத௠"
+"நீஙà¯à®•à®³à¯‹ மறà¯à®±à®µà®°à¯‹ வினொபொதமான சதà¯à®¤à®™à¯à®•à®³à¯ அலலà¯à®¤à¯ தடஙà¯à®•à®²à¯à®•à®³à¯ˆ கேடà¯à®• நேரà¯à®¨à¯à®¤à®¾à®²à¯ எதிரொலி நீகà¯à®•à®¤à¯à®¤à¯ˆ "
+"நிறà¯à®¤à¯à®¤à¯à®™à¯à®•à®³à¯; பின௠மீணà¯à®Ÿà¯à®®à¯ அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯à®™à¯à®•à®³à¯."
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact comes online"
+msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
#: ../src/empathy-preferences.ui.h:12
-msgid "Display incoming events in the notification area"
-msgstr "உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ அறிவிபà¯à®ªà¯ இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•."
+msgid "Enable notifications when a contact goes offline"
+msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
#: ../src/empathy-preferences.ui.h:13
-msgid "_Automatically connect on startup"
-msgstr "(_A) தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• இணை"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "(_c) அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ போத௠அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
#: ../src/empathy-preferences.ui.h:14
-msgid "Behavior"
-msgstr "நடதà¯à®¤à¯ˆ"
+msgid "Enable spell checking for languages:"
+msgstr "மொழிகளà¯à®•à¯à®•à¯ எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯:"
#: ../src/empathy-preferences.ui.h:15
msgid "General"
msgstr "பொதà¯"
-#: ../src/empathy-preferences.ui.h:16
-msgid "_Enable bubble notifications"
-msgstr "(_E) பலூனில௠அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
-
#: ../src/empathy-preferences.ui.h:17
-msgid "Disable notifications when _away or busy"
-msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயல௠நீகà¯à®•à¯"
+msgid "Location sources:"
+msgstr "இட மூலஙà¯à®•à®³à¯:"
#: ../src/empathy-preferences.ui.h:18
-msgid "Enable notifications when the _chat is not focused"
-msgstr "(_c) அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ போத௠அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+msgid "Log conversations"
+msgstr "உரையாடலà¯à®•à®³à¯ˆ பதிவேடà¯à®Ÿà®¿à®²à¯ கà¯à®±à®¿"
#: ../src/empathy-preferences.ui.h:19
-msgid "Enable notifications when a contact comes online"
-msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+msgid "Notifications"
+msgstr "அறிவிபà¯à®ªà¯à®•à®³à¯"
#: ../src/empathy-preferences.ui.h:20
-msgid "Enable notifications when a contact goes offline"
-msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+msgid "Play sound for events"
+msgstr "நிகழà¯à®µà¯à®•à®³à¯à®•à¯à®•à¯ ஒலியை இயகà¯à®•à¯"
#: ../src/empathy-preferences.ui.h:21
-msgid "Notifications"
-msgstr "அறிவிபà¯à®ªà¯à®•à®³à¯"
+msgid "Privacy"
+msgstr "அநà¯à®¤à®°à®™à¯à®•à®®à¯"
#: ../src/empathy-preferences.ui.h:22
-msgid "_Enable sound notifications"
-msgstr "(_E) ஒலி அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"கà¯à®±à¯ˆà®¤à¯à®¤ இட கà¯à®±à®¿à®ªà¯à®ªà¯ எனில௠உஙà¯à®•à®³à¯ மாநகரமà¯, மாநிலமà¯, நாட௠தவிர ஒனà¯à®±à¯à®®à¯ வெளியிடபà¯à®ªà®Ÿà®¾à®¤à¯. "
+"ஜிபிஎஸ௠ஆயதà¯à®¤à¯Šà®²à¯ˆà®µà¯à®•à®³à¯à®•à¯à®•à¯ 1 தசம இடம௠திரà¯à®¤à¯à®¤à®®à®¾à®• இரà¯à®•à¯à®•à¯à®®à¯."
#: ../src/empathy-preferences.ui.h:23
-msgid "Disable sounds when _away or busy"
-msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ ஒலிகளை செயல௠நீகà¯à®•à¯"
+msgid "Show _smileys as images"
+msgstr "(_s) சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ பிமà¯à®ªà®™à¯à®•à®³à®¾à®• காடà¯à®Ÿà¯"
#: ../src/empathy-preferences.ui.h:24
-msgid "Play sound for events"
-msgstr "நிகழà¯à®µà¯à®•à®³à¯à®•à¯à®•à¯ ஒலியை இயகà¯à®•à¯"
+msgid "Show account balances"
+msgstr "கணகà¯à®•à¯ வைபà¯à®ªà¯à®¤à¯à®¤à¯Šà®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿà¯"
#: ../src/empathy-preferences.ui.h:25
-msgid "Sounds"
-msgstr "ஒலிகளà¯"
+msgid "Show contact _list in rooms"
+msgstr "(_l) அறைகளில௠தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠காடà¯à®Ÿà¯ "
#: ../src/empathy-preferences.ui.h:26
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_e அழைபà¯à®ªà¯ தரதà¯à®¤à¯ˆ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤ எதிரொலி நீகà¯à®•à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®• "
+msgid "Show groups"
+msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿà¯ "
#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"எதிரொலி நீகà¯à®•à®®à¯ மறà¯à®±à®µà®°à¯ˆà®µà®¿à®Ÿ உஙà¯à®•à®³à¯ பேசà¯à®šà¯ˆ தà¯à®²à¯à®²à®¿à®¯à®®à®¾à®• ஆகà¯à®• உதவà¯à®•à®¿à®±à®¤à¯. "
-"அழைபà¯à®ªà¯à®•à®³à®¿à®©à¯ போத௠"
-"நீஙà¯à®•à®³à¯‹ மறà¯à®±à®µà®°à¯‹ வினொபொதமான சதà¯à®¤à®™à¯à®•à®³à¯ அலலà¯à®¤à¯ தடஙà¯à®•à®²à¯à®•à®³à¯ˆ கேடà¯à®• நேரà¯à®¨à¯à®¤à®¾à®²à¯ "
-"எதிரொலி நீகà¯à®•à®¤à¯à®¤à¯ˆ "
-"நிறà¯à®¤à¯à®¤à¯à®™à¯à®•à®³à¯; பின௠மீணà¯à®Ÿà¯à®®à¯ அழைபà¯à®ªà¯ˆ தà¯à®µà®•à¯à®•à¯à®™à¯à®•à®³à¯."
+msgid "Show offline contacts"
+msgstr " வலை தொடரà¯à®ªà®¿à®²à¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "Sounds"
+msgstr "ஒலிகளà¯"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "Spell Checking"
+msgstr "எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®®à¯"
#: ../src/empathy-preferences.ui.h:30
-msgid "_Publish location to my contacts"
-msgstr "(_P) என௠தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ இடதà¯à®¤à¯ˆ வெளியிடà¯"
+msgid "Start chats in:"
+msgstr "அரடà¯à®Ÿà¯ˆà®¯à¯ˆ இதில௠தà¯à®µà®™à¯à®•à¯:"
#: ../src/empathy-preferences.ui.h:31
msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will be accurate to 1 "
-"decimal place."
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
msgstr ""
-"கà¯à®±à¯ˆà®¤à¯à®¤ இட கà¯à®±à®¿à®ªà¯à®ªà¯ எனில௠உஙà¯à®•à®³à¯ மாநகரமà¯, மாநிலமà¯, நாட௠தவிர ஒனà¯à®±à¯à®®à¯ "
-"வெளியிடபà¯à®ªà®Ÿà®¾à®¤à¯. "
-"ஜிபிஎஸ௠ஆயதà¯à®¤à¯Šà®²à¯ˆà®µà¯à®•à®³à¯à®•à¯à®•à¯ 1 தசம இடம௠திரà¯à®¤à¯à®¤à®®à®¾à®• இரà¯à®•à¯à®•à¯à®®à¯."
+"இநà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ நீஙà¯à®•à®³à¯ எநà¯à®¤ மொழிகளà¯à®•à¯à®•à¯ அகராதி நிறà¯à®µà®¿ இரà¯à®•à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯‹ அவறà¯à®±à¯ˆ மடà¯à®Ÿà¯à®®à¯‡ "
+"காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "Themes"
+msgstr "கரà¯à®¤à¯à®¤à¯à®•à®³à¯"
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:33
-msgid "_Reduce location accuracy"
-msgstr "(_R) இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆ"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_e அழைபà¯à®ªà¯ தரதà¯à®¤à¯ˆ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤ எதிரொலி நீகà¯à®•à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®• "
#: ../src/empathy-preferences.ui.h:34
-msgid "Privacy"
-msgstr "அநà¯à®¤à®°à®™à¯à®•à®®à¯"
+msgid "Variant:"
+msgstr "மாறà¯à®±à¯:"
#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "(_G) ஜிபிஎஸà¯"
+msgid "_Automatically connect on startup"
+msgstr "(_A) தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• இணை"
#: ../src/empathy-preferences.ui.h:36
msgid "_Cellphone"
msgstr "_C அலைபேசி"
#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_N வலையமைபà¯à®ªà¯ (à®à®ªà®¿, வைஃபை)"
+msgid "_Enable bubble notifications"
+msgstr "(_E) பலூனில௠அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "இட மூலஙà¯à®•à®³à¯:"
+msgid "_Enable sound notifications"
+msgstr "(_E) ஒலி அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "_GPS"
+msgstr "(_G) ஜிபிஎஸà¯"
#: ../src/empathy-preferences.ui.h:40
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"இநà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ நீஙà¯à®•à®³à¯ எநà¯à®¤ மொழிகளà¯à®•à¯à®•à¯ அகராதி நிறà¯à®µà®¿ இரà¯à®•à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯‹ அவறà¯à®±à¯ˆ "
-"மடà¯à®Ÿà¯à®®à¯‡ "
-"காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_N வலையமைபà¯à®ªà¯ (à®à®ªà®¿, வைஃபை)"
#: ../src/empathy-preferences.ui.h:41
-msgid "Enable spell checking for languages:"
-msgstr "மொழிகளà¯à®•à¯à®•à¯ எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯:"
-
-#: ../src/empathy-preferences.ui.h:42
-msgid "Spell Checking"
-msgstr "எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®®à¯"
+msgid "_Publish location to my contacts"
+msgstr "(_P) என௠தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ இடதà¯à®¤à¯ˆ வெளியிடà¯"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
#: ../src/empathy-preferences.ui.h:43
-msgid "Chat Th_eme:"
-msgstr "(_e) அரடà¯à®Ÿà¯ˆ கரà¯à®¤à¯à®¤à¯:"
+msgid "_Reduce location accuracy"
+msgstr "(_R) இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆ"
#: ../src/empathy-preferences.ui.h:44
-msgid "Variant:"
-msgstr "மாறà¯à®±à¯:"
+msgid "new _windows"
+msgstr " _w பà¯à®¤à®¿à®¯ சாளரஙà¯à®•à®³à¯"
#: ../src/empathy-preferences.ui.h:45
-msgid "Themes"
-msgstr "கரà¯à®¤à¯à®¤à¯à®•à®³à¯"
+msgid "new ta_bs"
+msgstr "_b பà¯à®¤à®¿à®¯ கீறà¯à®±à¯à®•à®³à¯"
#: ../src/empathy-roster-window.c:242
msgid "Provide Password"
@@ -4390,117 +3912,68 @@ msgstr "தொடரà¯à®ªà¯à®•à®³à¯ˆ இஙà¯à®•à¯‡ காண நீஙà¯à®•
#: ../src/empathy-roster-window.c:517
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr ""
-"மனà¯à®©à®¿à®•à¯à®•, %s கணகà¯à®•à¯à®•à®³à¯ உஙà¯à®•à®³à¯ %s மெனà¯à®ªà¯Šà®°à¯à®³à¯ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯ வரை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ "
-"இயலாதà¯."
+msgstr "மனà¯à®©à®¿à®•à¯à®•, %s கணகà¯à®•à¯à®•à®³à¯ உஙà¯à®•à®³à¯ %s மெனà¯à®ªà¯Šà®°à¯à®³à¯ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯ வரை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலாதà¯."
+
+#: ../src/empathy-roster-window.c:617
+msgid "Windows Live"
+msgstr "விணà¯à®Ÿà¯‹à®¸à¯ லைவ௠"
+
+#: ../src/empathy-roster-window.c:621
+msgid "Facebook"
+msgstr "பேஸà¯à®ªà¯à®•à¯"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:636
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s கணகà¯à®•à¯à®•à¯à®•à¯ உறà¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯ தேவை"
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:647
+msgid "Online Accounts"
+msgstr "ஆன௠லைன௠கணகà¯à®•à¯à®•à®³à¯"
+
+#: ../src/empathy-roster-window.c:694
msgid "Update software..."
msgstr "மெனà¯à®ªà¯Šà®°à¯à®³à¯ˆ மேமà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯..."
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:700
msgid "Reconnect"
msgstr "மீள௠இணை"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:704
msgid "Edit Account"
msgstr "கணகà¯à®•à¯à®•à®³à¯ˆ திரà¯à®¤à¯à®¤à¯à®•"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:709
msgid "Close"
msgstr "மூடà¯"
-#: ../src/empathy-roster-window.c:787
+#: ../src/empathy-roster-window.c:846
msgid "Top up account"
msgstr "கணகà¯à®•à¯ இரà¯à®ªà¯à®ªà¯ˆ உயரà¯à®¤à¯à®¤à¯"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1528
msgid "You need to enable one of your accounts to see contacts here."
msgstr "தொடரà¯à®ªà¯à®•à®³à¯ˆ இஙà¯à®•à¯‡ காண நீஙà¯à®•à®³à¯ உஙà¯à®•à®³à®¤à¯ ஒர௠கணகà¯à®•à¯ˆ செயலாகà¯à®• வேணà¯à®Ÿà¯à®®à¯."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1536
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "தொடரà¯à®ªà¯à®•à®³à¯ˆ இஙà¯à®•à¯‡ காண நீஙà¯à®•à®³à¯ %s ஠செயலாகà¯à®• வேணà¯à®Ÿà¯à®®à¯."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1614
msgid "Change your presence to see contacts here"
msgstr "தொடரà¯à®ªà¯à®•à®³à¯ˆ இஙà¯à®•à¯‡ காண நீஙà¯à®•à®³à¯ உஙà¯à®•à®³à¯ இரà¯à®ªà¯à®ªà¯ˆ மாறà¯à®± வேணà¯à®Ÿà¯à®®à¯."
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1623
msgid "No match found"
msgstr "பொரà¯à®¤à¯à®¤à®®à¯ à®à®¤à¯à®®à¯ காணபà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-roster-window.c:1569
+#: ../src/empathy-roster-window.c:1628
msgid "No online contacts"
msgstr " வலை தொடரà¯à®ªà®¿à®²à¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ à®à®¤à¯à®®à®¿à®²à¯à®²à¯ˆ"
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_N பà¯à®¤à®¿à®¯ உரையாடலà¯..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "_C பà¯à®¤à®¿à®¯ அழைபà¯à®ªà¯..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Contacts"
-msgstr "தொடரà¯à®ªà¯à®•à®³à¯"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "(_A) தொடரà¯à®ªà¯à®•à®³à¯ˆ சேரà¯..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_S தொடரà¯à®ªà¯à®•à®³à¯ˆ ஠தேடà¯..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Blocked Contacts"
-msgstr "_B தடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ தொடரà¯à®ªà¯à®•à®³à¯"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_Rooms"
-msgstr "(_R) அறைகளà¯"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "(_J) சேரà¯..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Join _Favorites"
-msgstr "(_F) விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ சேர௠"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "_Manage Favorites"
-msgstr "_M விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ˆ மேலாளà¯à®•"
-
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "_File Transfers"
-msgstr "(_F) கோபà¯à®ªà¯ பறிமாறà¯à®±à®™à¯à®•à®³à¯ "
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "கணகà¯à®•à¯à®•à®³à¯ (_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "P_references"
-msgstr "(_r) விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "Help"
-msgstr "உதவி"
-
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "About Empathy"
-msgstr "எமà¯à®ªà®¤à®¿ - அறிமà¯à®•à®®à¯"
-
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "வெளியேற௠(_Q)"
-
#: ../src/empathy-roster-window.ui.h:1
msgid "Account settings"
msgstr "கணகà¯à®•à¯ அமைபà¯à®ªà¯à®•à®³à¯"
@@ -4509,18 +3982,22 @@ msgstr "கணகà¯à®•à¯ அமைபà¯à®ªà¯à®•à®³à¯"
msgid "Go _Online"
msgstr " _O இணைபà¯à®ªà¯à®•à¯à®•à¯ செலà¯à®•"
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_N பà¯à®¤à®¿à®¯ உரையாடலà¯"
-
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "_C பà¯à®¤à®¿à®¯ அழைபà¯à®ªà¯"
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "நிலை"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_N பà¯à®¤à®¿à®¯ உரையாடலà¯"
+
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Quit"
+msgstr "வெளியேற௠(_Q)"
+
#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
msgid "Done"
@@ -4542,29 +4019,354 @@ msgstr "à®à®Žà®®à¯ கணகà¯à®•à¯à®•à®³à¯ˆ à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®•
#~ msgid "Manage Messaging and VoIP accounts"
#~ msgstr "செயà¯à®¤à®¿ அனà¯à®ªà¯à®ªà¯à®¤à®²à¯ மறà¯à®±à¯à®®à¯ வோயà¯à®ªà¯ கணகà¯à®•à¯à®•à®³à¯ ஠மேலாளவà¯à®®à¯ "
+#~ msgid "Always open a separate chat window for new chats."
+#~ msgstr "எபà¯à®ªà¯‹à®¤à¯à®®à¯ பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆà®•à¯à®•à¯ பà¯à®¤à®¿à®¯ சாளரம௠திற"
+
+#~ msgid "Camera device"
+#~ msgstr "கேமரா சாதனமà¯"
+
+#~ msgid "Camera position"
+#~ msgstr "கேமரா நிலை"
+
+#~ msgid ""
+#~ "Character to add after nickname when using nick completion (tab) in group "
+#~ "chat."
+#~ msgstr ""
+#~ "கà¯à®´à¯ அரடà¯à®Ÿà¯ˆà®¯à®¿à®²à¯ செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯ கீறà¯à®±à®¿à®²à¯ செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯à®•à¯à®•à¯à®ªà¯à®ªà®¿à®©à¯ சேரà¯à®•à¯à®• வேணà¯à®Ÿà®¿à®¯ எழà¯à®¤à¯à®¤à¯à®°à¯"
+
+#~ msgid "Chat window theme"
+#~ msgstr "அரடà¯à®Ÿà¯ˆ சாளர கரà¯à®¤à¯à®¤à¯"
+
+#~ msgid "Chat window theme variant"
+#~ msgstr "அரடà¯à®Ÿà¯ˆ சாளர மாறà¯à®±à¯ கரà¯à®¤à¯à®¤à¯"
+
+#~ msgid ""
+#~ "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl"
+#~ "\")."
+#~ msgstr ""
+#~ "சொல௠திரà¯à®¤à¯à®¤à®¿ மொழிகளை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ காற௠பà¯à®³à¯à®³à®¿à®¯à®¾à®²à¯ பிரிதà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ (எ-டà¯. \"en, fr, "
+#~ "nl \")"
+
#~ msgid "Compact contact list"
#~ msgstr "அடகà¯à®•à®®à®¾à®© தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯"
+#~ msgid "Connection managers should be used"
+#~ msgstr "இணைபà¯à®ªà¯ மேலாளரை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à¯"
+
#~ msgid "Contact list sort criterion"
#~ msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤ கடà¯à®Ÿà®³à¯ˆ விதி"
+#~ msgid "D-Bus object path of the last account selected to join a room."
+#~ msgstr "ஒர௠அறையில௠சேர கடைசியாக தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கணகà¯à®•à®¿à®©à¯ டி-பஸ௠பொரà¯à®³à¯ பாதை"
+
+#~ msgid "Default camera device to use in video calls, e.g. /dev/video0."
+#~ msgstr "விடியோ அழைபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ கேமரா சாதனமà¯. எ-கா. /dev/video0."
+
+#~ msgid "Default directory to select an avatar image from"
+#~ msgstr "அவதாரம௠படம௠தேநà¯à®¤à¯†à®Ÿà¯à®•à¯à®• à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அடைவà¯"
+
+#~ msgid "Disable popup notifications when away"
+#~ msgstr "வெளியே உளà¯à®³ போத௠தà¯à®³à¯à®³à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயல௠நீகà¯à®•à¯à®•"
+
+#~ msgid "Disable sounds when away"
+#~ msgstr "வெளியே உளà¯à®³ போத௠ஒலியை செயல௠நீகà¯à®•à¯à®•"
+
+#~ msgid "Display incoming events in the status area"
+#~ msgstr "உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ நிலைபà¯à®ªà®²à®• இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•."
+
+#~ msgid ""
+#~ "Display incoming events in the status area. If false, present them to the "
+#~ "user immediately."
+#~ msgstr ""
+#~ "உளà¯à®µà®°à¯à®®à¯ நிகழà¯à®šà¯à®šà®¿à®•à®³à¯ˆ நிலை அறிவிபà¯à®ªà¯ இடதà¯à®¤à®¿à®²à¯ காடà¯à®Ÿà¯à®•. இலà¯à®²à¯ˆ என அமைநà¯à®¤à®¾à®²à¯ பயனரà¯à®•à¯à®•à¯ "
+#~ "உடனே காடà¯à®Ÿà¯à®•."
+
+#~ msgid "Echo cancellation support"
+#~ msgstr "எதிரொலி நீகà¯à®•à®¿ ஆதரவà¯"
+
+#~ msgid "Empathy can publish the user's location"
+#~ msgstr "பயனரின௠இடதà¯à®¤à¯ˆ தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ காடà¯à®Ÿ இயலà¯à®®à¯"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• ஜிபிஎஸ௠஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• அலைபேசி வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
+
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "எமà¯à®ªà®¤à®¿à®¯à®¾à®²à¯ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ இயலà¯à®®à¯"
+
+#~ msgid "Empathy default download folder"
+#~ msgstr "எமà¯à®ªà®¤à®¿ à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ தரவிறகà¯à®• அடைவà¯"
+
+#~ msgid "Empathy should auto-away when idle"
+#~ msgstr "சà¯à®®à¯à®®à®¾ இரà¯à®•à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ தானியஙà¯à®•à®¿à®¯à®¾à®• வெளியே இரà¯à®ªà¯à®ªà®¤à®¾à®• வேணà¯à®Ÿà¯à®®à¯."
+
+#~ msgid "Empathy should auto-connect on startup"
+#~ msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ தானியஙà¯à®•à®¿à®¯à®¾à®• இணைகà¯à®• வேணà¯à®Ÿà¯à®®à¯."
+
+#~ msgid "Empathy should reduce the location's accuracy"
+#~ msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடததின௠கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• வேணà¯à®Ÿà¯à®®à¯."
+
+#~ msgid "Empathy should use the avatar of the contact as the chat window icon"
+#~ msgstr ""
+#~ "தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ அரடà¯à®Ÿà¯ˆ சாரளதà¯à®¤à®¿à®²à¯ சினà¯à®©à®®à®¾à®• தொடரà¯à®ªà®¿à®©à¯ அவதாரதà¯à®¤à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à¯."
+
+#~ msgid "Enable WebKit Developer Tools"
+#~ msgstr "வெபà¯à®•à®¿à®Ÿà¯ உரà¯à®µà®¾à®•à¯à®•à¯à®µà¯‹à®°à¯ கரà¯à®µà®¿à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+#~ msgid "Enable popup notifications for new messages"
+#~ msgstr "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ தà¯à®³à¯à®³à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ "
+
+#~ msgid "Enable spell checker"
+#~ msgstr "சொல௠திரà¯à®¤à¯à®¤à®¿à®¯à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+
+#~ msgid "Hide main window"
+#~ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மறை "
+
+#~ msgid "Hide the main window."
+#~ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மறை "
+
+#~ msgid "Inform other users when you are typing to them"
+#~ msgstr "மறà¯à®± பயனரà¯à®•à®³à¯à®•à¯à®•à¯ அவரà¯à®•à®³à¯à®•à¯à®•à®¾à®• தடà¯à®Ÿà®šà¯à®šà¯à®®à¯ போத௠தெரிவிகà¯à®•à®µà¯à®®à¯"
+
+#~ msgid "Last account selected in Join Room dialog"
+#~ msgstr "அறையில௠சேர௠உரையாடலில௠கடைசியாக தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கணகà¯à®•à¯"
+
+#~ msgid "Nick completed character"
+#~ msgstr "செலà¯à®²à®ªà¯à®ªà¯†à®¯à®°à¯ˆ பூரà¯à®¤à¯à®¤à®¿ செயà¯à®¯à¯à®®à¯ எழà¯à®¤à¯à®¤à¯à®°à¯"
+
+#~ msgid "Open new chats in separate windows"
+#~ msgstr "பà¯à®¤à®¿à®¯ அரடà¯à®Ÿà¯ˆà®•à®³à¯ˆ தனி சாளரதà¯à®¤à®¿à®²à¯ திற"
+
+#~ msgid "Path of the Adium theme to use"
+#~ msgstr "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà®¿à®¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯à®•à¯à®•à¯ பாதை"
+
+#~ msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ அறைகளில௠எடியம௠கரà¯à®¤à¯à®¤à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾à®©à®¾à®²à¯ அதன௠பாதை"
+
+#~ msgid "Play a sound for incoming messages"
+#~ msgstr "உளà¯à®µà®°à¯à®®à¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound for new conversations"
+#~ msgstr "உளà¯à®µà®°à¯à®®à¯ உரையாடலà¯à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound for outgoing messages"
+#~ msgstr "வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ செயà¯à®¤à®¿à®•à®³à¯à®•à¯à®•à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound when a contact logs in"
+#~ msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound when a contact logs out"
+#~ msgstr "தொடரà¯à®ªà¯ வெளி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound when we log in"
+#~ msgstr "நாம௠உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Play a sound when we log out"
+#~ msgstr "நாம௠வெளி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ ஒலி எழà¯à®ªà¯à®ªà¯"
+
+#~ msgid "Pop up notifications if the chat isn't focused"
+#~ msgstr "அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à¯ˆà®¯à®¾à®©à®¾à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
+
+#~ msgid "Pop up notifications when a contact logs in"
+#~ msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
+
+#~ msgid "Pop up notifications when a contact logs out"
+#~ msgstr "தொடரà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி"
+
+#~ msgid "Position the camera preview should be during a call."
+#~ msgstr "அழைபà¯à®ªà®¿à®©à¯ போத௠காமிரா à®®à¯à®©à¯ பாரà¯à®µà¯ˆ இரà¯à®ªà¯à®ªà¯à®•à¯à®•à¯ இடமà¯."
+
+#~ msgid "Show Balance in contact list"
+#~ msgstr "தொடரà¯à®ªà¯à®•à®³à¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ மீதியை காடà¯à®Ÿà¯"
+
#~ msgid "Show avatars"
#~ msgstr "அவதாரஙà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯"
+#~ msgid "Show contact list in rooms"
+#~ msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠அறைகளில௠காடà¯à®Ÿà¯ "
+
+#~ msgid "Show hint about closing the main window"
+#~ msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடிவத௠கà¯à®±à®¿à®¤à¯à®¤à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ காடà¯à®Ÿà¯ "
+
#~ msgid "Show protocols"
#~ msgstr "விதிமà¯à®±à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿà¯"
+#~ msgid "Spell checking languages"
+#~ msgstr "எழà¯à®¤à¯à®¤à¯à®ªà¯à®ªà®¿à®´à¯ˆ திரà¯à®¤à¯à®¤ மொழி"
+
+#~ msgid "The default folder to save file transfers in."
+#~ msgstr "இடமாறà¯à®±à®¿à®¯ கோபà¯à®ªà¯à®•à®³à¯ˆ சேமிகà¯à®• à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அடைவà¯"
+
+#~ msgid "The last directory that an avatar image was chosen from."
+#~ msgstr "அவதாரம௠படம௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கடைசி அடைவ௠"
+
+#~ msgid "The position for the chat window side pane"
+#~ msgstr "அரடà¯à®Ÿà¯ˆ சாளரதà¯à®¤à®¿à®©à¯ பகà¯à®•à®ªà¯ பலக இடம௠"
+
+#~ msgid "The stored position (in pixels) of the chat window side pane."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ பகà¯à®•à®ªà¯ பலகதà¯à®¤à®¿à®©à¯ சேமிதà¯à®¤ இடம௠(பிகà¯à®¸à®²à¯à®•à®³à®¿à®²à¯)"
+
+#~ msgid "The theme that is used to display the conversation in chat windows."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ சாளரஙà¯à®•à®³à®¿à®²à¯ உரையாடலà¯à®•à®³à¯ˆ காடà¯à®Ÿ பயனà¯à®ªà®Ÿà¯à®®à¯ கரà¯à®¤à¯à®¤à¯"
+
+#~ msgid ""
+#~ "The theme variant that is used to display the conversation in chat "
+#~ "windows."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ சாளரஙà¯à®•à®³à®¿à®²à¯ உரையாடலà¯à®•à®³à¯ˆ காடà¯à®Ÿ பயனà¯à®ªà®Ÿà¯à®®à¯ மாறà¯à®±à¯ கரà¯à®¤à¯à®¤à¯"
+
+#~ msgid "Use graphical smileys"
+#~ msgstr "வரைகலை சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+
+#~ msgid "Use notification sounds"
+#~ msgstr "அறிவிபà¯à®ªà¯ ஒலிகளை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+
+#~ msgid "Use theme for chat rooms"
+#~ msgstr "அரடà¯à®Ÿà¯ˆ அறைகளà¯à®•à¯à®•à¯ கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+
+#~ msgid "Whether Empathy can publish the user's location to their contacts."
+#~ msgstr "பயனரின௠இடதà¯à®¤à¯ˆ தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ எமà¯à®ªà®¤à®¿ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• ஜிபிஎஸ௠஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• அலைபேசி வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid ""
+#~ "Whether Empathy should automatically log into your accounts on startup."
+#~ msgstr "எமà¯à®ªà®¤à®¿ தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ கணகà¯à®•à¯à®•à®³à®¿à®²à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• உளà¯à®¨à¯à®´à¯ˆà®¯ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid ""
+#~ "Whether Empathy should go into away mode automatically if the user is "
+#~ "idle."
+#~ msgstr ""
+#~ "பயனர௠சà¯à®®à¯à®®à®¾ இரà¯à®•à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• எமà¯à®ªà®¤à®¿ வெளியே பாஙà¯à®•à®¿à®±à¯à®•à¯ செலà¯à®² வேணà¯à®Ÿà¯à®®à®¾ "
+#~ "இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid ""
+#~ "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#~ msgstr ""
+#~ "அநà¯à®¤à®°à®™à¯à®•à®¤à¯à®¤à¯ˆ காபà¯à®ªà®¾à®±à¯à®± தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾"
+
+#~ msgid ""
+#~ "Whether Empathy should use the avatar of the contact as the chat window "
+#~ "icon."
+#~ msgstr "எமà¯à®ªà®¤à®¿ தொடரà¯à®ªà®¿à®©à¯ அவதாரதà¯à®¤à¯ˆ அரடà¯à®Ÿà¯ˆ அறை சினà¯à®©à®®à®¾à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾."
+
+#~ msgid ""
+#~ "Whether WebKit developer tools, such as the Web Inspector, should be "
+#~ "enabled."
+#~ msgstr "வெப௠ஆயà¯à®µà®¾à®³à®°à¯ போனà¯à®± வெபà¯à®•à®¿à®Ÿà¯ உரà¯à®µà®¾à®•à¯à®•à¯à®µà¯‹à®°à¯ கரà¯à®µà®¿à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾?"
+
+#~ msgid ""
+#~ "Whether connectivity managers should be used to automatically disconnect/"
+#~ "reconnect."
+#~ msgstr ""
+#~ "இணைபà¯à®ªà¯ மேலாளரà¯à®•à®³à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• இணைகà¯à®•/ மீணà¯à®Ÿà¯à®®à¯ இணைகà¯à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾"
+
+#~ msgid ""
+#~ "Whether to check words typed against the languages you want to check with."
+#~ msgstr "நீஙà¯à®•à®³à¯ விரà¯à®®à¯à®ªà®¿à®¯ மொழிகளில௠உளà¯à®³à®¿à®Ÿà¯à®Ÿ சொறà¯à®•à®³à¯ˆ சோதிகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to convert smileys into graphical images in conversations."
+#~ msgstr "உரையாடலà¯à®•à®³à®¿à®²à¯ சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ வரைகலை படஙà¯à®•à®³à®¾à®• மாறà¯à®± வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to enable Pulseaudio's echo cancellation filter."
+#~ msgstr "பலà¯à®¸à¯à®†à®Ÿà®¿à®¯à¯‹ எதிரொலி நீகà¯à®•à®¿ வடிபà¯à®ªà®¿à®¯à¯ˆ செயலாகà¯à®•à®µà®¾"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging into the network."
+#~ msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging out of the network."
+#~ msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound to notify of events."
+#~ msgstr "நிகழà¯à®µà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound to notify of incoming messages."
+#~ msgstr "செயà¯à®¤à®¿à®•à®³à¯ உளà¯à®µà®°à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound to notify of new conversations."
+#~ msgstr "பà¯à®¤à®¿à®¯ உரையாடலà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound to notify of outgoing messages."
+#~ msgstr "செயà¯à®¤à®¿à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound when logging into a network."
+#~ msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play a sound when logging out of a network."
+#~ msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to play sound notifications when away or busy."
+#~ msgstr "வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠ஒலி அறிகà¯à®•à¯ˆà®•à®³à¯ˆ இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid ""
+#~ "Whether to send the 'composing' or 'paused' chat states. Does not "
+#~ "currently affect the 'gone' state."
+#~ msgstr ""
+#~ "'உரà¯à®µà®¾à®•à¯à®•à®®à¯ ' அலà¯à®²à®¤à¯ 'இடைநிறà¯à®¤à¯à®¤à®®à¯' அரடà¯à®Ÿà¯ˆ நிலைகளை அனà¯à®ªà¯à®ªà®µà®¾. இத௠நடபà¯à®ªà¯ "
+#~ "'போயாயிறà¯à®±à¯' நிலையை பாதிகà¯à®•à®¾à®¤à¯."
+
+#~ msgid "Whether to show a popup notification when a contact goes offline."
+#~ msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to show a popup notification when a contact goes online."
+#~ msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà®¿à®²à¯ வரà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid ""
+#~ "Whether to show a popup notification when receiving a new message even if "
+#~ "the chat is already opened, but not focused."
+#~ msgstr ""
+#~ "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ அரடà¯à®Ÿà¯ˆ திறநà¯à®¤à¯ இரà¯à®¨à¯à®¤à¯ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯à®®à¯ தà¯à®³à¯à®³à¯ "
+#~ "அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to show a popup notification when receiving a new message."
+#~ msgstr "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to show account balances in the contact list."
+#~ msgstr " தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ கணகà¯à®•à¯ மீதியை காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
#~ msgid ""
#~ "Whether to show avatars for contacts in the contact list and chat windows."
#~ msgstr "அரடà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ அவதாரஙà¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+#~ msgid "Whether to show contacts that are offline in the contact list."
+#~ msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ இணைபà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to show groups in the contact list."
+#~ msgstr " தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ கà¯à®´à¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to show popup notifications when away or busy."
+#~ msgstr "வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
#~ msgid "Whether to show protocols for contacts in the contact list."
#~ msgstr " தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ விதிமà¯à®±à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+#~ msgid "Whether to show the contact list in chat rooms."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ அறையில௠தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
#~ msgid "Whether to show the contact list in compact mode."
#~ msgstr "அடகà¯à®•à®ªà¯à®ªà®¾à®™à¯à®•à®¿à®²à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
#~ msgid ""
+#~ "Whether to show the message dialog about closing the main window with the "
+#~ "'x' button in the title bar."
+#~ msgstr ""
+#~ "தலைபà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®¿à®²à¯ x பொதà¯à®¤à®¾à®©à®¾à®²à¯ à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடà¯à®µà®¤à¯ˆ கà¯à®±à®¿à®¤à¯à®¤ உரையாடலை காடà¯à®Ÿ "
+#~ "வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid "Whether to use the theme for chat rooms."
+#~ msgstr "அரடà¯à®Ÿà¯ˆ அறைகளில௠கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?"
+
+#~ msgid ""
#~ "Which criterion to use when sorting the contact list. Default is to sort "
#~ "by the contact's state with the value \"state\". A value of \"name\" will "
#~ "sort the contact list by name."
@@ -4636,12 +4438,21 @@ msgstr "à®à®Žà®®à¯ கணகà¯à®•à¯à®•à®³à¯ˆ à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®•
#~ msgid "Find in Contact _List"
#~ msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ இல௠காணà¯à®• "
+#~ msgid "Join _Favorites"
+#~ msgstr "(_F) விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ சேர௠"
+
+#~ msgid "Manage Favorites"
+#~ msgstr "விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ˆ மேலாளà¯à®•"
+
#~ msgid "N_ormal Size"
#~ msgstr " (_o) சாதாரண அளவà¯"
#~ msgid "Normal Size With _Avatars"
#~ msgstr "( _A) சாதாரண அளவ௠அவதாரஙà¯à®•à®³à¯ உடனà¯"
+#~ msgid "P_references"
+#~ msgstr "(_r) விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
+
#~ msgid "Show P_rotocols"
#~ msgstr "_r விதிமà¯à®±à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿà¯"
@@ -4651,15 +4462,30 @@ msgstr "à®à®Žà®®à¯ கணகà¯à®•à¯à®•à®³à¯ˆ à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®•
#~ msgid "Sort by _Status"
#~ msgstr "(_S) நிலை வாரியாக வரிசைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯"
+#~ msgid "_Accounts"
+#~ msgstr "கணகà¯à®•à¯à®•à®³à¯ (_A)"
+
+#~ msgid "_Blocked Contacts"
+#~ msgstr "_B தடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿ தொடரà¯à®ªà¯à®•à®³à¯"
+
#~ msgid "_Compact Size"
#~ msgstr "(_C) அடகà¯à®•à®®à®¾à®© அளவà¯"
+#~ msgid "_File Transfers"
+#~ msgstr "(_F) கோபà¯à®ªà¯ பறிமாறà¯à®±à®™à¯à®•à®³à¯ "
+
#~ msgid "_Join…"
#~ msgstr "(_J) இணை"
#~ msgid "_Offline Contacts"
#~ msgstr "(_O) இணைபà¯à®ªà¯ விலகி உளà¯à®³ தொடரà¯à®ªà¯à®•à®³à¯"
+#~ msgid "_Room"
+#~ msgstr "(_R) அறை"
+
+#~ msgid "_Search for Contacts…"
+#~ msgstr "_S தொடரà¯à®ªà¯à®•à®³à¯ ஠தேடà¯..."
+
#~ msgid "Could not start room listing"
#~ msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯ˆ எடà¯à®ªà¯à®ªà®¤à¯ˆ தà¯à®µà®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
@@ -4687,9 +4513,6 @@ msgstr "à®à®Žà®®à¯ கணகà¯à®•à¯à®•à®³à¯ˆ à®’à®°à¯à®™à¯à®•à®¿à®£à¯ˆà®•
#~ msgid "Socket type not supported"
#~ msgstr "சொரà¯à®•à®¿ வாய௠வகை கà¯à®•à¯ ஆதரவிலà¯à®²à¯ˆ"
-#~ msgid "My Web Accounts"
-#~ msgstr "என௠வலை கணகà¯à®•à¯à®•à®³à¯ "
-
#~ msgid "The account %s is edited via %s."
#~ msgstr "%s கணகà¯à®•à¯ %s வழியாக திரà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿ வேணà¯à®Ÿà¯à®®à¯."
diff --git a/po/ug.po b/po/ug.po
index 6ed0e1819..a11d8514e 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-10-09 14:38+0000\n"
+"POT-Creation-Date: 2013-01-09 14:05+0000\n"
"PO-Revision-Date: 2012-02-18 16:10+0900\n"
"Last-Translator: Gheyret Kenji<gheyret@gmail.com>\n"
"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -35,6 +35,10 @@ msgstr "Empathy ئىنتÛرنÛت مۇڭداشقۇسى"
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "Google Talk، Facebook، MSN ۋە باشقا سۆھبەت مۇلازىمەتلىرىنى ئىشلىتىپ پاراڭلىشىش"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;؛سۆھبەت؛پاراڭ؛مۇڭداشقۇ؛ئۇچۇر؛irc؛voip؛gtalk؛facebook؛jabber؛"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "باغلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى ÙƒÛرەك"
@@ -92,11 +96,11 @@ msgstr "ئالاقەداشلار تىزىمىدا توردا يوق ئالاقÛ
#: ../data/org.gnome.Empathy.gschema.xml.h:14
msgid "Show Balance in contact list"
-msgstr "ئالاقەداش تىزىمىدا Balance نى كۆرسەت"
+msgstr "ئالاقەداش تىزىمىدا Ú¾Ûساباتتىكى پۇلنى كۆرسەت"
#: ../data/org.gnome.Empathy.gschema.xml.h:15
msgid "Whether to show account balances in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا Ú¾Ûسابات balance لىرىنى كۆرسىتەمدۇ يوق."
+msgstr "ئالاقەداشلار تىزىمىدا Ú¾Ûساباتتىكى پۇللارنى كۆرسىتەمدۇ يوق."
#: ../data/org.gnome.Empathy.gschema.xml.h:16
msgid "Hide main window"
@@ -301,7 +305,6 @@ msgid "Path of the Adium theme to use"
msgstr "ئىشلىتىدىغان Adium ئۆرنەك(theme)نىڭ يولى"
#: ../data/org.gnome.Empathy.gschema.xml.h:65
-#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgid ""
"Path of the Adium theme to use if the theme used for chat is Adium. "
"Deprecated."
@@ -499,7 +502,6 @@ msgid "The selected file is empty"
msgstr "تاللانغان ھۆججەت قۇرۇق"
#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-#| msgid "Phrase not found"
msgid "Password not found"
msgstr "ئىم تÛپىلمىدى"
@@ -722,11 +724,11 @@ msgstr "قوشنىلار"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
msgid "Google Talk"
msgstr "گۇگىل سۆھبەت(Google Talk)"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:539
msgid "Facebook Chat"
msgstr "Facebook سۆھبەت"
@@ -740,12 +742,10 @@ msgstr "بارلىق Ú¾Ûساباتلار"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#| msgid "Pass_word:"
msgid "Pass_word"
msgstr "ئىم(_W)"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#| msgid "Screen _Name:"
msgid "Screen _Name"
msgstr "ئÛكران ئاتى(_N)"
@@ -770,7 +770,6 @@ msgstr "ئىم ئەستە تۇت"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#| msgid "_Port:"
msgid "_Port"
msgstr "ئÛغىز(_P)"
@@ -779,7 +778,6 @@ msgstr "ئÛغىز(_P)"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#| msgid "_Server:"
msgid "_Server"
msgstr "مۇلازىمÛتىر(_S)"
@@ -832,7 +830,7 @@ msgstr "مۇلازىمÛتىر"
#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
msgid "Port"
msgstr "ئÛغىز"
@@ -890,7 +888,6 @@ msgstr "ÙŠÛÚ­Ù‰ Ú¾Ûسابات"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#| msgid "Login I_D:"
msgid "Login I_D"
msgstr "كىرىش كىملىكى(_D)"
@@ -908,7 +905,6 @@ msgid "What is your GroupWise password?"
msgstr "GroupWise دىكى ئىمىڭىز؟"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#| msgid "ICQ _UIN:"
msgid "ICQ _UIN"
msgstr "ICQ _UIN"
@@ -917,7 +913,6 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>مىسال:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#| msgid "Ch_aracter set:"
msgid "Ch_aracter set"
msgstr "ھەرپ توپى(_A)"
@@ -934,7 +929,6 @@ msgid "Network"
msgstr "تور"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-#| msgid "Character set:"
msgid "Character set"
msgstr "ھەرپ توپى"
@@ -972,22 +966,18 @@ msgid ""
msgstr "نۇرغۇن IRC مۇلازىمەتلىرى ئىم تەلەپ قىلمايدۇ، بىلمىسىڭىز ئىمنى كىرگۈزمەڭ."
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-#| msgid "Nickname:"
msgid "Nickname"
msgstr "تەخەللۇس"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-#| msgid "Quit message:"
msgid "Quit message"
msgstr "ئۇچۇرنى ئاخىرلاشتۇر"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-#| msgid "Real name:"
msgid "Real name"
msgstr "ھەقىقىي ئاتى:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-#| msgid "Username:"
msgid "Username"
msgstr "ئىشلەتكۈچى ئاتى"
@@ -1039,12 +1029,10 @@ msgid "I_gnore SSL certificate errors"
msgstr "SSL ئىسپاتنامىسىدىكى خاتالىققا پەرۋا قىلما(_G)"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-#| msgid "Priori_ty:"
msgid "Priori_ty"
msgstr "مەرتىۋىسى(_T)"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-#| msgid "Reso_urce:"
msgid "Reso_urce"
msgstr "مەنبە(_U)"
@@ -1077,32 +1065,26 @@ msgid "What is your desired Jabber password?"
msgstr "Jabber دىكى ئارزۇ قىلغان ئىمىڭىز Ù†ÛÙ…Û•ØŸ"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#| msgid "Nic_kname:"
msgid "Nic_kname"
msgstr "Ù„Û•Ù‚Û•Ù…(_K)"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#| msgid "_Last Name:"
msgid "_Last Name"
msgstr "تەگ ئاتى(_L)"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#| msgid "_First Name:"
msgid "_First Name"
msgstr "ئاتى(_L)"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-#| msgid "_Published Name:"
msgid "_Published Name"
msgstr "ئÛلان قىلغان ئاتى(_P):"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-#| msgid "_Jabber ID:"
msgid "_Jabber ID"
msgstr "جاببÛر كىملىكى(_J)"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-#| msgid "E-_mail address:"
msgid "E-_mail address"
msgstr "ئÛلخەت ئادرÛسى(_M)"
@@ -1148,7 +1130,6 @@ msgid "None"
msgstr "يوق"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#| msgid "_Username:"
msgid "_Username"
msgstr "ئىشلەتكۈچى ئاتى(_U)"
@@ -1173,7 +1154,6 @@ msgid "Miscellaneous Options"
msgstr "باشقا تاللانمىلار"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-#| msgid "STUN Server:"
msgid "STUN Server"
msgstr "STUN مۇلازىمÛتىرى"
@@ -1190,7 +1170,6 @@ msgid "Keep-Alive Options"
msgstr "Keep-Alive تاللانمىسى"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#| msgid "Mechanism:"
msgid "Mechanism"
msgstr "Ù…Ûخانىزمى:"
@@ -1199,12 +1178,10 @@ msgid "Interval (seconds)"
msgstr "ئىنتÛرۋال(سÛكۇنت)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#| msgid "Authentication username:"
msgid "Authentication username"
msgstr "كىملىك دەلىللىگۈچى ئاتى"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#| msgid "Transport:"
msgid "Transport"
msgstr "يوللاش"
@@ -1217,7 +1194,6 @@ msgid "Ignore TLS Errors"
msgstr "TLS خاتالىقلىرىغا پەرۋا قىلما"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-#| msgid "E-mail address"
msgid "Local IP Address"
msgstr "يەرلىك IP ئادرÛسى"
@@ -1300,7 +1276,6 @@ msgstr "Ú†Ûكىپ چوڭايتىڭ"
#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
#, c-format
-#| msgid "Authentication failed"
msgid "Authentication failed for account <b>%s</b>"
msgstr "Ú¾Ûسابات <b>%s</b> نىڭ كىملىكىنى دەلىللەش مەغلۇپ بولدى"
@@ -1319,14 +1294,10 @@ msgstr "تۆۋەندىكى Ú¾Ûساباتىڭىزنىڭ ئىمىنى كىرگۈØ
"<b>%s</b>"
#: ../libempathy-gtk/empathy-calendar-button.c:66
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
msgid "Select..."
msgstr "تاللا…"
#: ../libempathy-gtk/empathy-calendar-button.c:154
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
msgid "_Select"
msgstr "تاللا(_S)"
@@ -1368,7 +1339,6 @@ msgid "You are not allowed to change the topic"
msgstr "سۆھبەت تÛمىسىنى ئۆزگەرتەلمەيسىز"
#: ../libempathy-gtk/empathy-chat.c:967
-#| msgid "invalid contact"
msgid "Invalid contact ID"
msgstr "ئالاقەداشنىڭ كىملىكى(ID) ئىناۋەتسىز"
@@ -1491,7 +1461,7 @@ msgstr "تÛخى ئىشلەتكىلى بولمايدۇ"
msgid "unknown"
msgstr "نامەلۇم"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
msgid "Topic:"
msgstr "سۆھبەت تÛمىسى:"
@@ -1605,9 +1575,9 @@ msgstr "%s نى ھازىر %s دەپ قارايدۇ"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-call-window.c:2876 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
msgid "Disconnected"
msgstr "ئۈزۈلدى"
@@ -1680,7 +1650,7 @@ msgstr "چەكلەنگەن ئالاقەداشنى تەھرىرلەش"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1785,12 +1755,12 @@ msgid "Please let me see when you're online. Thanks!"
msgstr "توردا بار ۋاقتىڭىزدا مەن سىزنى كۆرەلەيدىغان بولاي. تەشەككۈرلەر!"
#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Save Avatar"
msgstr "باش سۈرىتىنى ساقلاش"
#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-individual-widget.c:956
msgid "Unable to save avatar"
msgstr "باش سۈرىتىنى ساقلىغىلى بولمىدى"
@@ -1798,14 +1768,12 @@ msgstr "باش سۈرىتىنى ساقلىغىلى بولمىدى"
#. Setup id label
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
#: ../libempathy-gtk/empathy-user-info.c:444
-#| msgid "Identifier:"
msgid "Identifier"
msgstr "بەلگە"
#. Setup nickname entry
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
#: ../libempathy-gtk/empathy-user-info.c:449
-#| msgid "Alias:"
msgid "Alias"
msgstr "تەخەللۇس"
@@ -1828,17 +1796,14 @@ msgid "Client Information"
msgstr "Ø®Ûرىدار ئۇچۇرى"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#| msgid "OS:"
msgid "OS"
msgstr "OS"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-#| msgid "Version:"
msgid "Version"
msgstr "نەشرى"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-#| msgid "Client:"
msgid "Client"
msgstr "Ø®Ûرىدار"
@@ -1934,7 +1899,7 @@ msgstr "تÛÙ„ÛÙون قىلىشتا ئىشلىتىدىغان Ú¾ÛساباتنÙ
#: ../libempathy-gtk/empathy-individual-menu.c:357
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "چاقىر"
@@ -2015,7 +1980,7 @@ msgid "Share My Desktop"
msgstr "ئۈستەلئۈستىنى ھەمبەھىر قىلىش"
#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
msgid "Favorite"
msgstr "يىغقۇچ"
@@ -2030,7 +1995,7 @@ msgstr "تەھرىر(_E)"
#. send invitation
#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../src/empathy-chat-window.c:1245
msgid "Inviting you to this room"
msgstr "سىزنى بۇ ئۆيگە تەكلىپ قىلىۋاتىدۇ"
@@ -2052,7 +2017,6 @@ msgid "Removing group"
msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
#: ../libempathy-gtk/empathy-individual-view.c:2444
-#| msgid "Real name:"
msgid "Re_name"
msgstr "ئاتىنى ئۆزگەرت(_N)"
@@ -2173,16 +2137,16 @@ msgid "%B %e, %Y at %R UTC"
msgstr "%B %e، %Y at %R UTC"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
msgid "Alias:"
msgstr "تەخەللۇس:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "بەلگە:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2200,15 +2164,15 @@ msgstr "يانÙون ياكى يۆتكەلمە ئۈسكۈنىدىن تورغا Ø
msgid "New Network"
msgstr "يەڭ تور"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
msgid "Choose an IRC network"
msgstr "IRC تورىنى تاللاش"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
msgid "Reset _Networks List"
msgstr "تور تىزىمىنى ئەسلىگە قايتۇرۇش(_N)"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "تاللا"
@@ -2217,7 +2181,7 @@ msgstr "تاللا"
msgid "new server"
msgstr "ÙŠÛÚ­Ù‰ مۇلازىمÛتىر"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
msgid "SSL"
msgstr "SSL"
@@ -2261,110 +2225,110 @@ msgid "Chat with %s"
msgstr "%s بىلەن سۆزلىشىش"
#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A، %e %B %Y %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1292
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1298
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s سÛكۇنت"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s مىنۇت"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "سۆزلەشكەن ۋاقىت %s، ئاخىرلاشقان ۋاقىت %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "بۈگۈن"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "تۈنۈگۈن"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%e %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "ھەر ۋاقىت"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "ھەركىم"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "كىم"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "قاچان"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "Ú¾ÛÚ†Ù†ÛÙ…Û•"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "تÛكىستلىك سۆزلىشىش"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "چاقىرىشلار"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "كىرگەن چاقىرىشلار"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "چىققان چاقىرىشلار"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "سۆزلەشمىگەن چاقىرىشلار"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "مەزمۇن"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "راستلا بۇرۇنقى سۆھبەت خاتىرىلىرىنى ئۆچۈرەمسىز؟"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "ھەممىنى تازىلا"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "تۆۋەندىكىدىن ئۆچۈرۈش:"
@@ -2386,12 +2350,12 @@ msgid "Profile"
msgstr "سەپلىمە ھۆججەت"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "سۆھبەت"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "سىن"
@@ -2615,16 +2579,15 @@ msgid "_Decline"
msgstr "رەت قىل(_D)"
#: ../libempathy-gtk/empathy-subscription-dialog.c:282
-#| msgid "Accept"
msgid "_Accept"
msgstr "قوشۇل(_A)"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1124
#, c-format
msgid "Message edited at %s"
msgstr "ئۇچۇر %s دە تەھرىرلەندى"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1824
msgid "Normal"
msgstr "نورمال"
@@ -2732,20 +2695,24 @@ msgid "Go online to edit your personal information."
msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلەش ئۈچۈن تورغا باغلىنىڭ."
#: ../libempathy-gtk/empathy-user-info.c:464
-#| msgid "Personal Details"
msgid "<b>Personal Details</b>"
msgstr "<b>شەخسىي ئۇچۇرلار</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "ئۇلانما ئاتىنى كۆچۈر(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "ئۇلانما ئاچ(_O)"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "HTML نى تەكشۈر"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "نۆۋەتتىكى يەرلىك تىل"
@@ -2914,7 +2881,6 @@ msgid "Vietnamese"
msgstr "ۋىيÛتنامچە"
#: ../libempathy-gtk/empathy-roster-model.h:29
-#| msgid "Contact"
msgid "Top Contacts"
msgstr "ھەمىشە ئالاقە قىلىدىغانلار"
@@ -2922,6 +2888,14 @@ msgstr "ھەمىشە ئالاقە قىلىدىغانلار"
msgid "Ungrouped"
msgstr "گۇرۇپپىلانمىغان"
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+#| msgid "Select a contact"
+msgid "Server cannot find contact: %s"
+msgstr "مۇلازىمÛتىر ئالاقەداشنى تاپالمىدى: %s"
+
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
msgid "No error message"
msgstr "خاتالىق ئۇچۇرى يوق"
@@ -2955,7 +2929,7 @@ msgstr "سىز Empathy بىلەن بىللە GNU ئادەتتىكى ئاممىۋ
#: ../src/empathy-about-dialog.c:109
msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME دىكى مۇڭداشقۇ Ø®Ûرىدارى"
+msgstr "گىنوم دىكى مۇڭداشقۇ Ø®Ûرىدارى"
#: ../src/empathy-about-dialog.c:115
msgid "translator-credits"
@@ -3007,7 +2981,7 @@ msgstr "سىزنىڭ %s Ú¾Ûساباتىڭىزدا تÛخى ساقلانمىغا
msgid "Your new account has not been saved yet."
msgstr "ÙŠÛÚ­Ù‰ Ú¾Ûساباتىڭىز تÛخى ساقلانمىدى."
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
msgid "Connecting…"
msgstr "باغلىنىۋاتىدۇ…"
@@ -3044,20 +3018,20 @@ msgstr "توردا يوق — Ú¾Ûسابات چەكلەنگەن"
msgid "Edit Connection Parameters"
msgstr "باغلىنىش پارامÛتىرلىرىنى تەھرىرلەش"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:735
msgid "_Edit Connection Parameters..."
msgstr "باغلىنىش پارامÛتىرلىرىنى تەھرىرلەش(_E)…"
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1268
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "كومپيۇتÛرىڭىزدىن %s نى چىقىرىۋÛتەمسىز؟"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1272
msgid "This will not remove your account on the server."
msgstr "بۇ مۇلازىمÛتىردىكى Ú¾Ûساباتىڭىزنى چىقىرىۋەتمەيدۇ."
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1477
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3065,25 +3039,24 @@ msgstr "باشقا Ú¾Ûساباتنى تاللىماقچى بولۇۋاتىسىØ
"ئۆزگىرىشلەر يوق بولۇپ ÙƒÛتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1668
msgid "_Enabled"
msgstr "قوزغىتىلغان(_E)"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
-#| msgid "Real name:"
+#: ../src/empathy-accounts-dialog.c:1691
msgid "Rename"
msgstr "ئات ئۆزگەرت"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2107
msgid "_Skip"
msgstr "ئۆتكۈزۈۋەت(_S)"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2111
msgid "_Connect"
msgstr "باغلا(_C)"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2290
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3091,7 +3064,7 @@ msgstr "كۆزنەكنى ياپماقچى بولۇۋاتىسىز، بۇنىڭدØ
"ئۆزگىرىشلەر يوق بولۇپ ÙƒÛتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2433
msgid "Messaging and VoIP Accounts"
msgstr "مۇڭداشقۇ Û‹Û• VoIP Ú¾Ûساباتلىرى"
@@ -3148,11 +3121,16 @@ msgstr "Telepathy Ú¾Ûسابات باشقۇرغۇ بىلەن باغلىنىشتØ
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "سۆزلىشىۋاتىدۇ"
+
+#: ../src/empathy-call.c:224
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy ئۈن/سىن Ø®Ûرىدار پروگراممىسى"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
msgid "Empathy Audio/Video Client"
msgstr "Empathy ئۈن/سىن Ø®Ûرىدار پروگراممىسى"
@@ -3161,33 +3139,27 @@ msgstr "Empathy ئۈن/سىن Ø®Ûرىدار پروگراممىسى"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s سىزنى چاقىرغان ئىدى، بىراق سىز باشقىلار بىلەن سۆزلىشىۋاتقان."
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "بىرى چاقىرىۋاتىدۇ"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming video call from %s"
msgstr "%s دىن كەلگەن سىنلىق چاقىرىش"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
#: ../src/empathy-event-manager.c:913
#, c-format
msgid "Incoming call from %s"
msgstr "%s دىن ÙƒÛ•Ù„Ú¯Û•Ù† تÛÙ„ÛÙون"
-#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-call-window.c:1564
#: ../src/empathy-notifications-approver.c:197
msgid "Reject"
msgstr "رەت قىل"
-#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-call-window.c:1565
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
msgid "Answer"
@@ -3195,95 +3167,95 @@ msgstr "جاۋاب"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1934
#, c-format
msgid "Call with %s"
msgstr "%s بىلەن سۆزلىشىش"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2186
msgid "The IP address as seen by the machine"
msgstr "كومپيۇتÛردا ئۇچرىغان IP ئادرÛسى"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2188
msgid "The IP address as seen by a server on the Internet"
msgstr "ئىنتÛرنÛتتىكى مۇلازىمÛتىردا ئۇچرىغان IP ئادرÛسى"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2190
msgid "The IP address of the peer as seen by the other side"
msgstr "قارشى تەرەپتە ئۇچرىغان تەڭتۇش(peer) IP ئادرÛسى"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2192
msgid "The IP address of a relay server"
msgstr "ئۇلاپ تارقىتىش مۇلازىمÛتىرىنىڭ IP ئادرÛسى"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2194
msgid "The IP address of the multicast group"
msgstr "ÙƒÛ†Ù¾ ئادرÛسلىق خەۋەرلىشىش گۇرۇپپىسىنىڭ IP ئادرÛسى"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "نامەلۇم"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2966
msgid "On hold"
msgstr "كۈتۈپ تۇر"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2970
msgid "Mute"
msgstr "ئۈنسىز"
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2972
msgid "Duration"
msgstr "ۋاقتى"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2975
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2979
+#: ../src/empathy-call-window.c:3071
msgid "Technical Details"
msgstr "تÛخنىكىلىق تەپسىلات"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3110
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s's يۇمشاق دÛتالى كومپيۇتÛرىڭىزدا بار بولغان Ú¾Ûچقانداق ئۈن Ùورماتىنى تونۇمىدى."
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-call-window.c:3115
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s's يۇمشاق دÛتالى كومپيۇتÛرىڭىزدا بار بولغان Ú¾Ûچقانداق سىن Ùورماتىنى تونۇمىدى."
-#: ../src/empathy-call-window.c:3029
+#: ../src/empathy-call-window.c:3121
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "%s نىڭ بىلەن باغلىنىش قۇرالمىدى. سىزنىڭ ياكى قارىشى تەرەپنىڭ بىۋاسىتە باغلىنىشقا رۇخسەت قىلىنمىغان بولۇشى مۇمكىن."
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-call-window.c:3127
msgid "There was a failure on the network"
msgstr "توردا خاتالىق يۈز بەردى"
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3131
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان ئۈن Ùورماتلىرى كومپيۇتÛرغا ئورنىتىلماپتۇ"
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3134
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان سىن Ùورماتلىرى كومپيۇتÛرغا ئورنىتىلماپتۇ"
-#: ../src/empathy-call-window.c:3054
+#: ../src/empathy-call-window.c:3146
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3291,32 +3263,32 @@ msgid ""
"the Help menu."
msgstr "Telepathy بۆلىكىدە غەلىتىلىك يۈز بەردى. «ياردەم» تىزىملىكىدىكى «سازلاش» كۆزنىكىدە خاتىرىلىگەن ئۇچۇرلار بىلەن قوشۇپ <a href=\"%s\">بۇ كەمتۈكنى مەلۇم قىلىڭ</a>."
-#: ../src/empathy-call-window.c:3063
+#: ../src/empathy-call-window.c:3155
msgid "There was a failure in the call engine"
msgstr "چاقىرىش ماتورىدا خاتالىق يۈز بەردى"
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3158
msgid "The end of the stream was reached"
msgstr "ئÛقىم ئاخىرلاشتى"
-#: ../src/empathy-call-window.c:3106
+#: ../src/empathy-call-window.c:3198
msgid "Can't establish audio stream"
msgstr "ئۈن ئÛقىمىنى قۇرغىلى بولمىدى"
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3208
msgid "Can't establish video stream"
msgstr "سىن ئÛقىمىنى قۇرغىلى بولمىدى"
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3245
#, c-format
msgid "Your current balance is %s."
msgstr "ھازىر بار پۇل %s."
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3249
msgid "Sorry, you don’t have enough credit for that call."
msgstr "كەچۈرۈڭ، تÛÙ„ÛÙون قىلىش ئۈچۈن ÙŠÛتەرلىك پۇلىڭىز يوق."
-#: ../src/empathy-call-window.c:3159
+#: ../src/empathy-call-window.c:3251
msgid "Top Up"
msgstr "قىممەت تولۇقلاڭ"
@@ -3353,74 +3325,82 @@ msgid "_Debug"
msgstr "سازلا(_D)"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "كامÛرا ئالماشتۇر"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "Ù…Ûنى ئەڭ كىچىك قىل"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "Ù…Ûنى ئەڭ Ú†ÙˆÚ­ قىل"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "كامÛرانى ئىناۋەتسىز قىلىش"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "توختىتىپ قويۇش"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "ھازىرقى سۆزلىشىشنى توختىتىپ قويۇش"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "سىنلىق سۆزلىشىش"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "سىنلىق سۆزلىشىشنى باشلايدۇ"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "ئاۋازلىق سۆزلىشىشنى باشلايدۇ"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "نومۇر تاختا كۆرسەت"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "نومۇر تاختىسىنى كۆرسىتىش"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "سىن تارقىتىشىنى ئالماشتۇرۇش(ئÛچىش ياكى ئÛتىش)"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "ئۈن تارقىتىشىنى ئالماشتۇرۇش(ئÛچىش ياكى ئÛتىش)"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "كودلىغۇچلار:"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "كودسىزلىغۇچ:"
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "يىراقتىكى كاندىدات:"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "يەرلىك نامزات:"
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "ئۈن"
@@ -3444,18 +3424,18 @@ msgstr "ئاپتوماتىك باغلىنىش"
msgid "Manage Favorite Rooms"
msgstr "ئامراق ئۆيلەرنى باشقۇرۇش"
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
msgid "Close this window?"
msgstr "بۇ كۆزنەكنى ياپ؟"
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
"until you rejoin it."
msgstr "كۆزنەك ÙŠÛپىلسا %s دىن ئايرىلىسىز. قايتا قوشۇلمىغۇچە Ú¾Ûچقانداق ئۇچۇر تاپشۇرۇپ ئالالمايسىز."
-#: ../src/empathy-chat-window.c:307
+#: ../src/empathy-chat-window.c:306
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3465,60 +3445,60 @@ msgid_plural ""
"further messages until you rejoin them."
msgstr[0] "كۆزنەك ÙŠÛپىلسا %u پاراڭخانىدىن ئايرىلىسىز. قايتا قوشۇلمىغۇچە، Ú¾Ûچقانداق ئۇچۇر تاپشۇرۇپ ئالالمايسىز."
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:317
#, c-format
msgid "Leave %s?"
msgstr "%s دىن ئايرىلامسىز؟"
-#: ../src/empathy-chat-window.c:320
+#: ../src/empathy-chat-window.c:319
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr "قايتا قوشۇلمىغۇچە، Ú¾Ûچقانداق ئۇچۇر تاپشۇرۇپ ئالالمايسىز."
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Close window"
msgstr "كۆزنەك ياپ"
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:338
msgid "Leave room"
msgstr "ھۇجرىدىن ئايرىلىش"
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:692
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ۋە %u باشقىلار)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (باشقىلاردىن %d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:717
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (ھەممىسىدىن %d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:954
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:963
+#: ../src/empathy-chat-window.c:962
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "%d ئۇچۇرنى ئەۋەتىۋاتىدۇ"
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:982
msgid "Typing a message."
msgstr "ئۇچۇر كىرگۈزۈۋاتىدۇ."
@@ -3610,63 +3590,74 @@ msgstr "Pastebin ئىنكاسى"
msgid "Data too large for a single paste. Please save logs to file."
msgstr "چاپلاشقا بۇ سانلىق-مەلۇمات بەك Ú†ÙˆÚ­ ÙƒÛلىدۇ. خاتىرىنى ھۆججەتكە ساقلاڭ."
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1857
msgid "Debug Window"
msgstr "سازلاش كۆزنىكى"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1917
msgid "Send to pastebin"
msgstr "pastebin غا ئەۋەت"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1961
msgid "Pause"
msgstr "ۋاقىتلىق توختا"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1973
msgid "Level "
msgstr "دەرىجە "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1992
msgid "Debug"
msgstr "سازلا"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1997
msgid "Info"
msgstr "ئۇچۇر"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
msgid "Message"
msgstr "ئۇچۇر"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:2007
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2012
msgid "Critical"
msgstr "ئاچقۇچلۇق"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2017
msgid "Error"
msgstr "خاتالىق"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2030
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:2062
msgid "Time"
msgstr "ۋاقىت"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2065
msgid "Domain"
msgstr "دائىرە"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2068
msgid "Category"
msgstr "كاتÛگورىيە"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2071
msgid "Level"
msgstr "دەرىجە"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2100
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3731,7 +3722,7 @@ msgstr "سىز %s نىڭغا تەكلىپ قىلىندىڭىز"
msgid "Incoming file transfer from %s"
msgstr "%s نىڭدىن كەلگەن ھۆججەت"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
msgid "Password required"
msgstr "ئىم كىرگۈزۈڭ"
@@ -3903,7 +3894,6 @@ msgid "Members"
msgstr "ئەزالار"
#: ../src/empathy-new-chatroom-dialog.c:410
-#| msgid "Failed to retrieve recent logs"
msgid "Failed to list rooms"
msgstr "ھۇجرىلارنى تىزىپ كۆرسىتىش مەغلۇپ بولدى"
@@ -3943,9 +3933,6 @@ msgid "_Room:"
msgstr "ئۆي(_R):"
#: ../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"
msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account&apos;s server"
@@ -4071,16 +4058,14 @@ msgid "Preferences"
msgstr "مايىللىق"
#: ../src/empathy-preferences.ui.h:2
-#| msgid "Show contact groups"
msgid "Show groups"
msgstr "گۇرۇپپىلارنى كۆرسەت"
#: ../src/empathy-preferences.ui.h:3
-#| msgid "Show and edit accounts"
msgid "Show account balances"
msgstr "Ú¾Ûساباتتىكى پۇلنى كۆرسەت"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
msgid "Contact List"
msgstr "ئالاقەداش تىزىمى"
@@ -4238,89 +4223,106 @@ msgstr "ۋارىيانتى:"
msgid "Themes"
msgstr "ئۆرنەكلەر"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:244
msgid "Provide Password"
msgstr "ئىم تەمىنلەش"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:250
msgid "Disconnect"
msgstr "ئۈز"
-#: ../src/empathy-roster-window.c:441
+#: ../src/empathy-roster-window.c:493
msgid "You need to setup an account to see contacts here."
msgstr "بۇ يەردىكى ئالاقەداشلارنى كۆرۈش ئۈچۈن، بىر Ú¾Ûسابات قۇرۇشىڭىز ÙƒÛرەك."
-#: ../src/empathy-roster-window.c:517
+#: ../src/empathy-roster-window.c:569
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "كەچۈرۈڭ، %s Ú¾Ûساباتلىرىنى %s يۇمشاق دÛتالىنى ÙŠÛڭىلىمىغۇچە ئىشلەتكىلى بولمايدۇ."
-#: ../src/empathy-roster-window.c:635
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:674
+#| msgid "Facebook Chat"
+msgid "Facebook"
+msgstr "ÙÛيىسبۇك(Facebook)"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "Ú¾Ûسابات %s نىڭ كىملىك دەلىللىشى زۆرۈردۇر"
+
+#: ../src/empathy-roster-window.c:700
+#| msgid "Edit Account"
+msgid "Online Accounts"
+msgstr "توردىكى Ú¾Ûساباتلار"
+
+#: ../src/empathy-roster-window.c:747
msgid "Update software..."
msgstr "يۇمشاق دÛتالنى ÙŠÛڭىلاش…"
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:753
msgid "Reconnect"
msgstr "قايتا باغلىنىش"
-#: ../src/empathy-roster-window.c:645
+#: ../src/empathy-roster-window.c:757
msgid "Edit Account"
msgstr "Ú¾Ûساباتنى تەھرىرلەش"
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:762
msgid "Close"
msgstr "ياپ"
-#: ../src/empathy-roster-window.c:787
-#| msgid "Top up account credit"
+#: ../src/empathy-roster-window.c:904
msgid "Top up account"
msgstr "Ú¾Ûساباتنى تولۇقلايمەن"
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1590
msgid "You need to enable one of your accounts to see contacts here."
msgstr "بۇ يەردىكى ئالاقەداشلارنى كۆرۈش ئۈچۈن، بىرەر بىر Ú¾Ûساباتىڭىزنى ئىناۋەتلىك قىلىشىڭىز ÙƒÛرەك."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1598
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "بۇ يەردىكى ئالاقەداشلارنى كۆرۈش ئۈچۈن، %s نى ئىناۋەتلىك قىلىشىڭىز ÙƒÛرەك."
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1676
msgid "Change your presence to see contacts here"
msgstr "قارىشى تەرەپنى كۆرسىتىش ئۈچۈن، ئۆزىڭىزنىڭ ھالىتىنى ئۆزگەرتىڭ."
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1685
msgid "No match found"
msgstr "تÛپىلمىدى"
-#: ../src/empathy-roster-window.c:1569
-#| msgid "Show offline contacts"
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "تÛخى Ú¾Ûچقانداق ئالاقەداش قوشمىدىڭىز"
+
+#: ../src/empathy-roster-window.c:1695
msgid "No online contacts"
msgstr "توردا يوق ئالاقەداشلار"
#: ../src/empathy-roster-window-menubar.ui.h:1
-#| msgid "New Conversation"
msgid "_New Conversation..."
msgstr "ÙŠÛÚ­Ù‰ سۆھبەت(_N)…"
#: ../src/empathy-roster-window-menubar.ui.h:2
-#| msgid "New Call"
msgid "New _Call..."
msgstr "ÙŠÛڭىدىن چاقىر(_C)…"
#: ../src/empathy-roster-window-menubar.ui.h:3
-#| msgid "Contact"
msgid "Contacts"
msgstr "ئالاقەداشلار"
#: ../src/empathy-roster-window-menubar.ui.h:4
-#| msgid "_Add Contact"
msgid "_Add Contacts..."
msgstr "ئالاقەداش قوش(_A)…"
#: ../src/empathy-roster-window-menubar.ui.h:5
-#| msgid "_Search for Contacts…"
msgid "_Search for Contacts..."
msgstr "ئالاقەداش ئىزدە(_S)…"
@@ -4329,12 +4331,10 @@ msgid "_Blocked Contacts"
msgstr "چەكلەنگەن ئالاقەداشلار(_B)"
#: ../src/empathy-roster-window-menubar.ui.h:7
-#| msgid "_Room"
msgid "_Rooms"
msgstr "ھۇجرىلار(_R)"
#: ../src/empathy-roster-window-menubar.ui.h:8
-#| msgid "_Join"
msgid "_Join..."
msgstr "قوشۇل(_J)…"
@@ -4343,7 +4343,6 @@ msgid "Join _Favorites"
msgstr "يىغقۇچقا قوش(_F)"
#: ../src/empathy-roster-window-menubar.ui.h:10
-#| msgid "Manage Favorites"
msgid "_Manage Favorites"
msgstr "يىغقۇچ باشقۇر(_M)"
@@ -4360,12 +4359,10 @@ msgid "P_references"
msgstr "مايىللىق(_R)"
#: ../src/empathy-roster-window-menubar.ui.h:15
-#| msgid "_Help"
msgid "Help"
msgstr "ياردەم"
#: ../src/empathy-roster-window-menubar.ui.h:16
-#| msgid "Empathy"
msgid "About Empathy"
msgstr "Empathy ھەققىدە"
@@ -4382,6 +4379,16 @@ msgstr "Ú¾Ûسابات تەڭشىكى"
msgid "Go _Online"
msgstr "تورغا چىق(_O)"
+#: ../src/empathy-roster-window.ui.h:3
+#| msgid "Show offline contacts"
+msgid "Show _Offline Contacts"
+msgstr "توردا يوق ئالاقەداشلارنى كۆرسەت(_O)"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "ئالاقەداش قوش…(_A)"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
msgstr "ÙŠÛÚ­Ù‰ سۆھبەت(_N)…"
@@ -4400,21 +4407,21 @@ msgid "Done"
msgstr "تامام"
#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
-#| msgid "Enter your account details"
msgid "Please enter your account details"
msgstr "Ú¾Ûساباتىڭىزغا ئائىت تەپسىلاتلارنى كىرگۈزۈڭ"
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
#, c-format
-#| msgid "Loading account information"
msgid "Edit %s account options"
msgstr "Ú¾Ûسابات %s نىڭ تاللانمىلىرىنى تەھرىرلە"
#: ../ubuntu-online-accounts/empathy.application.in.h:1
-#| msgid "Enter your account details"
msgid "Integrate your IM accounts"
msgstr "بارلىق مۇڭداشقۇ Ú¾Ûساباتلىرىڭىزنى بىر يەرگە يىغىڭ"
+#~ msgid "i"
+#~ msgstr "i"
+
#~ msgid "Manage Messaging and VoIP accounts"
#~ msgstr "مۇڭداشقۇ Û‹Û• VoIP Ú¾Ûساباتلىرىنى باشقۇرۇش"
@@ -4570,9 +4577,6 @@ msgstr "بارلىق مۇڭداشقۇ Ú¾Ûساباتلىرىڭىزنى بىر ÙŠ
#~ msgid "_Edit"
#~ msgstr "تەھرىر(_E)"
-#~ msgid "Select a contact"
-#~ msgstr "ئالاقەداش تاللايدۇ"
-
#~ msgid "Select contacts to link"
#~ msgstr "ئۇلايدىغان ئالاقەداشنى تاللاش"
diff --git a/release.py b/release.py
index e38da7973..6f242e49f 100755
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
from string import Template
from optparse import OptionParser
-last_tag_pattern = 'EMPATHY_3_6*'
+last_tag_pattern = 'EMPATHY_3_7*'
upload_server = 'master.gnome.org'
template = '''\
$name $version is now available for download from:
diff --git a/src/Makefile.am b/src/Makefile.am
index c2cb9f7a0..400b83b82 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,6 +85,11 @@ empathy_chat_SOURCES = \
empathy-chat.c \
$(NULL)
+nodist_empathy_chat_SOURCES = \
+ empathy-chat-resources.c \
+ empathy-chat-resources.h \
+ $(NULL)
+
empathy_call_SOURCES = \
empathy-call.c \
empathy-call-factory.c \
@@ -182,9 +187,28 @@ ui_DATA = \
EXTRA_DIST = \
$(autostart_DATA) \
- $(ui_DATA)
+ $(ui_DATA) \
+ empathy-chat.js \
+ empathy-chat.gresource.xml
dist_man_MANS = \
empathy.1 \
empathy-accounts.1
+BUILT_SOURCES = \
+ $(nodist_empathy_chat_SOURCES) \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
+ --sourcedir=$(srcdir) \
+ --generate-source \
+ $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
+ --sourcedir=$(srcdir) \
+ --generate-header \
+ $<
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 6275e6a8a..33c382f6d 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -610,6 +610,8 @@ account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
NULL, NULL);
+ gtk_window_set_resizable (GTK_WINDOW (subdialog), FALSE);
+
priv->setting_widget = (EmpathyAccountWidget *)
empathy_account_widget_new_for_protocol (settings, FALSE);
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index de21506d5..385fce1c4 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -119,7 +119,8 @@ display_reject_notification (EmpathyCallObserver *self,
_("%s just tried to call you, but you were in another call."),
tp_contact_get_alias (contact));
- notification = notify_notification_new (summary, body, NULL);
+ notification = empathy_notify_manager_create_notification (summary, body,
+ NULL);
emp_contact = empathy_contact_dup_from_tp_contact (contact);
pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index f64d5f9a8..43b0b91fb 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -98,12 +98,21 @@
/* The roundedness of preview box and placeholders */
#define PREVIEW_ROUND_FACTOR 16
+#define PREVIEW_BUTTON_OPACITY 180
+
G_DEFINE_TYPE(EmpathyCallWindow, empathy_call_window, GTK_TYPE_WINDOW)
enum {
PROP_CALL_HANDLER = 1,
};
+enum {
+ SIG_INHIBIT,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
typedef enum {
RINGING, /* Incoming call */
CONNECTING, /* Outgoing call */
@@ -626,7 +635,8 @@ empathy_call_window_camera_removed_cb (EmpathyCameraMonitor *monitor,
}
static void
-empathy_call_window_preview_button_clicked_cb (GtkButton *button,
+empathy_call_window_preview_button_clicked_cb (ClutterClickAction *action,
+ ClutterActor *actor,
EmpathyCallWindow *self)
{
GtkWidget *menu;
@@ -639,7 +649,9 @@ empathy_call_window_preview_button_clicked_cb (GtkButton *button,
}
static void
-empathy_call_window_preview_hidden_button_clicked_cb (GtkButton *button,
+empathy_call_window_preview_hidden_button_clicked_cb (
+ ClutterClickAction *action,
+ ClutterActor *actor,
EmpathyCallWindow *self)
{
GtkWidget *menu;
@@ -1067,7 +1079,6 @@ create_video_preview (EmpathyCallWindow *self)
ClutterActor *preview;
ClutterActor *b;
ClutterAction *action;
- GtkWidget *button;
PreviewPosition pos;
g_assert (priv->video_preview == NULL);
@@ -1119,27 +1130,27 @@ create_video_preview (EmpathyCallWindow *self)
"async", FALSE,
NULL);
- /* Translators: this is an "Info" label. It should be as short
- * as possible. */
- button = gtk_button_new_with_label (_("i"));
- priv->preview_shown_button = b = gtk_clutter_actor_new_with_contents (button);
- clutter_actor_set_size (b, 24, 24);
+ /* Preview show */
+ priv->preview_shown_button = b = gtk_clutter_actor_new_with_contents (
+ gtk_image_new_from_icon_name ("emblem-system-symbolic",
+ GTK_ICON_SIZE_MENU));
clutter_actor_set_margin_right (b, 4);
clutter_actor_set_margin_bottom (b, 2);
+ clutter_actor_set_opacity (b, PREVIEW_BUTTON_OPACITY);
make_background_transparent (GTK_CLUTTER_ACTOR (b));
clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (layout), b,
CLUTTER_BIN_ALIGNMENT_END, CLUTTER_BIN_ALIGNMENT_END);
- g_signal_connect (button, "clicked",
- G_CALLBACK (empathy_call_window_preview_button_clicked_cb),
- self);
+ action = clutter_click_action_new ();
+ clutter_actor_add_action (b, action);
+ g_signal_connect (action, "clicked",
+ G_CALLBACK (empathy_call_window_preview_button_clicked_cb), self);
- /* Translators: this is an "Info" label. It should be as short
- * as possible. */
- button = gtk_button_new_with_label (_("i"));
- priv->preview_hidden_button = b = gtk_clutter_actor_new_with_contents (button);
- clutter_actor_set_size (b, 24, 24);
+ /* Preview hidden */
+ priv->preview_hidden_button = b = gtk_clutter_actor_new_with_contents (
+ gtk_image_new_from_icon_name ("emblem-system-symbolic",
+ GTK_ICON_SIZE_MENU));
make_background_transparent (GTK_CLUTTER_ACTOR (b));
clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->preview_layout),
@@ -1151,9 +1162,10 @@ create_video_preview (EmpathyCallWindow *self)
clutter_actor_hide (priv->preview_hidden_button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (empathy_call_window_preview_hidden_button_clicked_cb),
- self);
+ action = clutter_click_action_new ();
+ clutter_actor_add_action (b, action);
+ g_signal_connect (action, "clicked",
+ G_CALLBACK (empathy_call_window_preview_hidden_button_clicked_cb), self);
clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->preview_layout),
priv->video_preview,
@@ -1364,7 +1376,65 @@ empathy_call_window_contents_cb (GtkAction *action,
}
static void
-empathy_call_window_debug_cb (GtkAction *action,
+show_png (GPid pid, gint status, gpointer user_data)
+{
+ gtk_show_uri (NULL, (gchar *) user_data, GDK_CURRENT_TIME, NULL);
+ g_spawn_close_pid (pid);
+ g_free (user_data);
+}
+
+static void
+empathy_call_window_debug_gst_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ EmpathyCallWindowPriv *priv = GET_PRIV (self);
+ GDateTime *date_time;
+ GPid dot_pid;
+ const gchar *dot_dir;
+ const gchar *prgname;
+ gchar *dot_cmd;
+ gchar *filename;
+ gchar **argv;
+ gint argc;
+
+ if (priv->pipeline == NULL)
+ DEBUG ("No pipeline");
+
+ date_time = g_date_time_new_now_utc ();
+ prgname = g_get_prgname ();
+ filename = g_strdup_printf ("%s-%" G_GINT64_FORMAT, prgname,
+ g_date_time_to_unix (date_time));
+
+ GST_DEBUG_BIN_TO_DOT_FILE (GST_BIN (priv->pipeline),
+ GST_DEBUG_GRAPH_SHOW_ALL, filename);
+
+ dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR");
+ dot_cmd = g_strdup_printf ("dot -Tpng -o %s.png %s.dot",
+ filename,
+ filename);
+ g_shell_parse_argv (dot_cmd, &argc, &argv, NULL);
+
+ if (g_spawn_async (dot_dir,
+ argv,
+ NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
+ NULL,
+ NULL,
+ &dot_pid,
+ NULL))
+ {
+ gchar *uri = g_strdup_printf ("file://%s/%s.png", dot_dir, filename);
+ g_child_watch_add (dot_pid, show_png, uri);
+ }
+
+ g_strfreev (argv);
+ g_free (dot_cmd);
+ g_free (filename);
+ g_date_time_unref (date_time);
+}
+
+static void
+empathy_call_window_debug_tp_cb (GtkAction *action,
EmpathyCallWindow *self)
{
empathy_launch_program (BIN_DIR, "empathy-debugger", "-s Empathy.Call");
@@ -1619,7 +1689,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
"menufullscreen", "activate", empathy_call_window_fullscreen_cb,
"menusettings", "activate", empathy_call_window_settings_cb,
"menucontents", "activate", empathy_call_window_contents_cb,
- "menudebug", "activate", empathy_call_window_debug_cb,
+ "menudebuggst", "activate", empathy_call_window_debug_gst_cb,
+ "menudebugtp", "activate", empathy_call_window_debug_tp_cb,
"menuabout", "activate", empathy_call_window_about_cb,
"menupreviewdisable", "activate", empathy_call_window_disable_camera_cb,
"menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb,
@@ -1806,6 +1877,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
empathy_call_window_show_hangup_button (self, TRUE);
+ gtk_window_set_default_size (GTK_WINDOW (self), 580, 480);
+
empathy_geometry_bind (GTK_WINDOW (self), "call-window");
/* These signals are used to track the window position and save it
* when the window is destroyed. We need to do this as we don't want
@@ -2296,6 +2369,13 @@ empathy_call_window_class_init (
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class,
PROP_CALL_HANDLER, param_spec);
+
+ signals[SIG_INHIBIT] = g_signal_new ("inhibit",
+ G_OBJECT_CLASS_TYPE (empathy_call_window_class),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1, G_TYPE_BOOLEAN);
}
void
@@ -2539,6 +2619,8 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
/* Leave full screen mode if needed */
gtk_window_unfullscreen (GTK_WINDOW (self));
+ g_signal_emit (self, signals[SIG_INHIBIT], 0, FALSE);
+
gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
@@ -3584,6 +3666,8 @@ start_call (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
+ g_signal_emit (self, signals[SIG_INHIBIT], 0, TRUE);
+
priv->call_started = TRUE;
empathy_call_handler_start_call (priv->handler,
gtk_get_current_event_time ());
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index a66a05825..f26f33b49 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -71,6 +71,18 @@
</object>
</child>
<child>
+ <object class="GtkAction" id="menudebuggst">
+ <property name="name">menudebuggst</property>
+ <property name="label" translatable="yes">_GStreamer</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menudebugtp">
+ <property name="name">menudebugtp</property>
+ <property name="label" translatable="yes">_Telepathy</property>
+ </object>
+ </child>
+ <child>
<object class="GtkAction" id="menuabout">
<property name="stock_id">gtk-about</property>
<property name="name">menuabout</property>
@@ -114,7 +126,10 @@
</menu>
<menu action="help">
<menuitem name="menucontents" action="menucontents"/>
- <menuitem name="menudebug" action="menudebug"/>
+ <menu name="menudebug" action="menudebug">
+ <menuitem action="menudebuggst"/>
+ <menuitem action="menudebugtp"/>
+ </menu>
<menuitem name="menuabout" action="menuabout"/>
</menu>
</menubar>
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 5b50f9572..71fef2e10 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -54,6 +54,7 @@
static GtkApplication *app = NULL;
static gboolean activated = FALSE;
static gboolean use_timer = TRUE;
+static guint inhibit_id = 0;
static EmpathyCallFactory *call_factory = NULL;
@@ -107,6 +108,32 @@ incoming_call_cb (EmpathyCallFactory *factory,
}
static void
+call_window_inhibit_cb (EmpathyCallWindow *window,
+ gboolean inhibit,
+ gpointer user_data)
+{
+ if (inhibit)
+ {
+ if (inhibit_id != 0)
+ return;
+
+ inhibit_id = gtk_application_inhibit (GTK_APPLICATION (app),
+ GTK_WINDOW (window),
+ GTK_APPLICATION_INHIBIT_LOGOUT | GTK_APPLICATION_INHIBIT_SWITCH |
+ GTK_APPLICATION_INHIBIT_SUSPEND | GTK_APPLICATION_INHIBIT_IDLE,
+ _("In a call"));
+ }
+ else
+ {
+ if (inhibit_id == 0)
+ return;
+
+ gtk_application_uninhibit (GTK_APPLICATION (app), inhibit_id);
+ inhibit_id = 0;
+ }
+}
+
+static void
new_call_handler_cb (EmpathyCallFactory *factory,
EmpathyCallHandler *handler,
gboolean outgoing,
@@ -133,6 +160,8 @@ new_call_handler_cb (EmpathyCallFactory *factory,
g_application_hold (G_APPLICATION (app));
g_signal_connect (window, "destroy",
G_CALLBACK (call_window_destroyed_cb), contact);
+ g_signal_connect (window, "inhibit",
+ G_CALLBACK (call_window_inhibit_cb), NULL);
gtk_widget_show (GTK_WIDGET (window));
}
@@ -184,6 +213,8 @@ main (int argc,
gint retval;
GtkSettings *gtk_settings;
+ g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE);
+
#ifdef GDK_WINDOWING_X11
/* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice
* but to intiialise X11 threading ourself */
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index c72b01ede..676c4ef23 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -81,7 +81,6 @@ struct _EmpathyChatWindowPriv
EmpathyChatroomManager *chatroom_manager;
EmpathyNotifyManager *notify_mgr;
EmpathyIndividualManager *individual_mgr;
- GtkWidget *dialog;
GtkWidget *notebook;
NotifyNotification *notification;
@@ -180,7 +179,7 @@ static void empathy_chat_window_get_nb_chats (EmpathyChatWindow *self,
guint *nb_rooms,
guint *nb_private);
-G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT)
+G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, GTK_TYPE_WINDOW)
static void
chat_window_accel_cb (GtkAccelGroup *accelgroup,
@@ -323,7 +322,7 @@ confirm_close (EmpathyChatWindow *self,
}
dialog = gtk_message_dialog_new (
- GTK_WINDOW (self->priv->dialog),
+ GTK_WINDOW (self),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CANCEL,
@@ -620,7 +619,7 @@ chat_window_contact_menu_update (EmpathyChatWindow *self)
if (submenu != NULL)
{
/* gtk_menu_attach_to_widget () doesn't behave nicely here */
- g_object_set_data (G_OBJECT (submenu), "window", self->priv->dialog);
+ g_object_set_data (G_OBJECT (submenu), "window", self);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
gtk_widget_show (menu);
@@ -733,7 +732,7 @@ chat_window_title_update (EmpathyChatWindow *self)
gchar *name;
name = get_window_title_name (self);
- gtk_window_set_title (GTK_WINDOW (self->priv->dialog), name);
+ gtk_window_set_title (GTK_WINDOW (self), name);
g_free (name);
}
@@ -751,7 +750,7 @@ chat_window_icon_update (EmpathyChatWindow *self,
/* Update window icon */
if (new_messages)
{
- gtk_window_set_icon_name (GTK_WINDOW (self->priv->dialog),
+ gtk_window_set_icon_name (GTK_WINDOW (self),
EMPATHY_IMAGE_MESSAGE);
}
else
@@ -764,14 +763,14 @@ chat_window_icon_update (EmpathyChatWindow *self,
remote_contact = empathy_chat_get_remote_contact (self->priv->current_chat);
icon = empathy_pixbuf_avatar_from_contact_scaled (remote_contact,
0, 0);
- gtk_window_set_icon (GTK_WINDOW (self->priv->dialog), icon);
+ gtk_window_set_icon (GTK_WINDOW (self), icon);
if (icon != NULL)
g_object_unref (icon);
}
else
{
- gtk_window_set_icon_name (GTK_WINDOW (self->priv->dialog), NULL);
+ gtk_window_set_icon_name (GTK_WINDOW (self), NULL);
}
}
}
@@ -987,9 +986,9 @@ chat_window_update_chat_tab_full (EmpathyChat *chat,
const gchar * const *types;
types = empathy_contact_get_client_types (remote_contact);
- if (types != NULL && !tp_strdiff (types[0], "phone"))
+ if (empathy_client_types_contains_mobile_device ((GStrv) types))
{
- /* I'm on a phone ! */
+ /* I'm on a mobile device ! */
gchar *tmp = name;
name = g_strdup_printf ("☎ %s", name);
@@ -1225,7 +1224,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action,
tp_chat = empathy_chat_get_tp_chat (self->priv->current_chat);
dialog = empathy_invite_participant_dialog_new (
- GTK_WINDOW (self->priv->dialog), tp_chat);
+ GTK_WINDOW (self), tp_chat);
gtk_widget_show (dialog);
@@ -1433,7 +1432,12 @@ chat_window_tabs_right_activate_cb (GtkAction *action,
static EmpathyChatWindow *
empathy_chat_window_new (void)
{
- return EMPATHY_CHAT_WINDOW (g_object_new (EMPATHY_TYPE_CHAT_WINDOW, NULL));
+ return g_object_new (EMPATHY_TYPE_CHAT_WINDOW,
+ "default-width", 580,
+ "default-height", 480,
+ "title", _("Chat"),
+ "role", "chat",
+ NULL);
}
static void
@@ -1448,21 +1452,21 @@ chat_window_detach_activate_cb (GtkAction *action,
empathy_chat_window_move_chat (self, new_window, chat);
- gtk_widget_show (new_window->priv->dialog);
+ gtk_widget_show (GTK_WIDGET (new_window));
}
static void
chat_window_help_contents_activate_cb (GtkAction *action,
EmpathyChatWindow *self)
{
- empathy_url_show (self->priv->dialog, "help:empathy");
+ empathy_url_show (GTK_WIDGET (self), "help:empathy");
}
static void
chat_window_help_about_activate_cb (GtkAction *action,
EmpathyChatWindow *self)
{
- empathy_about_dialog_new (GTK_WINDOW (self->priv->dialog));
+ empathy_about_dialog_new (GTK_WINDOW (self));
}
static gboolean
@@ -1509,7 +1513,7 @@ static void
chat_window_set_urgency_hint (EmpathyChatWindow *self,
gboolean urgent)
{
- gtk_window_set_urgency_hint (GTK_WINDOW (self->priv->dialog), urgent);
+ gtk_window_set_urgency_hint (GTK_WINDOW (self), urgent);
}
static void
@@ -1570,13 +1574,13 @@ chat_window_show_or_update_notification (EmpathyChatWindow *self,
const gchar *category = empathy_chat_is_room (chat)
? EMPATHY_NOTIFICATION_CATEGORY_MENTIONED
: EMPATHY_NOTIFICATION_CATEGORY_CHAT;
- notification = notify_notification_new (header, escaped, NULL);
+
+ notification = empathy_notify_manager_create_notification (header,
+ escaped, NULL);
if (self->priv->notification == NULL)
self->priv->notification = notification;
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
-
tp_g_signal_connect_object (notification, "closed",
G_CALLBACK (chat_window_notification_closed_cb), self, 0);
@@ -1612,7 +1616,7 @@ empathy_chat_window_has_focus (EmpathyChatWindow *self)
g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (self), FALSE);
- g_object_get (self->priv->dialog, "has-toplevel-focus", &has_focus, NULL);
+ g_object_get (self, "has-toplevel-focus", &has_focus, NULL);
return has_focus;
}
@@ -1641,7 +1645,7 @@ chat_window_new_message_cb (EmpathyChat *chat,
if (empathy_contact_is_user (sender))
{
- empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self->priv->dialog),
+ empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self),
EMPATHY_SOUND_MESSAGE_OUTGOING);
return;
}
@@ -1701,7 +1705,7 @@ chat_window_new_message_cb (EmpathyChat *chat,
if (!pending)
{
empathy_sound_manager_play (self->priv->sound_mgr,
- GTK_WIDGET (self->priv->dialog), EMPATHY_SOUND_MESSAGE_INCOMING);
+ GTK_WIDGET (self), EMPATHY_SOUND_MESSAGE_INCOMING);
chat_window_show_or_update_notification (self, message, chat);
}
@@ -1782,8 +1786,8 @@ notebook_create_window_cb (GtkNotebook *source,
empathy_chat_window_move_chat (window, new_window, chat);
- gtk_widget_show (new_window->priv->dialog);
- gtk_window_move (GTK_WINDOW (new_window->priv->dialog), x, y);
+ gtk_widget_show (GTK_WIDGET (new_window));
+ gtk_window_move (GTK_WINDOW (new_window), x, y);
return NULL;
}
@@ -1896,7 +1900,7 @@ chat_window_page_removed_cb (GtkNotebook *notebook,
if (self->priv->chats == NULL)
{
- g_object_unref (self);
+ gtk_widget_destroy (GTK_WIDGET (self));
}
else
{
@@ -2300,7 +2304,6 @@ chat_window_finalize (GObject *object)
}
chat_windows = g_list_remove (chat_windows, self);
- gtk_widget_destroy (self->priv->dialog);
G_OBJECT_CLASS (empathy_chat_window_parent_class)->finalize (object);
}
@@ -2359,7 +2362,6 @@ empathy_chat_window_init (EmpathyChatWindow *self)
filename = empathy_file_lookup ("empathy-chat-window.ui", "src");
gui = empathy_builder_get_file (filename,
- "chat_window", &self->priv->dialog,
"chat_vbox", &chat_vbox,
"ui_manager", &self->priv->ui_manager,
"menu_conv_insert_smiley", &self->priv->menu_conv_insert_smiley,
@@ -2402,10 +2404,7 @@ empathy_chat_window_init (EmpathyChatWindow *self)
"menu_help_about", "activate", chat_window_help_about_activate_cb,
NULL);
- g_object_ref (self->priv->ui_manager);
- g_object_unref (gui);
-
- empathy_set_css_provider (GTK_WIDGET (self->priv->dialog));
+ empathy_set_css_provider (GTK_WIDGET (self));
self->priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
self->priv->gsettings_notif = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA);
@@ -2419,6 +2418,8 @@ empathy_chat_window_init (EmpathyChatWindow *self)
g_signal_connect (self->priv->notebook, "create-window",
G_CALLBACK (notebook_create_window_cb), self);
+ gtk_container_add (GTK_CONTAINER (self), chat_vbox);
+
gtk_notebook_set_group_name (GTK_NOTEBOOK (self->priv->notebook),
"EmpathyChatWindow");
gtk_notebook_set_scrollable (GTK_NOTEBOOK (self->priv->notebook), TRUE);
@@ -2428,7 +2429,7 @@ empathy_chat_window_init (EmpathyChatWindow *self)
/* Set up accels */
accel_group = gtk_accel_group_new ();
- gtk_window_add_accel_group (GTK_WINDOW (self->priv->dialog), accel_group);
+ gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
for (i = 0; i < G_N_ELEMENTS (tab_accel_keys); i++)
{
@@ -2462,11 +2463,11 @@ empathy_chat_window_init (EmpathyChatWindow *self)
* block/unblock them at some later stage.
*/
- g_signal_connect (self->priv->dialog, "delete_event",
+ g_signal_connect (self, "delete_event",
G_CALLBACK (chat_window_delete_event_cb), self);
- g_signal_connect (self->priv->dialog, "focus_in_event",
+ g_signal_connect (self, "focus_in_event",
G_CALLBACK (chat_window_focus_in_event_cb), self);
- g_signal_connect (self->priv->dialog, "focus_out_event",
+ g_signal_connect (self, "focus_out_event",
G_CALLBACK (chat_window_focus_out_event_cb), self);
g_signal_connect_after (self->priv->notebook, "switch_page",
G_CALLBACK (chat_window_page_switched_cb), self);
@@ -2506,6 +2507,9 @@ empathy_chat_window_init (EmpathyChatWindow *self)
chat_window_chat_manager_chats_changed_cb (self->priv->chat_manager,
empathy_chat_manager_get_num_closed_chats (self->priv->chat_manager), self);
+
+ g_object_ref (self->priv->ui_manager);
+ g_object_unref (gui);
}
/* Returns the window to open a new tab in if there is a suitable window,
@@ -2582,24 +2586,24 @@ empathy_chat_window_add_chat (EmpathyChatWindow *self,
gint x, y;
/* Save current position of the window */
- gtk_window_get_position (GTK_WINDOW (self->priv->dialog), &x, &y);
+ gtk_window_get_position (GTK_WINDOW (self), &x, &y);
/* First bind to the 'generic' name. So new window for which we didn't
* save a geometry yet will have the geometry of the last saved
* window (bgo #601191). */
- empathy_geometry_bind (GTK_WINDOW (self->priv->dialog), name);
+ empathy_geometry_bind (GTK_WINDOW (self), name);
/* Restore previous position of the window so the newly created window
* won't be in the same position as the latest saved window and so
* completely hide it. */
- gtk_window_move (GTK_WINDOW (self->priv->dialog), x, y);
+ gtk_window_move (GTK_WINDOW (self), x, y);
/* Then bind it to the name of the contact/room so we'll save the
* geometry specific to this window */
name = empathy_chat_get_id (chat);
}
- empathy_geometry_bind (GTK_WINDOW (self->priv->dialog), name);
+ empathy_geometry_bind (GTK_WINDOW (self), name);
}
child = GTK_WIDGET (chat);
@@ -2768,7 +2772,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
/* we want to display the newly created window even if we
* don't present it */
- gtk_widget_show (self->priv->dialog);
+ gtk_widget_show (GTK_WIDGET (self));
}
empathy_chat_window_add_chat (self, chat);
@@ -2799,7 +2803,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
* to our current desktop but move to the window's desktop instead. This is
* more coherent with Shell's 'app is ready' notication which moves the view
* to the app desktop rather than moving the app itself. */
- empathy_move_to_window_desktop (GTK_WINDOW (self->priv->dialog), x_timestamp);
+ empathy_move_to_window_desktop (GTK_WINDOW (self), x_timestamp);
gtk_widget_grab_focus (chat->input_text_view);
return self;
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 054469dfa..2041634aa 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -64,13 +64,13 @@ typedef struct _EmpathyChatWindowPriv EmpathyChatWindowPriv;
struct _EmpathyChatWindow
{
- GObject parent;
+ GtkWindow parent;
EmpathyChatWindowPriv *priv;
};
struct _EmpathyChatWindowClass
{
- GObjectClass parent_class;
+ GtkWindowClass parent_class;
};
GType empathy_chat_window_get_type (void);
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index ef2011895..d3f002668 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -203,27 +203,19 @@
</menubar>
</ui>
</object>
- <object class="GtkWindow" id="chat_window">
- <property name="title" translatable="yes">Chat</property>
- <property name="role">chat</property>
- <property name="default_width">580</property>
- <property name="default_height">480</property>
+ <object class="GtkVBox" id="chat_vbox">
+ <property name="visible">True</property>
<child>
- <object class="GtkVBox" id="chat_vbox">
+ <object class="GtkMenuBar" constructor="ui_manager" id="chats_menubar">
<property name="visible">True</property>
- <child>
- <object class="GtkMenuBar" constructor="ui_manager" id="chats_menubar">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</interface>
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index da69a8ebe..0e571bc3b 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -34,6 +34,7 @@
#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-chat-manager.h"
+#include "empathy-chat-resources.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
#include <libempathy/empathy-debug.h>
@@ -91,6 +92,7 @@ main (int argc,
GOptionEntry options[] = {
{ NULL }
};
+ GResource *resource;
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
#endif
@@ -124,6 +126,9 @@ main (int argc,
notify_init (_(PACKAGE_NAME));
+ resource = empathy_chat_get_resource ();
+ g_resources_register (resource);
+
app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
@@ -164,6 +169,9 @@ main (int argc,
g_object_unref (debug_sender);
#endif
+ g_resources_unregister (resource);
+ g_resource_unref (resource);
+
notify_uninit ();
return retval;
diff --git a/src/empathy-chat.gresource.xml b/src/empathy-chat.gresource.xml
new file mode 100644
index 000000000..dd5a29b2f
--- /dev/null
+++ b/src/empathy-chat.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/Empathy/Chat">
+ <file>empathy-chat.js</file>
+ </gresource>
+</gresources>
diff --git a/src/empathy-chat.js b/src/empathy-chat.js
new file mode 100644
index 000000000..236049959
--- /dev/null
+++ b/src/empathy-chat.js
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Debarshi Ray <debarshir@src.gnome.org>
+ */
+
+
+var chat = document.getElementById("Chat");
+
+
+function createHTMLNode(html) {
+ var range = document.createRange();
+ range.selectNode(chat);
+ return range.createContextualFragment(html);
+}
+
+
+function getContentsNode(node) {
+ var post = node.getElementsByClassName("post")[0];
+ return post.getElementsByClassName("post-contents")[0];
+}
+
+
+// Remove all but the last #insert
+function removeInsertNodes(node) {
+ var inserts = node.querySelectorAll("#insert");
+ if (inserts.length < 2)
+ return;
+
+ for (var i = 0; i < inserts.length - 1; i++) {
+ var insert = inserts[i];
+ insert.parentNode.removeChild(insert);
+ }
+}
+
+
+// Remove all but the first #prepend
+function removePrependNodes(node) {
+ var pres = node.querySelectorAll("#prepend");
+ if (pres.length < 2)
+ return;
+
+ for (var i = 1; i < pres.length; i++) {
+ var pre = pres[i];
+ pre.parentNode.removeChild(pre);
+ }
+}
+
+
+function prepend(html) {
+ var node = createHTMLNode(html);
+ chat.insertBefore(node, chat.firstChild);
+
+ // The lastChild should retain the #insert
+ if (chat.children.length == 1)
+ return;
+
+ removeInsertNodes(chat);
+ removePrependNodes(chat);
+}
+
+
+function prependPrev(html) {
+ var pre = chat.firstChild.querySelector("#prepend");
+
+ // For themes that don't support #prepend
+ if (!pre) {
+ prepend(html);
+ return;
+ }
+
+ var contents = pre.parentNode;
+ var node = createHTMLNode(html);
+
+ // Skip both the #prepend and #insert
+ for (var i = node.childNodes.length - 2; i > 0; i--)
+ contents.insertBefore(node.childNodes[i], pre.nextSibling);
+}
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 33b12627a..f1bd6da5e 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1844,6 +1844,7 @@ am_prepared_cb (GObject *am,
GtkListStore *level_store;
GtkTreeIter iter;
GError *error = NULL;
+ GtkWidget *infobar, *content;
if (!tp_proxy_prepare_finish (am, res, &error))
{
@@ -2021,6 +2022,32 @@ am_prepared_cb (GObject *am,
g_signal_connect (self->priv->level_filter, "changed",
G_CALLBACK (debug_window_filter_changed_cb), object);
+ /* Info bar */
+ infobar = gtk_info_bar_new ();
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO);
+
+ label = gtk_label_new (
+ _("Even if they don't display passwords, logs can contain sensitive "
+ "information such as your list of contacts or the messages you "
+ "recently sent or received.\nIf you don't want to see such "
+ "information available in a public bug report, you "
+ "can choose to limit the visibility of your bug to "
+ "Empathy developers when reporting it by displaying "
+ "the advanced fields in the "
+ "<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">"
+ "bug report</a>."));
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_style_context_add_class (gtk_widget_get_style_context (label),
+ GTK_STYLE_CLASS_DIM_LABEL);
+
+ content = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
+ gtk_box_pack_start (GTK_BOX (content), label, FALSE, FALSE, 0);
+
+ gtk_widget_show (infobar);
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (vbox), infobar, FALSE, FALSE, 0);
+
/* Debug treeview */
self->priv->view = gtk_tree_view_new ();
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (self->priv->view), TRUE);
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index b6abd8c6b..2f42c7613 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -339,8 +339,8 @@ update_notification (EmpathyNotificationsApprover *self)
* to an existing notification with the same title.
* In this way the previous message will not be lost: the new
* message will appear below it, in the same notification */
- notification = notify_notification_new (self->priv->event->header,
- message_esc, NULL);
+ notification = empathy_notify_manager_create_notification (
+ self->priv->event->header, message_esc, NULL);
if (self->priv->notification == NULL)
{
@@ -350,9 +350,6 @@ update_notification (EmpathyNotificationsApprover *self)
G_CALLBACK (notification_closed_cb), self);
}
- notify_notification_set_timeout (notification,
- NOTIFY_EXPIRES_DEFAULT);
-
if (has_x_canonical_append)
{
notify_notification_set_hint (notification,
diff --git a/src/empathy-roster-window-menubar.ui b/src/empathy-roster-window-menubar.ui
index a70b7461e..2d0b9abb0 100644
--- a/src/empathy-roster-window-menubar.ui
+++ b/src/empathy-roster-window-menubar.ui
@@ -24,7 +24,6 @@
<item>
<attribute translatable="yes" name="label">_Search for Contacts...</attribute>
<attribute name="action">win.chat_search_contacts</attribute>
- <attribute name="accel">&lt;Shift&gt;f</attribute>
</item>
</section>
<section>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 34c2c2952..38adf45fa 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -125,6 +125,8 @@ struct _EmpathyRosterWindowPriv {
GtkWidget *no_entry_label;
GtkWidget *button_account_settings;
GtkWidget *button_online;
+ GtkWidget *button_show_offline;
+ GtkWidget *button_add_contact;
GtkWidget *spinner_loading;
GtkWidget *tooltip_widget;
@@ -393,14 +395,56 @@ button_online_clicked_cb (GtkButton *button,
g_object_unref (mgr);
}
+static void
+button_show_offline_clicked_cb (GtkButton *button,
+ EmpathyRosterWindow *self)
+{
+ g_settings_set_boolean (self->priv->gsettings_ui,
+ EMPATHY_PREFS_UI_SHOW_OFFLINE, TRUE);
+}
+
+static void
+button_add_contact_clicked_cb (GtkButton *button,
+ EmpathyRosterWindow *self)
+{
+ empathy_new_individual_dialog_show (GTK_WINDOW (self));
+}
+
typedef enum
{
PAGE_MESSAGE_FLAG_NONE = 0,
PAGE_MESSAGE_FLAG_ACCOUNTS = 1 << 0,
PAGE_MESSAGE_FLAG_SPINNER = 1 << 2,
PAGE_MESSAGE_FLAG_ONLINE = 1 << 3,
+ PAGE_MESSAGE_FLAG_SHOW_OFFLINE = 1 << 4,
+ PAGE_MESSAGE_FLAG_ADD_CONTACT = 1 << 5,
} PageMessageFlags;
+static gboolean
+can_add_contact (EmpathyRosterWindow *self)
+{
+ GList *accounts, *l;
+ gboolean result = FALSE;
+
+ accounts = tp_account_manager_dup_valid_accounts (
+ self->priv->account_manager);
+ for (l = accounts; l != NULL && !result; l = g_list_next (l))
+ {
+ TpAccount *account = TP_ACCOUNT (l->data);
+ TpConnection *conn;
+
+ conn = tp_account_get_connection (account);
+ if (conn == NULL)
+ continue;
+
+ if (tp_connection_get_can_change_contact_list (conn))
+ result = TRUE;
+ }
+
+ g_list_free_full (accounts, g_object_unref);
+ return result;
+}
+
static void
display_page_message (EmpathyRosterWindow *self,
const gchar *msg,
@@ -429,6 +473,14 @@ display_page_message (EmpathyRosterWindow *self,
(flags & PAGE_MESSAGE_FLAG_SPINNER) != 0);
gtk_widget_set_visible (self->priv->button_online,
(flags & PAGE_MESSAGE_FLAG_ONLINE) != 0);
+ gtk_widget_set_visible (self->priv->button_show_offline,
+ (flags & PAGE_MESSAGE_FLAG_SHOW_OFFLINE) != 0);
+ gtk_widget_set_visible (self->priv->button_add_contact,
+ (flags & PAGE_MESSAGE_FLAG_ADD_CONTACT) != 0);
+
+ if ((flags & PAGE_MESSAGE_FLAG_ADD_CONTACT) != 0)
+ gtk_widget_set_sensitive (self->priv->button_add_contact,
+ can_add_contact (self));
gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
PAGE_MESSAGE);
@@ -605,6 +657,54 @@ roster_window_error_add_stock_button (GtkInfoBar *info_bar,
gtk_info_bar_add_action_widget (info_bar, button, response_id);
}
+#ifdef HAVE_UOA
+static const gchar *
+uoa_account_display_string (TpAccount *account)
+{
+ const gchar *service;
+
+ service = tp_account_get_service (account);
+
+ /* Use well known service name, if available */
+ if (!tp_strdiff (service, "windows-live"))
+ return _("Windows Live");
+ else if (!tp_strdiff (service, "google-talk"))
+ return _("Google Talk");
+ else if (!tp_strdiff (service, "facebook"))
+ return _("Facebook");
+
+ return tp_account_get_display_name (account);
+}
+
+static void
+roster_window_uoa_auth_error (EmpathyRosterWindow *self,
+ TpAccount *account)
+{
+ GtkWidget *info_bar;
+ GtkWidget *image;
+ GtkWidget *button;
+ gchar *str;
+
+ /* translators: %s is an account name like 'Facebook' or 'Google Talk' */
+ str = g_strdup_printf (_("%s account requires authorisation"),
+ uoa_account_display_string (account));
+
+ info_bar = roster_window_error_create_info_bar (self, account,
+ GTK_MESSAGE_OTHER, str);
+ g_free (str);
+
+ image = gtk_image_new_from_icon_name ("credentials-preferences",
+ GTK_ICON_SIZE_BUTTON);
+ button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (button), image);
+ gtk_widget_set_tooltip_text (button, _("Online Accounts"));
+ gtk_widget_show (button);
+
+ gtk_info_bar_add_action_widget (GTK_INFO_BAR (info_bar), button,
+ ERROR_RESPONSE_EDIT);
+}
+#endif
+
static void
roster_window_error_display (EmpathyRosterWindow *self,
TpAccount *account)
@@ -620,6 +720,17 @@ roster_window_error_display (EmpathyRosterWindow *self,
if (user_requested)
return;
+#ifdef HAVE_UOA
+ if (!tp_strdiff (TP_ERROR_STR_AUTHENTICATION_FAILED,
+ tp_account_get_detailed_error (account, NULL)) &&
+ !tp_strdiff (tp_account_get_storage_provider (account),
+ EMPATHY_UOA_PROVIDER))
+ {
+ roster_window_uoa_auth_error (self, account);
+ return;
+ }
+#endif
+
str = g_markup_printf_escaped ("<b>%s</b>\n%s",
tp_account_get_display_name (account), error_message);
@@ -657,6 +768,7 @@ roster_window_update_status (EmpathyRosterWindow *self)
{
gboolean connected, connecting;
GList *l;
+ GAction *action;
connected = empathy_account_manager_get_accounts_connected (&connecting);
@@ -675,6 +787,10 @@ roster_window_update_status (EmpathyRosterWindow *self)
/* Update widgets sensibility */
for (l = self->priv->actions_connected; l; l = l->next)
g_simple_action_set_enabled (l->data, connected);
+
+ action = g_action_map_lookup_action (G_ACTION_MAP (self), "chat_add_contact");
+ if (!can_add_contact (self))
+ g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
}
static void
@@ -932,13 +1048,17 @@ empathy_roster_window_finalize (GObject *window)
static gboolean
roster_window_key_press_event_cb (GtkWidget *window,
GdkEventKey *event,
- gpointer user_data)
+ EmpathyRosterWindow *self)
{
if (event->keyval == GDK_KEY_T
&& event->state & GDK_SHIFT_MASK
&& event->state & GDK_CONTROL_MASK)
empathy_chat_manager_call_undo_closed_chat ();
+ if (event->keyval == GDK_KEY_f
+ && event->state & GDK_CONTROL_MASK)
+ gtk_widget_show (self->priv->search_bar);
+
return FALSE;
}
@@ -1567,8 +1687,13 @@ set_notebook_page (EmpathyRosterWindow *self)
}
else
{
- display_page_message (self, _("No online contacts"),
- PAGE_MESSAGE_FLAG_NONE);
+ if (g_settings_get_boolean (self->priv->gsettings_ui,
+ EMPATHY_PREFS_UI_SHOW_OFFLINE))
+ display_page_message (self, _("You haven't added any contact yet"),
+ PAGE_MESSAGE_FLAG_ADD_CONTACT);
+ else
+ display_page_message (self, _("No online contacts"),
+ PAGE_MESSAGE_FLAG_SHOW_OFFLINE);
}
goto out;
}
@@ -2087,6 +2212,14 @@ roster_window_most_available_presence_changed_cb (TpAccountManager *manager,
}
static void
+show_offline_changed_cb (GSettings *settings,
+ const gchar *key,
+ EmpathyRosterWindow *self)
+{
+ set_notebook_page (self);
+}
+
+static void
empathy_roster_window_init (EmpathyRosterWindow *self)
{
GtkBuilder *gui;
@@ -2127,6 +2260,8 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
"roster_scrolledwindow", &sw,
"button_account_settings", &self->priv->button_account_settings,
"button_online", &self->priv->button_online,
+ "button_show_offline", &self->priv->button_show_offline,
+ "button_add_contact", &self->priv->button_add_contact,
"spinner_loading", &self->priv->spinner_loading,
NULL);
g_free (filename);
@@ -2135,7 +2270,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
gtk_widget_show (self->priv->main_vbox);
g_signal_connect (self, "key-press-event",
- G_CALLBACK (roster_window_key_press_event_cb), NULL);
+ G_CALLBACK (roster_window_key_press_event_cb), self);
g_object_unref (gui);
@@ -2278,6 +2413,9 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE,
self->priv->view, "show-offline",
G_SETTINGS_BIND_GET);
+ tp_g_signal_connect_object (self->priv->gsettings_ui,
+ "changed::" EMPATHY_PREFS_UI_SHOW_OFFLINE,
+ G_CALLBACK (show_offline_changed_cb), self, 0);
g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_GROUPS,
self->priv->view, "show-groups",
G_SETTINGS_BIND_GET);
@@ -2289,6 +2427,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
G_CALLBACK (button_account_settings_clicked_cb), self);
g_signal_connect (self->priv->button_online, "clicked",
G_CALLBACK (button_online_clicked_cb), self);
+ g_signal_connect (self->priv->button_show_offline, "clicked",
+ G_CALLBACK (button_show_offline_clicked_cb), self);
+ g_signal_connect (self->priv->button_add_contact, "clicked",
+ G_CALLBACK (button_add_contact_clicked_cb), self);
}
GtkWidget *
diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui
index 06f582672..25156d5fc 100644
--- a/src/empathy-roster-window.ui
+++ b/src/empathy-roster-window.ui
@@ -191,6 +191,58 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkButton" id="button_show_offline">
+ <property name="label" translatable="yes">Show _Offline Contacts</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkButton" id="button_add_contact">
+ <property name="label" translatable="yes">_Add Contact...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">1</property>
diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py
index c7a93d371..a08afee06 100644
--- a/tools/c-constants-gen.py
+++ b/tools/c-constants-gen.py
@@ -3,7 +3,7 @@
from sys import argv, stdout, stderr
import xml.dom.minidom
-from libtpcodegen import file_set_contents
+from libtpcodegen import file_set_contents, u
from libglibcodegen import NS_TP, get_docstring, \
get_descendant_text, get_by_path
@@ -12,7 +12,7 @@ class Generator(object):
self.prefix = prefix + '_'
self.spec = get_by_path(dom, "spec")[0]
- self.output_base = output_base
+ self.output_base = output_base
self.__header = []
self.__docs = []
@@ -21,14 +21,14 @@ class Generator(object):
self.do_body()
self.do_footer()
- file_set_contents(self.output_base + '.h', ''.join(self.__header))
- file_set_contents(self.output_base + '-gtk-doc.h', ''.join(self.__docs))
+ file_set_contents(self.output_base + '.h', u('').join(self.__header).encode('utf-8'))
+ file_set_contents(self.output_base + '-gtk-doc.h', u('').join(self.__docs).encode('utf-8'))
def write(self, code):
- self.__header.append(code.encode('utf-8'))
+ self.__header.append(code)
def d(self, code):
- self.__docs.append(code.encode('utf-8'))
+ self.__docs.append(code)
# Header
def do_header(self):
diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
index f8465a62b..e68e1a575 100644
--- a/tools/glib-client-gen.py
+++ b/tools/glib-client-gen.py
@@ -27,8 +27,8 @@ import os.path
import xml.dom.minidom
from getopt import gnu_getopt
-from libtpcodegen import file_set_contents
-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
+from libtpcodegen import file_set_contents, key_by_name, u
+from libglibcodegen import Signature, type_to_gtype, \
get_docstring, xml_escape, get_deprecated
@@ -74,18 +74,12 @@ class Generator(object):
self.guard = opts.get('--guard', None)
def h(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__header.append(s)
def b(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__body.append(s)
def d(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__docs.append(s)
def get_iface_quark(self):
@@ -1191,7 +1185,7 @@ class Generator(object):
self.b('')
nodes = self.dom.getElementsByTagName('node')
- nodes.sort(cmp_by_name)
+ nodes.sort(key=key_by_name)
for node in nodes:
self.do_interface(node)
@@ -1244,9 +1238,9 @@ class Generator(object):
self.h('#endif /* defined (%s) */' % self.guard)
self.h('')
- file_set_contents(self.basename + '.h', '\n'.join(self.__header))
- file_set_contents(self.basename + '-body.h', '\n'.join(self.__body))
- file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
+ file_set_contents(self.basename + '.h', u('\n').join(self.__header).encode('utf-8'))
+ file_set_contents(self.basename + '-body.h', u('\n').join(self.__body).encode('utf-8'))
+ file_set_contents(self.basename + '-gtk-doc.h', u('\n').join(self.__docs).encode('utf-8'))
def types_to_gtypes(types):
return [type_to_gtype(t)[1] for t in types]
diff --git a/tools/glib-client-marshaller-gen.py b/tools/glib-client-marshaller-gen.py
index cb27d638a..cd9823bdf 100644
--- a/tools/glib-client-marshaller-gen.py
+++ b/tools/glib-client-marshaller-gen.py
@@ -31,23 +31,23 @@ class Generator(object):
for signal in signals:
self.do_signal(signal)
- print 'void'
- print '%s_register_dbus_glib_marshallers (void)' % self.prefix
- print '{'
+ print('void')
+ print('%s_register_dbus_glib_marshallers (void)' % self.prefix)
+ print('{')
- all = self.marshallers.keys()
+ all = list(self.marshallers.keys())
all.sort()
for marshaller in all:
rhs = self.marshallers[marshaller]
- print ' dbus_g_object_register_marshaller ('
- print ' g_cclosure_marshal_generic,'
- print ' G_TYPE_NONE, /* return */'
+ print(' dbus_g_object_register_marshaller (')
+ print(' g_cclosure_marshal_generic,')
+ print(' G_TYPE_NONE, /* return */')
for type in rhs:
- print ' G_TYPE_%s,' % type.replace('VOID', 'NONE')
- print ' G_TYPE_INVALID);'
+ print(' G_TYPE_%s,' % type.replace('VOID', 'NONE'))
+ print(' G_TYPE_INVALID);')
- print '}'
+ print('}')
def types_to_gtypes(types):
diff --git a/tools/glib-errors-check-gen.py b/tools/glib-errors-check-gen.py
index 553fc9caf..fad261ece 100644
--- a/tools/glib-errors-check-gen.py
+++ b/tools/glib-errors-check-gen.py
@@ -12,13 +12,13 @@ class Generator(object):
def __call__(self):
- print '{'
- print ' GEnumClass *klass;'
- print ' GEnumValue *value_by_name;'
- print ' GEnumValue *value_by_nick;'
- print ''
- print ' g_type_init ();'
- print ' klass = g_type_class_ref (TP_TYPE_ERROR);'
+ print('{')
+ print(' GEnumClass *klass;')
+ print(' GEnumValue *value_by_name;')
+ print(' GEnumValue *value_by_nick;')
+ print('')
+ print(' g_type_init ();')
+ print(' klass = g_type_class_ref (TP_TYPE_ERROR);')
for error in self.errors.getElementsByTagNameNS(NS_TP, 'error'):
ns = error.parentNode.getAttribute('namespace')
@@ -28,30 +28,30 @@ class Generator(object):
s = ('TP_ERROR_STR_' +
error.getAttribute('name').replace(' ', '_').replace('.', '_').upper())
- print ''
- print ' /* %s.%s */' % (ns, nick)
- print (' value_by_name = g_enum_get_value_by_name (klass, "%s");'
- % enum)
- print (' value_by_nick = g_enum_get_value_by_nick (klass, "%s");'
- % nick)
- print (' g_assert (value_by_name != NULL);')
- print (' g_assert (value_by_nick != NULL);')
- print (' g_assert_cmpint (value_by_name->value, ==, %s);'
- % enum)
- print (' g_assert_cmpint (value_by_nick->value, ==, %s);'
- % enum)
- print (' g_assert_cmpstr (value_by_name->value_name, ==, "%s");'
- % enum)
- print (' g_assert_cmpstr (value_by_nick->value_name, ==, "%s");'
- % enum)
- print (' g_assert_cmpstr (value_by_name->value_nick, ==, "%s");'
- % nick)
- print (' g_assert_cmpstr (value_by_nick->value_nick, ==, "%s");'
- % nick)
- print (' g_assert_cmpstr (%s, ==, TP_ERROR_PREFIX ".%s");'
- % (s, nick))
-
- print '}'
+ print('')
+ print(' /* %s.%s */' % (ns, nick))
+ print(' value_by_name = g_enum_get_value_by_name (klass, "%s");'
+ % enum)
+ print(' value_by_nick = g_enum_get_value_by_nick (klass, "%s");'
+ % nick)
+ print(' g_assert (value_by_name != NULL);')
+ print(' g_assert (value_by_nick != NULL);')
+ print(' g_assert_cmpint (value_by_name->value, ==, %s);'
+ % enum)
+ print(' g_assert_cmpint (value_by_nick->value, ==, %s);'
+ % enum)
+ print(' g_assert_cmpstr (value_by_name->value_name, ==, "%s");'
+ % enum)
+ print(' g_assert_cmpstr (value_by_nick->value_name, ==, "%s");'
+ % enum)
+ print(' g_assert_cmpstr (value_by_name->value_nick, ==, "%s");'
+ % nick)
+ print(' g_assert_cmpstr (value_by_nick->value_nick, ==, "%s");'
+ % nick)
+ print(' g_assert_cmpstr (%s, ==, TP_ERROR_PREFIX ".%s");'
+ % (s, nick))
+
+ print('}')
if __name__ == '__main__':
argv = sys.argv[1:]
diff --git a/tools/glib-errors-str-gen.py b/tools/glib-errors-str-gen.py
index b2cf520bd..ddb1e16b7 100644
--- a/tools/glib-errors-str-gen.py
+++ b/tools/glib-errors-str-gen.py
@@ -3,7 +3,7 @@
import sys
import xml.dom.minidom
-from libtpcodegen import file_set_contents
+from libtpcodegen import file_set_contents, u
from libglibcodegen import NS_TP, get_docstring, xml_escape
class Generator(object):
@@ -17,18 +17,12 @@ class Generator(object):
self.__docs = []
def h(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__header.append(s)
def b(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__body.append(s)
def d(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__docs.append(s)
def __call__(self):
@@ -72,9 +66,9 @@ class Generator(object):
self.h('')
self.b('')
- file_set_contents(self.basename + '.h', '\n'.join(self.__header))
- file_set_contents(self.basename + '.c', '\n'.join(self.__body))
- file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
+ file_set_contents(self.basename + '.h', u('\n').join(self.__header).encode('utf-8'))
+ file_set_contents(self.basename + '.c', u('\n').join(self.__body).encode('utf-8'))
+ file_set_contents(self.basename + '-gtk-doc.h', u('\n').join(self.__docs).encode('utf-8'))
if __name__ == '__main__':
argv = sys.argv[1:]
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index 6fec0d3c4..c0ce20ddc 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -26,8 +26,8 @@ import sys
import os.path
import xml.dom.minidom
-from libtpcodegen import file_set_contents
-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
+from libtpcodegen import file_set_contents, key_by_name, u
+from libglibcodegen import Signature, type_to_gtype, \
NS_TP, dbus_gutils_wincaps_to_uscore
@@ -85,18 +85,12 @@ class Generator(object):
self.allow_havoc = allow_havoc
def h(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__header.append(s)
def b(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__body.append(s)
def d(self, s):
- if isinstance(s, unicode):
- s = s.encode('utf-8')
self.__docs.append(s)
def do_node(self, node):
@@ -733,7 +727,7 @@ class Generator(object):
def __call__(self):
nodes = self.dom.getElementsByTagName('node')
- nodes.sort(cmp_by_name)
+ nodes.sort(key=key_by_name)
self.h('#include <glib-object.h>')
self.h('#include <dbus/dbus-glib.h>')
@@ -761,12 +755,12 @@ class Generator(object):
self.h('')
self.b('')
- file_set_contents(self.basename + '.h', '\n'.join(self.__header))
- file_set_contents(self.basename + '.c', '\n'.join(self.__body))
- file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
+ file_set_contents(self.basename + '.h', u('\n').join(self.__header).encode('utf-8'))
+ file_set_contents(self.basename + '.c', u('\n').join(self.__body).encode('utf-8'))
+ file_set_contents(self.basename + '-gtk-doc.h', u('\n').join(self.__docs).encode('utf-8'))
def cmdline_error():
- print """\
+ print("""\
usage:
gen-ginterface [OPTIONS] xmlfile Prefix_
options:
@@ -786,7 +780,7 @@ options:
void symbol (DBusGMethodInvocation *context)
and return some sort of "not implemented" error via
dbus_g_method_return_error (context, ...)
-"""
+""")
sys.exit(1)
diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index 21dfc6aa7..1477bd37b 100644
--- a/tools/glib-gtypes-generator.py
+++ b/tools/glib-gtypes-generator.py
@@ -23,7 +23,7 @@
import sys
import xml.dom.minidom
-from libtpcodegen import file_set_contents
+from libtpcodegen import file_set_contents, u
from libglibcodegen import escape_as_identifier, \
get_docstring, \
NS_TP, \
@@ -68,13 +68,13 @@ class GTypesGenerator(object):
self.need_other_arrays = {}
def h(self, code):
- self.header.append(code.encode("utf-8"))
+ self.header.append(code)
def c(self, code):
- self.body.append(code.encode("utf-8"))
+ self.body.append(code)
def d(self, code):
- self.docs.append(code.encode('utf-8'))
+ self.docs.append(code)
def do_mapping_header(self, mapping):
members = mapping.getElementsByTagNameNS(NS_TP, 'member')
@@ -292,9 +292,9 @@ class GTypesGenerator(object):
self.c(' return t;\n')
self.c('}\n\n')
- file_set_contents(self.output + '.h', ''.join(self.header))
- file_set_contents(self.output + '-body.h', ''.join(self.body))
- file_set_contents(self.output + '-gtk-doc.h', ''.join(self.docs))
+ file_set_contents(self.output + '.h', u('').join(self.header).encode('utf-8'))
+ file_set_contents(self.output + '-body.h', u('').join(self.body).encode('utf-8'))
+ file_set_contents(self.output + '-gtk-doc.h', u('').join(self.docs).encode('utf-8'))
if __name__ == '__main__':
argv = sys.argv[1:]
diff --git a/tools/glib-interfaces-gen.py b/tools/glib-interfaces-gen.py
index 410762cde..b67d7b4f0 100644
--- a/tools/glib-interfaces-gen.py
+++ b/tools/glib-interfaces-gen.py
@@ -3,7 +3,7 @@
from sys import argv, stdout, stderr
import xml.dom.minidom
-from libtpcodegen import file_set_contents
+from libtpcodegen import file_set_contents, u
from libglibcodegen import NS_TP, get_docstring, \
get_descendant_text, get_by_path
@@ -24,22 +24,22 @@ class Generator(object):
self.spec = get_by_path(dom, "spec")[0]
def h(self, code):
- self.decls.append(code.encode('utf-8'))
+ self.decls.append(code)
def c(self, code):
- self.impls.append(code.encode('utf-8'))
+ self.impls.append(code)
def d(self, code):
- self.docs.append(code.encode('utf-8'))
+ self.docs.append(code)
def __call__(self):
for f in self.h, self.c:
self.do_header(f)
self.do_body()
- file_set_contents(self.implfile, ''.join(self.impls))
- file_set_contents(self.declfile, ''.join(self.decls))
- file_set_contents(self.docfile, ''.join(self.docs))
+ file_set_contents(self.implfile, u('').join(self.impls).encode('utf-8'))
+ file_set_contents(self.declfile, u('').join(self.decls).encode('utf-8'))
+ file_set_contents(self.docfile, u('').join(self.docs).encode('utf-8'))
# Header
def do_header(self, f):
diff --git a/tools/gobject-foo.py b/tools/gobject-foo.py
index 002a290ba..a2abd7667 100644
--- a/tools/gobject-foo.py
+++ b/tools/gobject-foo.py
@@ -87,4 +87,4 @@ if __name__ == '__main__':
head, tail = argv
- print '\n'.join(gobject_header(head, tail, as_interface=as_interface))
+ print('\n'.join(gobject_header(head, tail, as_interface=as_interface)))
diff --git a/tools/libglibcodegen.py b/tools/libglibcodegen.py
index 6a9d21485..6cd1a6277 100644
--- a/tools/libglibcodegen.py
+++ b/tools/libglibcodegen.py
@@ -154,7 +154,7 @@ def type_to_gtype(s):
return ("GHashTable *", "DBUS_TYPE_G_STRING_STRING_HASHTABLE", "BOXED", False)
elif s[:2] == 'a{': #some arbitrary hash tables
if s[2] not in ('y', 'b', 'n', 'q', 'i', 'u', 's', 'o', 'g'):
- raise Exception, "can't index a hashtable off non-basic type " + s
+ raise Exception("can't index a hashtable off non-basic type " + s)
first = type_to_gtype(s[2])
second = type_to_gtype(s[3:-1])
return ("GHashTable *", "(dbus_g_type_get_map (\"GHashTable\", " + first[1] + ", " + second[1] + "))", "BOXED", False)
@@ -169,4 +169,4 @@ def type_to_gtype(s):
return ("GValueArray *", gtype, "BOXED", True)
# we just don't know ..
- raise Exception, "don't know the GType for " + s
+ raise Exception("don't know the GType for " + s)
diff --git a/tools/libtpcodegen.py b/tools/libtpcodegen.py
index 7e9eb9a50..99de66340 100644
--- a/tools/libtpcodegen.py
+++ b/tools/libtpcodegen.py
@@ -21,6 +21,7 @@ please make any changes there.
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import os
+import sys
from string import ascii_letters, digits
@@ -28,6 +29,20 @@ NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
_ASCII_ALNUM = ascii_letters + digits
+if sys.version_info[0] >= 3:
+ def u(s):
+ """Return s, which must be a str literal with no non-ASCII characters.
+ This is like a more restricted form of the Python 2 u'' syntax.
+ """
+ return s.encode('ascii').decode('ascii')
+else:
+ def u(s):
+ """Return a Unicode version of s, which must be a str literal
+ (a bytestring) in which each byte is an ASCII character.
+ This is like a more restricted form of the u'' syntax.
+ """
+ return s.decode('ascii')
+
def file_set_contents(filename, contents):
try:
os.remove(filename)
@@ -38,13 +53,15 @@ def file_set_contents(filename, contents):
except OSError:
pass
- open(filename + '.tmp', 'w').write(contents)
+ open(filename + '.tmp', 'wb').write(contents)
os.rename(filename + '.tmp', filename)
def cmp_by_name(node1, node2):
return cmp(node1.getAttributeNode("name").nodeValue,
node2.getAttributeNode("name").nodeValue)
+def key_by_name(node):
+ return node.getAttributeNode("name").nodeValue
def escape_as_identifier(identifier):
"""Escape the given string to be a valid D-Bus object path or service
@@ -168,6 +185,9 @@ class _SignatureIter:
self.remaining = string
def next(self):
+ return self.__next__()
+
+ def __next__(self):
if self.remaining == '':
raise StopIteration
diff --git a/tools/make-version-script.py b/tools/make-version-script.py
index 0d30aa323..4ced849fe 100644
--- a/tools/make-version-script.py
+++ b/tools/make-version-script.py
@@ -63,9 +63,9 @@ def main(abifiles, symbols=None, unreleased_version=None,
if dpkg:
assert dpkg_first_line is not None
- print dpkg_first_line
+ print(dpkg_first_line)
if dpkg_build_depends_package is not None:
- print "* Build-Depends-Package: %s" % dpkg_build_depends_package
+ print("* Build-Depends-Package: %s" % dpkg_build_depends_package)
for filename in abifiles:
lines = open(filename, 'r').readlines()
@@ -120,8 +120,8 @@ def main(abifiles, symbols=None, unreleased_version=None,
lines = lines[cut:]
if gnuld:
- print "%s {" % version
- print " global:"
+ print("%s {" % version)
+ print(" global:")
for symbol in lines:
symbol = symbol.strip()
@@ -130,7 +130,7 @@ def main(abifiles, symbols=None, unreleased_version=None,
continue
if gnuld:
- print " %s;" % symbol
+ print(" %s;" % symbol)
elif dpkg:
dpkg_symbols.append('%s@%s %s' % (symbol, version, release))
@@ -142,22 +142,22 @@ def main(abifiles, symbols=None, unreleased_version=None,
if gnuld:
if extends == '-':
- print " local:"
- print " *;"
- print "};"
+ print(" local:")
+ print(" *;")
+ print("};")
else:
- print "} %s;" % extends
- print
+ print("} %s;" % extends)
+ print("")
if dpkg:
dpkg_symbols.sort()
dpkg_versions.sort()
for x in dpkg_versions:
- print " %s" % x
+ print(" %s" % x)
for x in dpkg_symbols:
- print " %s" % x
+ print(" %s" % x)
if symbol_set is not None:
missing = versioned_symbols - symbol_set
@@ -182,13 +182,13 @@ def main(abifiles, symbols=None, unreleased_version=None,
raise SystemExit(1)
if gnuld:
- print "%s {" % unreleased_version
- print " global:"
+ print("%s {" % unreleased_version)
+ print(" global:")
for symbol in unreleased:
- print " %s;" % symbol
+ print(" %s;" % symbol)
- print "} %s;" % version
+ print("} %s;" % version)
if __name__ == '__main__':
diff --git a/tools/xincludator.py b/tools/xincludator.py
index 63e106ace..f9ed49ce4 100644
--- a/tools/xincludator.py
+++ b/tools/xincludator.py
@@ -1,17 +1,19 @@
#!/usr/bin/python
+import sys
from sys import argv, stdout, stderr
import codecs, locale
import os
import xml.dom.minidom
-stdout = codecs.getwriter('utf-8')(stdout)
+if sys.version_info[0] < 3:
+ stdout = codecs.getwriter('utf-8')(stdout)
NS_XI = 'http://www.w3.org/2001/XInclude'
def xincludate(dom, base, dropns = []):
remove_attrs = []
- for i in xrange(dom.documentElement.attributes.length):
+ for i in range(dom.documentElement.attributes.length):
attr = dom.documentElement.attributes.item(i)
if attr.prefix == 'xmlns':
if attr.localName in dropns:
@@ -34,6 +36,11 @@ if __name__ == '__main__':
argv = argv[1:]
dom = xml.dom.minidom.parse(argv[0])
xincludate(dom, argv[0])
- xml = dom.toxml()
+
+ if sys.version_info[0] >= 3:
+ xml = dom.toxml(encoding=None)
+ else:
+ xml = dom.toxml()
+
stdout.write(xml)
stdout.write('\n')
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index 7a5ac57ae..f76c2fa53 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -1,5 +1,3 @@
-# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
-# Do NOT edit manually
plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
INCLUDES = \
@@ -12,175 +10,18 @@ INCLUDES = \
$(DISABLE_DEPRECATED) \
$(EMPATHY_CFLAGS)
-pkglib_LTLIBRARIES = libempathy-uoa-account-plugin.la
+plugin_LTLIBRARIES = libempathy-accounts-plugin.la
-# this API is not stable and will never be, so use -release to make the
-# SONAME of the plugin library change with every Empathy release.
-libempathy_uoa_account_plugin_la_LDFLAGS = \
- -no-undefined \
- -release $(VERSION)
+libempathy_accounts_plugin_la_LDFLAGS = \
+ -module -avoid-version
-libempathy_uoa_account_plugin_la_SOURCES = \
+libempathy_accounts_plugin_la_SOURCES = \
empathy-accounts-plugin.c \
empathy-accounts-plugin.h \
empathy-accounts-plugin-widget.c \
empathy-accounts-plugin-widget.h
-libempathy_uoa_account_plugin_la_LIBADD = \
- $(UOA_LIBS)
-
-plugin_LTLIBRARIES = \
- libaim.la\
- libgadugadu.la\
- libgroupwise.la\
- libicq.la\
- libirc.la\
- libjabber.la\
- libmxit.la\
- libmyspace.la\
- libsip.la\
- liblocal-xmpp.la\
- libsametime.la\
- libyahoojp.la\
- libyahoo.la\
- libzephyr.la \
- $(NULL)
-
-libaim_la_SOURCES = \
- empathy-accounts-plugin-aim.c \
- empathy-accounts-plugin-aim.h
-libaim_la_LDFLAGS = -module -avoid-version
-libaim_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgadugadu_la_SOURCES = \
- empathy-accounts-plugin-gadugadu.c \
- empathy-accounts-plugin-gadugadu.h
-libgadugadu_la_LDFLAGS = -module -avoid-version
-libgadugadu_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgroupwise_la_SOURCES = \
- empathy-accounts-plugin-groupwise.c \
- empathy-accounts-plugin-groupwise.h
-libgroupwise_la_LDFLAGS = -module -avoid-version
-libgroupwise_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libicq_la_SOURCES = \
- empathy-accounts-plugin-icq.c \
- empathy-accounts-plugin-icq.h
-libicq_la_LDFLAGS = -module -avoid-version
-libicq_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libirc_la_SOURCES = \
- empathy-accounts-plugin-irc.c \
- empathy-accounts-plugin-irc.h
-libirc_la_LDFLAGS = -module -avoid-version
-libirc_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libjabber_la_SOURCES = \
- empathy-accounts-plugin-jabber.c \
- empathy-accounts-plugin-jabber.h
-libjabber_la_LDFLAGS = -module -avoid-version
-libjabber_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmxit_la_SOURCES = \
- empathy-accounts-plugin-mxit.c \
- empathy-accounts-plugin-mxit.h
-libmxit_la_LDFLAGS = -module -avoid-version
-libmxit_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmyspace_la_SOURCES = \
- empathy-accounts-plugin-myspace.c \
- empathy-accounts-plugin-myspace.h
-libmyspace_la_LDFLAGS = -module -avoid-version
-libmyspace_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsip_la_SOURCES = \
- empathy-accounts-plugin-sip.c \
- empathy-accounts-plugin-sip.h
-libsip_la_LDFLAGS = -module -avoid-version
-libsip_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-liblocal_xmpp_la_SOURCES = \
- empathy-accounts-plugin-local-xmpp.c \
- empathy-accounts-plugin-local-xmpp.h
-liblocal_xmpp_la_LDFLAGS = -module -avoid-version
-liblocal_xmpp_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsametime_la_SOURCES = \
- empathy-accounts-plugin-sametime.c \
- empathy-accounts-plugin-sametime.h
-libsametime_la_LDFLAGS = -module -avoid-version
-libsametime_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoojp_la_SOURCES = \
- empathy-accounts-plugin-yahoojp.c \
- empathy-accounts-plugin-yahoojp.h
-libyahoojp_la_LDFLAGS = -module -avoid-version
-libyahoojp_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoo_la_SOURCES = \
- empathy-accounts-plugin-yahoo.c \
- empathy-accounts-plugin-yahoo.h
-libyahoo_la_LDFLAGS = -module -avoid-version
-libyahoo_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libzephyr_la_SOURCES = \
- empathy-accounts-plugin-zephyr.c \
- empathy-accounts-plugin-zephyr.h
-libzephyr_la_LDFLAGS = -module -avoid-version
-libzephyr_la_LIBADD = \
- libempathy-uoa-account-plugin.la \
+libempathy_accounts_plugin_la_LIBADD = \
+ $(UOA_LIBS) \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
deleted file mode 100644
index 426547448..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-aim.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-aim.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginAim, empathy_accounts_plugin_aim,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_aim_class_init (
- EmpathyAccountsPluginAimClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_aim_init (EmpathyAccountsPluginAim *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
deleted file mode 100644
index a9e072deb..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-aim.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginAim EmpathyAccountsPluginAim;
-typedef struct _EmpathyAccountsPluginAimClass EmpathyAccountsPluginAimClass;
-
-struct _EmpathyAccountsPluginAimClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginAim
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_aim_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM \
- (empathy_accounts_plugin_aim_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
- EmpathyAccountsPluginAim))
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
- EmpathyAccountsPluginAimClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_AIM(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_AIM_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM))
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
- EmpathyAccountsPluginAimClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
deleted file mode 100644
index 2cd60222f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-gadugadu.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-gadugadu.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginGadugadu, empathy_accounts_plugin_gadugadu,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_gadugadu_class_init (
- EmpathyAccountsPluginGadugaduClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_gadugadu_init (EmpathyAccountsPluginGadugadu *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
deleted file mode 100644
index 1a0956e65..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-gadugadu.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginGadugadu EmpathyAccountsPluginGadugadu;
-typedef struct _EmpathyAccountsPluginGadugaduClass EmpathyAccountsPluginGadugaduClass;
-
-struct _EmpathyAccountsPluginGadugaduClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginGadugadu
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_gadugadu_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU \
- (empathy_accounts_plugin_gadugadu_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
- EmpathyAccountsPluginGadugadu))
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
- EmpathyAccountsPluginGadugaduClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GADUGADU(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GADUGADU_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU))
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
- EmpathyAccountsPluginGadugaduClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
deleted file mode 100644
index ddcef5a2c..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-groupwise.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-groupwise.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginGroupwise, empathy_accounts_plugin_groupwise,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_groupwise_class_init (
- EmpathyAccountsPluginGroupwiseClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_groupwise_init (EmpathyAccountsPluginGroupwise *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
deleted file mode 100644
index 00a75377a..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-groupwise.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginGroupwise EmpathyAccountsPluginGroupwise;
-typedef struct _EmpathyAccountsPluginGroupwiseClass EmpathyAccountsPluginGroupwiseClass;
-
-struct _EmpathyAccountsPluginGroupwiseClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginGroupwise
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_groupwise_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE \
- (empathy_accounts_plugin_groupwise_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
- EmpathyAccountsPluginGroupwise))
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
- EmpathyAccountsPluginGroupwiseClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GROUPWISE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GROUPWISE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE))
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
- EmpathyAccountsPluginGroupwiseClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
deleted file mode 100644
index 0f6aa3874..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-icq.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-icq.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginIcq, empathy_accounts_plugin_icq,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_icq_class_init (
- EmpathyAccountsPluginIcqClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_icq_init (EmpathyAccountsPluginIcq *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
deleted file mode 100644
index b3a5e82a6..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-icq.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginIcq EmpathyAccountsPluginIcq;
-typedef struct _EmpathyAccountsPluginIcqClass EmpathyAccountsPluginIcqClass;
-
-struct _EmpathyAccountsPluginIcqClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginIcq
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_icq_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ \
- (empathy_accounts_plugin_icq_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
- EmpathyAccountsPluginIcq))
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
- EmpathyAccountsPluginIcqClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ICQ(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ICQ_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ))
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
- EmpathyAccountsPluginIcqClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
deleted file mode 100644
index 53c243236..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-irc.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-irc.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginIrc, empathy_accounts_plugin_irc,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_irc_class_init (
- EmpathyAccountsPluginIrcClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_irc_init (EmpathyAccountsPluginIrc *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
deleted file mode 100644
index b3a9a629b..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-irc.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginIrc EmpathyAccountsPluginIrc;
-typedef struct _EmpathyAccountsPluginIrcClass EmpathyAccountsPluginIrcClass;
-
-struct _EmpathyAccountsPluginIrcClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginIrc
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_irc_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC \
- (empathy_accounts_plugin_irc_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
- EmpathyAccountsPluginIrc))
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
- EmpathyAccountsPluginIrcClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_IRC(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_IRC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC))
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
- EmpathyAccountsPluginIrcClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
deleted file mode 100644
index fffe98364..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-jabber.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-jabber.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginJabber, empathy_accounts_plugin_jabber,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_jabber_class_init (
- EmpathyAccountsPluginJabberClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_jabber_init (EmpathyAccountsPluginJabber *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
deleted file mode 100644
index c6e67f873..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-jabber.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginJabber EmpathyAccountsPluginJabber;
-typedef struct _EmpathyAccountsPluginJabberClass EmpathyAccountsPluginJabberClass;
-
-struct _EmpathyAccountsPluginJabberClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginJabber
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_jabber_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER \
- (empathy_accounts_plugin_jabber_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
- EmpathyAccountsPluginJabber))
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
- EmpathyAccountsPluginJabberClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_JABBER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_JABBER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER))
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
- EmpathyAccountsPluginJabberClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
deleted file mode 100644
index f46741a5c..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-local-xmpp.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-local-xmpp.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginLocalXmpp, empathy_accounts_plugin_local_xmpp,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_local_xmpp_class_init (
- EmpathyAccountsPluginLocalXmppClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_local_xmpp_init (EmpathyAccountsPluginLocalXmpp *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
deleted file mode 100644
index 8c5d56f18..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-local-xmpp.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginLocalXmpp EmpathyAccountsPluginLocalXmpp;
-typedef struct _EmpathyAccountsPluginLocalXmppClass EmpathyAccountsPluginLocalXmppClass;
-
-struct _EmpathyAccountsPluginLocalXmppClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginLocalXmpp
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_local_xmpp_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP \
- (empathy_accounts_plugin_local_xmpp_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
- EmpathyAccountsPluginLocalXmpp))
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
- EmpathyAccountsPluginLocalXmppClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_LOCAL_XMPP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_LOCAL_XMPP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP))
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
- EmpathyAccountsPluginLocalXmppClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
deleted file mode 100644
index 95fdc2fa7..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-mxit.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-mxit.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginMxit, empathy_accounts_plugin_mxit,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_mxit_class_init (
- EmpathyAccountsPluginMxitClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_mxit_init (EmpathyAccountsPluginMxit *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
deleted file mode 100644
index 5a80c2c73..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-mxit.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginMxit EmpathyAccountsPluginMxit;
-typedef struct _EmpathyAccountsPluginMxitClass EmpathyAccountsPluginMxitClass;
-
-struct _EmpathyAccountsPluginMxitClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginMxit
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_mxit_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT \
- (empathy_accounts_plugin_mxit_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
- EmpathyAccountsPluginMxit))
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
- EmpathyAccountsPluginMxitClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MXIT(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MXIT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT))
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
- EmpathyAccountsPluginMxitClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
deleted file mode 100644
index 5b848e200..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-myspace.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-myspace.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginMyspace, empathy_accounts_plugin_myspace,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_myspace_class_init (
- EmpathyAccountsPluginMyspaceClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_myspace_init (EmpathyAccountsPluginMyspace *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
deleted file mode 100644
index a6785a86f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-myspace.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginMyspace EmpathyAccountsPluginMyspace;
-typedef struct _EmpathyAccountsPluginMyspaceClass EmpathyAccountsPluginMyspaceClass;
-
-struct _EmpathyAccountsPluginMyspaceClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginMyspace
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_myspace_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE \
- (empathy_accounts_plugin_myspace_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
- EmpathyAccountsPluginMyspace))
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
- EmpathyAccountsPluginMyspaceClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MYSPACE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MYSPACE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE))
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
- EmpathyAccountsPluginMyspaceClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
deleted file mode 100644
index e33593421..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sametime.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-sametime.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginSametime, empathy_accounts_plugin_sametime,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_sametime_class_init (
- EmpathyAccountsPluginSametimeClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_sametime_init (EmpathyAccountsPluginSametime *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
deleted file mode 100644
index 639ec15e2..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sametime.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginSametime EmpathyAccountsPluginSametime;
-typedef struct _EmpathyAccountsPluginSametimeClass EmpathyAccountsPluginSametimeClass;
-
-struct _EmpathyAccountsPluginSametimeClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginSametime
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_sametime_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME \
- (empathy_accounts_plugin_sametime_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
- EmpathyAccountsPluginSametime))
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
- EmpathyAccountsPluginSametimeClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SAMETIME(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SAMETIME_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME))
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
- EmpathyAccountsPluginSametimeClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
deleted file mode 100644
index 483f1b3ce..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sip.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-sip.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginSip, empathy_accounts_plugin_sip,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_sip_class_init (
- EmpathyAccountsPluginSipClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_sip_init (EmpathyAccountsPluginSip *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
deleted file mode 100644
index e581f7809..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sip.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginSip EmpathyAccountsPluginSip;
-typedef struct _EmpathyAccountsPluginSipClass EmpathyAccountsPluginSipClass;
-
-struct _EmpathyAccountsPluginSipClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginSip
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_sip_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP \
- (empathy_accounts_plugin_sip_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
- EmpathyAccountsPluginSip))
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
- EmpathyAccountsPluginSipClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SIP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SIP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP))
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
- EmpathyAccountsPluginSipClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index 34729960c..28b4716ab 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -102,7 +102,7 @@ create_account_settings (AgAccount *account)
AgService *service;
GList *services;
AgAccountService *account_service;
- GValue v = G_VALUE_INIT;
+ GVariant *v;
gchar *manager = NULL, *protocol = NULL;
EmpathyAccountSettings *settings;
@@ -114,17 +114,15 @@ create_account_settings (AgAccount *account)
account_service = ag_account_service_new (account, service);
- g_value_init (&v, G_TYPE_STRING);
- if (ag_account_service_get_value (account_service,
- "telepathy/manager", &v) != AG_SETTING_SOURCE_NONE)
- manager = g_value_dup_string (&v);
- g_value_unset (&v);
-
- g_value_init (&v, G_TYPE_STRING);
- if (ag_account_service_get_value (account_service,
- "telepathy/protocol", &v) != AG_SETTING_SOURCE_NONE)
- protocol = g_value_dup_string (&v);
- g_value_unset (&v);
+ v = ag_account_service_get_variant (account_service,
+ "telepathy/manager", NULL);
+ if (v != NULL)
+ manager = g_variant_dup_string (v, NULL);
+
+ v = ag_account_service_get_variant (account_service,
+ "telepathy/protocol", NULL);
+ if (v != NULL)
+ protocol = g_variant_dup_string (v, NULL);
g_return_val_if_fail (manager != NULL, NULL);
g_return_val_if_fail (protocol != NULL, NULL);
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
deleted file mode 100644
index 8461bed0b..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoo.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-yahoo.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginYahoo, empathy_accounts_plugin_yahoo,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_yahoo_class_init (
- EmpathyAccountsPluginYahooClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_yahoo_init (EmpathyAccountsPluginYahoo *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
deleted file mode 100644
index 2f02c4a30..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoo.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginYahoo EmpathyAccountsPluginYahoo;
-typedef struct _EmpathyAccountsPluginYahooClass EmpathyAccountsPluginYahooClass;
-
-struct _EmpathyAccountsPluginYahooClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginYahoo
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_yahoo_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO \
- (empathy_accounts_plugin_yahoo_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
- EmpathyAccountsPluginYahoo))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
- EmpathyAccountsPluginYahooClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOO(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOO_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
- EmpathyAccountsPluginYahooClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
deleted file mode 100644
index 12e771b1f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoojp.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-yahoojp.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginYahoojp, empathy_accounts_plugin_yahoojp,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_yahoojp_class_init (
- EmpathyAccountsPluginYahoojpClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_yahoojp_init (EmpathyAccountsPluginYahoojp *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
deleted file mode 100644
index c57634a75..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoojp.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginYahoojp EmpathyAccountsPluginYahoojp;
-typedef struct _EmpathyAccountsPluginYahoojpClass EmpathyAccountsPluginYahoojpClass;
-
-struct _EmpathyAccountsPluginYahoojpClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginYahoojp
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_yahoojp_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP \
- (empathy_accounts_plugin_yahoojp_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
- EmpathyAccountsPluginYahoojp))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
- EmpathyAccountsPluginYahoojpClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOOJP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOOJP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
- EmpathyAccountsPluginYahoojpClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
deleted file mode 100644
index e3d0b4ed3..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-zephyr.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-zephyr.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginZephyr, empathy_accounts_plugin_zephyr,\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_zephyr_class_init (
- EmpathyAccountsPluginZephyrClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_zephyr_init (EmpathyAccountsPluginZephyr *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR;
-} \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
deleted file mode 100644
index 90bd4c764..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-zephyr.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginZephyr EmpathyAccountsPluginZephyr;
-typedef struct _EmpathyAccountsPluginZephyrClass EmpathyAccountsPluginZephyrClass;
-
-struct _EmpathyAccountsPluginZephyrClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginZephyr
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_zephyr_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR \
- (empathy_accounts_plugin_zephyr_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
- EmpathyAccountsPluginZephyr))
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
- EmpathyAccountsPluginZephyrClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ZEPHYR(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ZEPHYR_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR))
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
- EmpathyAccountsPluginZephyrClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__*/ \ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 46e429e43..939912aad 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
@@ -123,3 +123,9 @@ empathy_accounts_plugin_init (EmpathyAccountsPlugin *self)
}
}
+
+GType
+ap_module_get_object_type (void)
+{
+ return EMPATHY_TYPE_ACCOUNTS_PLUGIN;
+}
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
index bb259c8a1..8f3102596 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
@@ -64,6 +64,8 @@ GType empathy_accounts_plugin_get_type (void);
EMPATHY_TYPE_ACCOUNTS_PLUGIN, \
EmpathyAccountsPluginClass))
+GType ap_module_get_object_type (void);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_H__*/
diff --git a/ubuntu-online-accounts/cc-plugins/generate-plugins.py b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
index a5acab488..2845d3632 100755
--- a/ubuntu-online-accounts/cc-plugins/generate-plugins.py
+++ b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
@@ -25,228 +25,6 @@ class Plugin:
self.protocol = protocol
self.icon = icon
-##### account-plugins/ #####
-
-def magic_replace(text, protocol):
- p = protocol.replace('-', '_')
-
- l = protocol.split('-')
- l = map(str.title, l)
- camel = ''.join(l)
-
- text = text.replace('$lower', p)
- text = text.replace('$UPPER', p.upper())
- text = text.replace('$Camel', camel)
-
- return text
-
-def generate_plugin_header(p):
- # header
- f = open('account-plugins/empathy-accounts-plugin-%s.h' % p.protocol, 'w')
-
- tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-%s.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPlugin$Camel EmpathyAccountsPlugin$Camel;
-typedef struct _EmpathyAccountsPlugin$CamelClass EmpathyAccountsPlugin$CamelClass;
-
-struct _EmpathyAccountsPlugin$CamelClass
-{
- /*<private>*/
- EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPlugin$Camel
-{
- /*<private>*/
- EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_$lower_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER \\
- (empathy_accounts_plugin_$lower_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER(obj) \\
- (G_TYPE_CHECK_INSTANCE_CAST((obj), \\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
- EmpathyAccountsPlugin$Camel))
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER_CLASS(klass) \\
- (G_TYPE_CHECK_CLASS_CAST((klass), \\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
- EmpathyAccountsPlugin$CamelClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_$UPPER(obj) \\
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), \\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_$UPPER_CLASS(klass) \\
- (G_TYPE_CHECK_CLASS_TYPE((klass), \\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER))
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER_GET_CLASS(obj) \\
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
- EmpathyAccountsPlugin$CamelClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__*/''' % (p.protocol)
-
- f.write(magic_replace (tmp, p.protocol))
-
-def generate_plugin_code(p):
- # header
- f = open('account-plugins/empathy-accounts-plugin-%s.c' % p.protocol, 'w')
-
- tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-%s.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "empathy-accounts-plugin-%s.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPlugin$Camel, empathy_accounts_plugin_$lower,\\
- EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_$lower_class_init (
- EmpathyAccountsPlugin$CamelClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_$lower_init (EmpathyAccountsPlugin$Camel *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
- return EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER;
-}''' % (p.protocol, p.protocol)
-
- f.write(magic_replace (tmp, p.protocol))
-
-def generate_build_block(p):
- la = 'lib%s_la' % p.protocol.replace('-', '_')
-
- output = '''%s_SOURCES = \\
- empathy-accounts-plugin-%s.c \\
- empathy-accounts-plugin-%s.h
-%s_LDFLAGS = -module -avoid-version
-%s_LIBADD = \\
- libempathy-uoa-account-plugin.la \\
- $(top_builddir)/libempathy/libempathy.la \\
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la
-''' % (la, p.protocol, p.protocol, la, la)
-
- return output
-
-
-def generate_account_plugins(plugins):
- '''account-plugins/'''
- libs = []
- build_blocks = []
-
- for p in plugins:
- # empathy-accounts-plugin-$protocol.[ch]'''
- generate_plugin_header(p)
- generate_plugin_code(p)
-
- name = ' lib%s.la' % p.protocol
- libs.append(name)
-
- build_blocks.append(generate_build_block(p))
-
- # Makefile.am
- f = open('account-plugins/Makefile.am', 'w')
-
- f.write(
-'''# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
-# Do NOT edit manually
-plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
-
-INCLUDES = \\
- -I$(top_builddir) \\
- -I$(top_srcdir) \\
- -DLOCALEDIR=\\""$(datadir)/locale"\\" \\
- $(UOA_CFLAGS) \\
- $(WARN_CFLAGS) \\
- $(ERROR_CFLAGS) \\
- $(DISABLE_DEPRECATED) \\
- $(EMPATHY_CFLAGS)
-
-pkglib_LTLIBRARIES = libempathy-uoa-account-plugin.la
-
-# this API is not stable and will never be, so use -release to make the
-# SONAME of the plugin library change with every Empathy release.
-libempathy_uoa_account_plugin_la_LDFLAGS = \\
- -no-undefined \\
- -release $(VERSION)
-
-libempathy_uoa_account_plugin_la_SOURCES = \\
- empathy-accounts-plugin.c \\
- empathy-accounts-plugin.h \\
- empathy-accounts-plugin-widget.c \\
- empathy-accounts-plugin-widget.h
-
-libempathy_uoa_account_plugin_la_LIBADD = \\
- $(UOA_LIBS)
-
-plugin_LTLIBRARIES = \\
-%s \\
- $(NULL)
-
-%s''' % ('\\\n'.join(libs), '\n\n'.join(build_blocks)))
-
##### providers/ #####
def generate_provider_file(p):
@@ -259,6 +37,7 @@ def generate_provider_file(p):
<provider id="%s">
<name>%s</name>
<icon>%s</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
''' % (p.protocol, p.name, p.icon))
@@ -344,7 +123,6 @@ def generate_all():
for name, cm, protocol, icon in ALL:
plugins.append(Plugin(name, cm, protocol, icon))
- generate_account_plugins(plugins)
generate_providers(plugins)
generate_services(plugins)
diff --git a/ubuntu-online-accounts/cc-plugins/providers/aim.provider b/ubuntu-online-accounts/cc-plugins/providers/aim.provider
index f309431a2..7a7a0ff1f 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/aim.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/aim.provider
@@ -4,4 +4,5 @@
<provider id="aim">
<name>AIM</name>
<icon>aim</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider b/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
index 8da98e701..3f65c53dc 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
@@ -4,4 +4,5 @@
<provider id="gadugadu">
<name>GaduGadu</name>
<icon>gadugadu</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider b/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
index 368988da9..284a56554 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
@@ -4,4 +4,5 @@
<provider id="groupwise">
<name>Groupwise</name>
<icon>groupwise</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/icq.provider b/ubuntu-online-accounts/cc-plugins/providers/icq.provider
index a225aa47f..31c81f1c9 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/icq.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/icq.provider
@@ -4,4 +4,5 @@
<provider id="icq">
<name>ICQ</name>
<icon>icq</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/irc.provider b/ubuntu-online-accounts/cc-plugins/providers/irc.provider
index ab40288a4..29d434215 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/irc.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/irc.provider
@@ -4,4 +4,5 @@
<provider id="irc">
<name>IRC</name>
<icon>irc</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/jabber.provider b/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
index ff553d245..83e9dd7ef 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
@@ -4,4 +4,5 @@
<provider id="jabber">
<name>Jabber</name>
<icon>jabber</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider b/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
index 45f1b3c37..23c5a64f0 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
@@ -4,4 +4,5 @@
<provider id="local-xmpp">
<name>Salut</name>
<icon>people-nearby</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/mxit.provider b/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
index 4fd3b8c7c..5cc990d45 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
@@ -4,4 +4,5 @@
<provider id="mxit">
<name>Mxit</name>
<icon>mxit</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/myspace.provider b/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
index d6edad44d..9c4b75594 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
@@ -4,4 +4,5 @@
<provider id="myspace">
<name>Myspace</name>
<icon>myspace</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/sametime.provider b/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
index b8e3b206c..dd7235cd9 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
@@ -4,4 +4,5 @@
<provider id="sametime">
<name>Sametime</name>
<icon>sametime</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/sip.provider b/ubuntu-online-accounts/cc-plugins/providers/sip.provider
index 15a62b552..eeb874057 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/sip.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/sip.provider
@@ -4,4 +4,5 @@
<provider id="sip">
<name>SIP</name>
<icon>sip</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider b/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
index f962e030f..0af592c45 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
@@ -4,4 +4,5 @@
<provider id="yahoo">
<name>Yahoo!</name>
<icon>yahoo</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider b/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
index b83ec8e1f..4fd8e690c 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
@@ -4,4 +4,5 @@
<provider id="yahoojp">
<name>Yahoo Japan</name>
<icon>yahoo</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider b/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
index 6e21f11a6..2f716cbd4 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
@@ -4,4 +4,5 @@
<provider id="zephyr">
<name>Zephyr</name>
<icon>zephyr</icon>
+ <plugin>empathy-accounts-plugin</plugin>
</provider>
diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
index 304e4f38a..8919065ef 100644
--- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
+++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
@@ -86,15 +86,14 @@ _service_dup_tp_value (AgAccountService *service,
const gchar *key)
{
gchar *real_key = g_strdup_printf (KEY_PREFIX "%s", key);
- GValue value = { 0, };
- gchar *ret;
+ GVariant *value;
- g_value_init (&value, G_TYPE_STRING);
- ag_account_service_get_value (service, real_key, &value);
- ret = g_value_dup_string (&value);
- g_value_unset (&value);
+ value = ag_account_service_get_variant (service, real_key, NULL);
+ g_free (real_key);
+ if (value == NULL)
+ return NULL;
- return ret;
+ return g_variant_dup_string (value, NULL);
}
static void
@@ -106,18 +105,14 @@ _service_set_tp_value (AgAccountService *service,
if (value != NULL)
{
- GValue gvalue = { 0, };
-
- g_value_init (&gvalue, G_TYPE_STRING);
- g_value_set_string (&gvalue, value);
- ag_account_service_set_value (service, real_key, &gvalue);
- g_value_unset (&gvalue);
- g_free (real_key);
+ GVariant *gvariant = g_variant_new_string (value);
+ ag_account_service_set_variant (service, real_key, gvariant);
}
else
{
- ag_account_service_set_value (service, real_key, NULL);
+ ag_account_service_set_variant (service, real_key, NULL);
}
+ g_free (real_key);
}
/* Returns NULL if the account never has been imported into MC before */
@@ -171,15 +166,20 @@ _service_changed_cb (AgAccountService *service,
}
static void
-_account_stored_cb (AgAccount *account,
- const GError *error,
+_account_stored_cb (GObject *source_object,
+ GAsyncResult *res,
gpointer user_data)
{
- if (error != NULL)
+ AgAccount *account = AG_ACCOUNT(source_object);
+ GError *error = NULL;
+
+ if (!ag_account_store_finish (account, res, &error))
{
+ g_assert (error != NULL);
DEBUG ("Error storing UOA account '%s': %s",
ag_account_get_display_name (account),
error->message);
+ g_error_free (error);
}
}
@@ -261,7 +261,7 @@ _account_created_cb (AgManager *manager,
cm_name, protocol_name, params);
_service_set_tp_account_name (service, account_name);
- ag_account_store (account, _account_stored_cb, self);
+ ag_account_store_async (account, NULL, _account_stored_cb, self);
g_hash_table_unref (params);
}
@@ -479,16 +479,16 @@ account_manager_uoa_get (const McpAccountStorage *storage,
{
AgAccountSettingIter iter;
const gchar *k;
- const GValue *v;
+ GVariant *v;
ag_account_service_settings_iter_init (service, &iter, KEY_PREFIX);
- while (ag_account_service_settings_iter_next (&iter, &k, &v))
+ while (ag_account_settings_iter_get_next (&iter, &k, &v))
{
- if (!G_VALUE_HOLDS_STRING (v))
+ if (!g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
continue;
mcp_account_manager_set_value (am, account_name,
- k, g_value_get_string (v));
+ k, g_variant_get_string (v, NULL));
}
}
@@ -676,7 +676,7 @@ account_manager_uoa_commit (const McpAccountStorage *storage,
AgAccountService *service = value;
AgAccount *account = ag_account_service_get_account (service);
- ag_account_store (account, _account_stored_cb, self);
+ ag_account_store_async (account, NULL, _account_stored_cb, self);
}
return TRUE;
@@ -781,7 +781,7 @@ account_manager_uoa_get_restrictions (const McpAccountStorage *storage,
McpAccountManagerUoa *self = (McpAccountManagerUoa *) storage;
AgAccountService *service;
guint restrictions = TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE;
- GValue value = G_VALUE_INIT;
+ GVariant *value;
g_return_val_if_fail (self->priv->manager != NULL, 0);
@@ -790,15 +790,12 @@ account_manager_uoa_get_restrictions (const McpAccountStorage *storage,
if (service == NULL)
return G_MAXUINT;
- g_value_init (&value, G_TYPE_BOOLEAN);
- ag_account_service_get_value (service,
- KEY_PREFIX KEY_READONLY_PARAMS, &value);
+ value = ag_account_service_get_variant (service,
+ KEY_PREFIX KEY_READONLY_PARAMS, NULL);
- if (g_value_get_boolean (&value))
+ if (value != NULL && g_variant_get_boolean (value))
restrictions |= TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS;
- g_value_unset (&value);
-
/* FIXME: We can't set Icon either, but there is no flag for that */
return restrictions;
}