aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--NEWS101
-rw-r--r--configure.ac78
-rw-r--r--data/empathy-log-window.html2
-rw-r--r--data/org.gnome.Empathy.gschema.xml.in18
-rw-r--r--help/.gitignore36
-rw-r--r--help/Makefile.am2
-rw-r--r--help/eu/eu.po3527
-rw-r--r--help/eu/figures/empathy-main-window.pngbin0 -> 10261 bytes
-rw-r--r--help/gl/gl.po4275
-rw-r--r--help/sl/sl.po220
-rw-r--r--help/zh_CN/zh_CN.po816
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--libempathy-gtk/empathy-account-widget.c6
-rw-r--r--libempathy-gtk/empathy-call-utils.c31
-rw-r--r--libempathy-gtk/empathy-call-utils.h4
-rw-r--r--libempathy-gtk/empathy-chat-text-view.c2
-rw-r--r--libempathy-gtk/empathy-chat.c54
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.c12
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.ui23
-rw-r--r--libempathy-gtk/empathy-contact-chooser.c364
-rw-r--r--libempathy-gtk/empathy-contact-chooser.h66
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c6
-rw-r--r--libempathy-gtk/empathy-individual-view.c6
-rw-r--r--libempathy-gtk/empathy-log-window.c2
-rw-r--r--libempathy-gtk/empathy-ui-utils.c297
-rw-r--r--libempathy-gtk/empathy-ui-utils.h9
-rw-r--r--libempathy/empathy-camera-monitor.c164
-rw-r--r--libempathy/empathy-camera-monitor.h13
-rw-r--r--libempathy/empathy-gsettings.h5
-rw-r--r--libempathy/empathy-message.c6
-rw-r--r--libempathy/empathy-server-sasl-handler.c2
-rw-r--r--libempathy/empathy-tp-contact-list.c14
-rw-r--r--po/cs.po1803
-rw-r--r--po/es.po824
-rw-r--r--po/fa.po2059
-rw-r--r--po/gl.po1081
-rw-r--r--po/he.po801
-rw-r--r--po/hu.po927
-rw-r--r--po/id.po2869
-rw-r--r--po/nb.po848
-rw-r--r--po/pt_BR.po2004
-rw-r--r--po/sv.po821
-rw-r--r--po/uk.po2225
-rw-r--r--po/vi.po2266
-rw-r--r--po/zh_CN.po1100
-rw-r--r--po/zh_HK.po949
-rw-r--r--po/zh_TW.po949
-rw-r--r--po/zu.po2247
-rwxr-xr-xrelease.py7
-rw-r--r--src/Makefile.am16
-rw-r--r--src/empathy-accounts-dialog.c54
-rw-r--r--src/empathy-audio-sink.c276
-rw-r--r--src/empathy-audio-src.c527
-rw-r--r--src/empathy-audio-src.h21
-rw-r--r--src/empathy-av.c1
-rw-r--r--src/empathy-call-handler.c2
-rw-r--r--src/empathy-call-window.c1353
-rw-r--r--src/empathy-call-window.h7
-rw-r--r--src/empathy-call-window.ui233
-rw-r--r--src/empathy-call.c8
-rw-r--r--src/empathy-camera-menu.c387
-rw-r--r--src/empathy-camera-menu.h56
-rw-r--r--src/empathy-debug-window.c66
-rw-r--r--src/empathy-debug-window.h3
-rw-r--r--src/empathy-debugger.c50
-rw-r--r--src/empathy-invite-participant-dialog.c330
-rw-r--r--src/empathy-main-window.c54
-rw-r--r--src/empathy-main-window.h3
-rw-r--r--src/empathy-mic-menu.c420
-rw-r--r--src/empathy-mic-menu.h56
-rw-r--r--src/empathy-preferences.c90
-rw-r--r--src/empathy-preferences.h20
-rw-r--r--src/empathy-preferences.ui180
-rw-r--r--src/empathy-rounded-actor.c68
-rw-r--r--src/empathy-rounded-actor.h63
-rw-r--r--src/empathy-streamed-media-window.c53
-rw-r--r--src/empathy-video-src.c28
-rw-r--r--src/empathy-video-src.h4
-rw-r--r--src/empathy.c68
-rw-r--r--tests/interactive/test-empathy-contact-blocking-dialog.c9
81 files changed, 23488 insertions, 14963 deletions
diff --git a/Makefile.am b/Makefile.am
index c1bed60f6..3b88fe0d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ if HAVE_NST
SUBDIRS += $(NST_SUBDIRS)
endif
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
diff --git a/NEWS b/NEWS
index 6a1b54561..3f29d6c1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,104 @@
+NEW in 3.1.5 (16/08/2011)
+============
+
+The "kangaroo currywurst" release.
+
+Empathy now depends on PulseAudio to place calls. When using recent versions of
+PulseAudio (≥ 0.99.2), Empathy now has echo cancellation support.
+
+The new, experimental, call UI gained some new calls features such as
+UI to choose the audio and video device used, a new floating toolbar and the
+ability to move the video preview using drag & drop.
+Empathy and Gabble have to be built with Call support to use this new UI.
+
+
+Dependencies:
+
+ • folks ≥ 0.6.0
+ • libpulse and libpulse-mainloop-glib
+
+Bugs fixed:
+ - Fixed #590048, Change audio input device used in calls (Jonny Lamb)
+ - Fixed #599167, Change video input device (Emilio Pozuelo Monfort)
+ - Fixed #632874, VoIP Dialpad should show letters (Danielle Madeley)
+ - Fixed #654914, empathy-debugger crashed with SIGSEGV in g_type_check_instance() (Danielle Madeley)
+ - Fixed #654958, Missing 5min-timestamps (Guillaume Desmottes)
+ - Fixed #655212, Update for libfolks API changes to AvatarDetails (Philip Withnall)
+ - Fixed #655478, Plural forms (Emilio Pozuelo Monfort)
+ - Fixed #655788, empathy-auth-client crashed with SIGABRT in __kernel_vsyscall() (Alexey Fisher)
+ - Fixed #655884, [New Call UI] Menus (Emilio Pozuelo Monfort)
+ - Fixed #655959, Yahoo not accessible with @rocketmail.com address (Guillaume Desmottes)
+ - Fixed #656020, Factor out EmpathyContactChooser from EmpathyInviteParticipantDialog (Guillaume Desmottes)
+ - Fixed #656065, empathy crashed with SIGSEGV in __strcmp_ssse3() (Press F3 -> Windows for search text) (Emilio Pozuelo Monfort)
+ - Fixed #656150, Floating bottom toolbar (Emilio Pozuelo Monfort)
+ - Fixed #656268, Move video preview (Emilio Pozuelo Monfort)
+ - Fixed #656415, Muting microphone issues (Emilio Pozuelo Monfort)
+ - Fixed #656572, Call window asserts when you try to move the preview (Emilio Pozuelo Monfort)
+ - Fixed #656582, "Input volume" should be hidden if empathy-call isn't enabled (Emilio Pozuelo Monfort)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated gl Translation (Fran Dieguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pt_BR Translation (Felipe Borges)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated uk Translation (Daniel Korostil)
+ - Updated vi Translation (Ngô Chin, Nguyễn Thái Ngọc Duy)
+ - Updated zh_CN Translation (Aron Xu)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+ - Updated zu Translation (Abel Motha)
+
+Documentation translations:
+ - Updated eu Documentation translation (Inaki Larranaga Murgoitio)
+ - Updated sl Documentation translation (Andrej Žnidaršič)
+ - Updated zh_CN Documentation translation (lainme)
+
+NEW in 3.1.4 (26/07/2011)
+============
+
+Dependencies:
+
+ • telepathy-glib ≥ 0.15.3
+ • Optional gudev for camera monitoring
+ • clutter if building empathy-call
+
+Bugs fixed:
+ - Fixed #558942, Dragging whitespace reveals secret contacts (Danielle Madeley)
+ - Fixed #582442, Set video preview on top of remote video (Emilio Pozuelo Monfort)
+ - Fixed #593352, empathy always display scroll bar in conversation window
+ - Fixed #607557, Calls to bogus JIDs don't give useful error messages
+ - Fixed #611789, VoIP toolbar buttons and icons (Emilio Pozuelo Monfort)
+ - Fixed #634809, Call window size is saved with the sidebar but restored without it (Emilio Pozuelo Monfort)
+ - Fixed #639353, Empathy should mirror webcam video stream (Emilio Pozuelo Monfort)
+ - Fixed #652439, Can't open conversation tabs from the contact list if the conversation is open in the shell (Guillaume Desmottes)
+ - Fixed #653116, Display aliases in the Who column (Emilio Pozuelo Monfort)
+ - Fixed #653175, MUC chats show up as "Chat with <contact>" (Emilio Pozuelo Monfort)
+ - Fixed #653341, Expand events when clicking on them (Emilio Pozuelo Monfort)
+ - Fixed #653760, Refresh logs when new stuff happens
+ - Fixed #653803, EmpathyLogWindow should be a GtkWindow
+ - Fixed #654015, empathy-chat asserts with adium themes in tp_escape_as_identifier (Guillaume Desmottes)
+ - Fixed #654256, empathy crashed with SIGSEGV in tp_proxy_get_object_path() (Emilio Pozuelo Monfort)
+ - Fixed #654419, Chat history for Facebook lacks name of friend but shows ids
+ - Fixed #654541, Default save location for debug reports is /tmp (Rob Sharp)
+ - Fixed #654552, IRC configuration should expose 'username', and probably have an 'advanced' section. (Rob Sharp)
+ - Fixed #654611, Should request Call channels by default when built with Call support (Emilio Pozuelo Monfort)
+ - Fixed #654669, Spelling suggestions not offered from Menu key (Danielle Madeley)
+
+Translations:
+ - Updated es Translation (Jorge González, Daniel Mustieles)
+ - Updated gl Translation (Fran Dieguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated lv Translation (Rudolfs Mazurs)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pa Translation (A S Alam)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated sv Translation (Daniel Nylander)
+
NEW in 3.1.3 (04/07/2011)
============
diff --git a/configure.ac b/configure.ac
index 7f6ec16dd..3aa266b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [1])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_micro_version], [5])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
@@ -19,10 +19,13 @@ m4_define(empathy_maybe_datestamp,
m4_define(empathy_version, empathy_full_version[]empathy_maybe_datestamp)
-AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT([Empathy],
+ [empathy_version],
+ [http://bugzilla.gnome.org/browse.cgi?product=empathy],
+ [empathy],
+ [https://live.gnome.org/Empathy])
-
-AC_PREREQ(2.59)
+AC_PREREQ([2.64])
AC_COPYRIGHT([
Copyright (C) 2003-2007 Imendio AB
Copyright (C) 2007-2010 Collabora Ltd.
@@ -31,7 +34,7 @@ AC_COPYRIGHT([
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.5.1
+FOLKS_REQUIRED=0.6.0
GLIB_REQUIRED=2.28.0
GNUTLS_REQUIRED=2.8.5
GTK_REQUIRED=3.0.2
@@ -77,23 +80,24 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR(.)
-GNOME_COMMON_INIT
-
-AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
-# Support silent build rules, requires at least automake-1.11. Disable
+# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
-AC_ISC_POSIX
+# Check for programs
AC_PROG_CC
AC_HEADER_STDC
-AM_PROG_LIBTOOL
AM_PROG_MKDIR_P
AM_PATH_GLIB_2_0
AC_PATH_XTRA
-IT_PROG_INTLTOOL([0.35.0])
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
GNOME_DOC_INIT([0.17.3])
AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
GLIB_GSETTINGS
@@ -116,7 +120,8 @@ AS_COMPILER_FLAG(-Wall, ERROR_CFLAGS="-Wall", ERROR_CFLAGS="")
AS_COMPILER_FLAG(-Werror, werror=yes, werror=no)
AC_ARG_ENABLE(Werror,
- AC_HELP_STRING([--disable-Werror],[compile without -Werror (normally enabled in development builds)]),
+ AS_HELP_STRING([--disable-Werror],
+ [compile without -Werror (normally enabled in development builds)]),
werror=$enableval, :)
AS_COMPILER_FLAG(-Wextra, wextra=yes, wextra=no)
@@ -174,6 +179,8 @@ PKG_CHECK_MODULES(EMPATHY,
libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
libnotify >= $LIBNOTIFY_REQUIRED
gcr-3 >= $GCR_REQUIRED
+ libpulse
+ libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
])
@@ -188,11 +195,11 @@ PKG_CHECK_MODULES(EMPATHY_AV,
# -----------------------------------------------------------
# Call interface
# -----------------------------------------------------------
-AC_ARG_WITH(call,
- AC_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
+AC_ARG_ENABLE(call,
+ AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
[build with Call interface support]),,
- [with_call=auto])
-if test "x$with_call" != "xno" ; then
+ [enable_call=auto])
+if test "x$enable_call" != "xno" ; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farsight2-0.10
@@ -209,7 +216,7 @@ else
have_call=no
fi
-if test "x$with_call" = "xyes" -a "x$have_call" != "xyes"; then
+if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
AC_MSG_ERROR([Could not find Call handler dependencies.])
fi
AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
@@ -218,11 +225,11 @@ AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
# -----------------------------------------------------------
# Call support in tp-logger
# -----------------------------------------------------------
-AC_ARG_WITH(call-logs,
- AC_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
+AC_ARG_ENABLE(call-logs,
+ AS_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
[build with call logs support]),,
- [with_call_logs=auto])
-if test "x$with_call_logs" != "xno" ; then
+ [enable_call_logs=auto])
+if test "x$enable_call_logs" != "xno" ; then
SAVE_CFLAGS=$CFLAGS
SAVE_CPPFLAGS=$CPPFLAGS
CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
@@ -241,7 +248,7 @@ else
have_call_logs=no
fi
-if test "x$with_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
+if test "x$enable_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
built with --enable-call])
fi
@@ -250,7 +257,8 @@ fi
# evolution-data-server (about-me)
# -----------------------------------------------------------
AC_ARG_WITH(eds,
- AC_HELP_STRING([--with-eds], [build with evolution-data-server support]),,
+ AS_HELP_STRING([--with-eds],
+ [build with evolution-data-server support]),,
[with_eds=yes])
if test x"$with_eds" = x"yes" ; then
PKG_CHECK_MODULES(EDS, [libebook-1.2])
@@ -262,7 +270,8 @@ fi
# -----------------------------------------------------------
AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--disable-debug],[compile without debug code]),
+ AS_HELP_STRING([--disable-debug],
+ [compile without debug code]),
enable_debug=$enableval, enable_debug=yes )
if test x$enable_debug = xyes; then
@@ -272,13 +281,15 @@ fi
# -----------------------------------------------------------
# Language Support
# -----------------------------------------------------------
+IT_PROG_INTLTOOL([0.40.0])
+
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=empathy
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
-AM_GLIB_GNU_GETTEXT
-
# -----------------------------------------------------------
# Connectivity integration
# -----------------------------------------------------------
@@ -570,7 +581,8 @@ AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
# Optional dependency for avatar selection
AC_ARG_WITH([cheese],
- AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
+ AS_HELP_STRING([--with-cheese],
+ [enable cheese webcam support]),,
with_cheese=auto)
if test x"$with_cheese" != x"no" ; then
@@ -591,14 +603,15 @@ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
# Coding style checks
# -----------------------------------------------------------
AC_ARG_ENABLE(coding-style-checks,
- AC_HELP_STRING([--disable-coding-style-checks],
+ AS_HELP_STRING([--disable-coding-style-checks],
[do not check coding style using grep]),
- [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
+ [ENABLE_CODING_STYLE_CHECKS=$enableval],
+ [ENABLE_CODING_STYLE_CHECKS=yes])
AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
# -----------------------------------------------------------
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
data/Makefile
data/empathy.desktop.in
@@ -616,6 +629,7 @@ AC_OUTPUT([
tests/xml/Makefile
tools/Makefile
])
+AC_OUTPUT
echo "
Configure summary:
diff --git a/data/empathy-log-window.html b/data/empathy-log-window.html
index 6962528a4..881592520 100644
--- a/data/empathy-log-window.html
+++ b/data/empathy-log-window.html
@@ -173,7 +173,7 @@ function insertRow (path, text, icon, date_)
else
setExpander(newnode, false);
};
-
+
toggle.onclick = toggleExpander;
contents.ondblclick = toggleExpander;
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 50b3005fa..f51b51b00 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -224,6 +224,24 @@ present them to the user immediately.</_description>
<_description>Whether Empathy should use the avatar of the contact as the chat window icon.</_description>
</key>
</schema>
+ <schema id="org.gnome.Empathy.call" path="/org/gnome/empathy/call/">
+ <key name="volume" type="d">
+ <range min="0" max="150"/>
+ <default>100.0</default>
+ <_summary>Call volume</_summary>
+ <_description>Call volume, as a percentage.</_description>
+ </key>
+ <key name="camera-device" type="s">
+ <default>''</default>
+ <_summary>Camera device</_summary>
+ <_description>Default camera device to use in video calls, e.g. /dev/video0.</_description>
+ </key>
+ <key name="echo-cancellation" type="b">
+ <default>true</default>
+ <_summary>Echo cancellation support</_summary>
+ <_description>Whether to enable Pulseaudio's echo cancellation filter.</_description>
+ </key>
+ </schema>
<schema id="org.gnome.Empathy.hints" path="/org/gnome/empathy/hints/">
<key name="close-main-window" type="b">
<default>true</default>
diff --git a/help/.gitignore b/help/.gitignore
index 58e8c0cbd..ed02d45a1 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -1,34 +1,34 @@
-*.omf
*.mo
-
-ca/*.xml
-cs/*.xml
-de/*.xml
-el/*.xml
-en_GB/*.xml
-es/*.xml
-fi/*.xml
-fr/*.xml
-gl/*.xml
-hu/*.xml
-it/*.xml
-ru/*.xml
-sl/*.xml
-sv/*.xml
-zh_CN/*.xml
-
+*.omf
ca/*.page
+ca/*.xml
cs/*.page
+cs/*.xml
de/*.page
+de/*.xml
el/*.page
+el/*.xml
en_GB/*.page
+en_GB/*.xml
es/*.page
+es/*.xml
+eu/*.page
+eu/*.xml
fi/*.page
+fi/*.xml
fr/*.page
+fr/*.xml
gl/*.page
+gl/*.xml
hu/*.page
+hu/*.xml
it/*.page
+it/*.xml
ru/*.page
+ru/*.xml
sl/*.page
+sl/*.xml
sv/*.page
+sv/*.xml
zh_CN/*.page
+zh_CN/*.xml
diff --git a/help/Makefile.am b/help/Makefile.am
index f898ccb67..a5e7ab55c 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -61,5 +61,5 @@ DOC_PAGES = \
status-icons.page \
video-call.page
-DOC_LINGUAS = ca cs de el en_GB es fi fr gl hu it ru sl sv zh_CN
+DOC_LINGUAS = ca cs de el en_GB es eu fi fr gl hu it ru sl sv zh_CN
dist-hook: doc-dist-hook
diff --git a/help/eu/eu.po b/help/eu/eu.po
new file mode 100644
index 000000000..b5f5439d4
--- /dev/null
+++ b/help/eu/eu.po
@@ -0,0 +1,3527 @@
+# translation of empathy.help.master.po to Basque
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2011.
+# Basque translation for empathy.
+# Copyright (C) 2010 empathy's COPYRIGHT HOLDER
+# This file is distributed under the same license as the empathy package.
+msgid ""
+msgstr ""
+"Project-Id-Version: empathy.help.master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-14 08:38+0000\n"
+"PO-Revision-Date: 2011-04-14 16:22+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
+"Language-Team: Basque <itzulpena@euskalgnu.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+"\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/video-call.page:38(None)
+#: C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#: C/video-call.page:10(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Hasi bideo-solasdaldi bat zure kontaktuetako batekin."
+
+#: C/video-call.page:21(name)
+#: C/status-icons.page:16(name)
+#: C/share-desktop.page:13(name)
+#: C/set-custom-status.page:19(name)
+#: C/send-file.page:21(name)
+#: C/salut-protocol.page:18(name)
+#: C/remove-account.page:18(name)
+#: C/prob-conn-neterror.page:18(name)
+#: C/prob-conn-name.page:17(name)
+#: C/prob-conn-auth.page:21(name)
+#: C/prob-conn-acctdisabled.page:18(name)
+#: C/prev-conv.page:16(name)
+#: C/link-contacts.page:15(name)
+#: C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name)
+#: C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:19(name)
+#: C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name)
+#: C/irc-commands.page:10(name)
+#: C/introduction.page:13(name)
+#: C/index.page:19(name)
+#: C/import-account.page:23(name)
+#: C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name)
+#: C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name)
+#: C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name)
+#: C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name)
+#: C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name)
+#: C/create-account.page:18(name)
+#: C/audio-video.page:17(name)
+#: C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
+msgid "Milo Casagrande"
+msgstr "Milo Casagrande"
+
+#: C/video-call.page:22(email)
+#: C/status-icons.page:17(email)
+#: C/share-desktop.page:14(email)
+#: C/set-custom-status.page:20(email)
+#: C/send-file.page:22(email)
+#: C/salut-protocol.page:19(email)
+#: C/remove-account.page:19(email)
+#: C/prob-conn-neterror.page:19(email)
+#: C/prob-conn-name.page:18(email)
+#: C/prob-conn-auth.page:22(email)
+#: C/prob-conn-acctdisabled.page:19(email)
+#: C/prev-conv.page:17(email)
+#: C/link-contacts.page:16(email)
+#: C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email)
+#: C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:20(email)
+#: C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email)
+#: C/irc-commands.page:11(email)
+#: C/introduction.page:14(email)
+#: C/index.page:20(email)
+#: C/import-account.page:24(email)
+#: C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email)
+#: C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email)
+#: C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
+#: C/geolocation-not-showing.page:18(email)
+#: C/geolocation.page:18(email)
+#: C/favorite-rooms.page:15(email)
+#: C/disable-account.page:21(email)
+#: C/create-account.page:19(email)
+#: C/audio-video.page:18(email)
+#: C/audio-call.page:20(email)
+#: C/add-account.page:21(email)
+msgid "milo@ubuntu.com"
+msgstr "milo@ubuntu.com"
+
+#: C/video-call.page:25(p)
+#: C/status-icons.page:24(p)
+#: C/share-desktop.page:17(p)
+#: C/set-custom-status.page:23(p)
+#: C/send-message.page:21(p)
+#: C/send-file.page:25(p)
+#: C/salut-protocol.page:22(p)
+#: C/remove-account.page:22(p)
+#: C/prob-conn.page:18(p)
+#: C/prob-conn-neterror.page:22(p)
+#: C/prob-conn-name.page:21(p)
+#: C/prob-conn-auth.page:25(p)
+#: C/prob-conn-acctdisabled.page:22(p)
+#: C/prev-conv.page:24(p)
+#: C/link-contacts.page:19(p)
+#: C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p)
+#: C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p)
+#: C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p)
+#: C/irc-commands.page:14(p)
+#: C/introduction.page:17(p)
+#: C/index.page:23(p)
+#: C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p)
+#: C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p)
+#: C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p)
+#: C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p)
+#: C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p)
+#: C/disable-account.page:28(p)
+#: C/create-account.page:22(p)
+#: C/change-status.page:23(p)
+#: C/audio-video.page:21(p)
+#: C/audio-call.page:23(p)
+#: C/add-contact.page:22(p)
+#: C/add-account.page:28(p)
+#: C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p)
+#: C/account-irc.page:20(p)
+msgid "Creative Commons Share Alike 3.0"
+msgstr "Creative Commons Partekatu Berdin 3.0"
+
+#: C/video-call.page:28(title)
+msgid "Start a video conversation"
+msgstr "Hasi bideo-solasaldi bat"
+
+#: C/video-call.page:30(p)
+msgid ""
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This features only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
+msgstr ""
+"Web-kamera bat baduzu, kontaktuei dei diezaiekezu eta bideo-solasaldia izan "
+"haiekin. Eginbide honek kontu mota jakin batzuekin bakarrik funtzionatzen "
+"du, eta beste pertsonak bideo-deiak onartzen dituen aplikazio bat eduki "
+"behar du."
+
+#: C/video-call.page:37(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next "
+"to the name of the contact you wish to call and choose <gui "
+"style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik deitu nahi diozun "
+"kontaktuaren ondoko <media type=\"image\" mime=\"image/png\" src=\"figures"
+"/camera-web.png\">bideo-deia</media> ikonoan, eta aukeratu <gui "
+"style=\"menuitem\">Bideo-deia</gui>."
+
+#: C/video-call.page:43(p)
+#: C/audio-call.page:42(p)
+msgid ""
+"A new window will open. When the connection is established, you will see "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
+"conversation time."
+msgstr ""
+"Leiho berria irekiko da. Behin konexioa ezarrita, <gui>Konektatuta</gui> "
+"azalduko da leihoaren behealdean, solasaldi-denbora osoarekin batera."
+
+#: C/video-call.page:48(p)
+#: C/audio-call.page:48(p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgstr ""
+"Solasaldiarekin amaitzeko, egin klik <gui style=\"button\">Eseki</gui> "
+"botoian."
+
+#: C/video-call.page:54(p)
+msgid ""
+"To turn a video conversation into an audio conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
+msgstr ""
+"Bideo-solasaldi bat audio-solasaldi bihurtzeko, aukeratu <guiseq><gui "
+"style=\"menu\">Bideoa</gui><gui style=\"menuitem\">Desaktibatu "
+"bideoa</gui></guiseq>."
+
+#: C/video-call.page:60(title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Hasi bideo-solasaldi bat metakontaktu batekin"
+
+#: C/video-call.page:63(p)
+#: C/send-message.page:53(p)
+#: C/audio-call.page:66(p)
+msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik eskuin-botoiarekin "
+"metakontaktuan."
+
+#: C/video-call.page:68(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Hautatu zein kontakturekin eduki nahi duzun solasaldia, eta hautatu menuan "
+"<gui style=\"menuitem\">Bideo-deia</gui>."
+
+#: C/video-call.page:75(p)
+#: C/send-message.page:65(p)
+#: C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+"Kontaktu bat <em>metakontaktua</em> den jakiteko, mugitu sagua kontaktu "
+"batean <gui>Kontaktu-zerrenda</gui> leihoan, eta utzi geldirik segundo "
+"batez: laster-leiho txiki bat azalduko da, metakontaktua osatzen duten "
+"kontaktuen kopurua erakusteko."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:39(None)
+msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:45(None)
+msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:53(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:62(None)
+#: C/status-icons.page:69(None)
+msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+
+#: C/status-icons.page:7(desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Egoera eta egoera-ikonoak ulertzea"
+
+#: C/status-icons.page:20(name)
+#: C/salut-protocol.page:36(cite)
+#: C/prev-conv.page:20(name)
+#: C/prev-conv.page:38(cite)
+#: C/import-account.page:27(name)
+#: C/disable-account.page:24(name)
+#: C/audio-video.page:109(cite)
+#: C/audio-video.page:117(cite)
+#: C/add-account.page:24(name)
+#: C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name)
+#: C/account-irc.page:16(name)
+msgid "Shaun McCance"
+msgstr "Shaun McCance"
+
+#: C/status-icons.page:21(email)
+#: C/prev-conv.page:21(email)
+#: C/import-account.page:28(email)
+#: C/disable-account.page:25(email)
+#: C/add-account.page:25(email)
+#: C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email)
+#: C/account-irc.page:17(email)
+msgid "shaunm@gnome.org"
+msgstr "shaunm@gnome.org"
+
+#: C/status-icons.page:35(title)
+msgid "Status Types and Icons"
+msgstr "Egoera motak eta haien ikonoak"
+
+#: C/status-icons.page:39(media)
+msgid "Available icon"
+msgstr "Ikono erabilgarria"
+
+#: C/status-icons.page:40(gui)
+msgid "Available"
+msgstr "Erabilgarri"
+
+#: C/status-icons.page:41(p)
+msgid ""
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
+msgstr ""
+"Erabili <em>Erabilgarri</em> egoera zure ordenagailuan zaudenean eta zure "
+"kontaktuekin hitz egiteko prest zaudenean. Mezu pertsonalizatu bat ezar "
+"diezaiokezu egoera horri."
+
+#: C/status-icons.page:45(media)
+msgid "Busy icon"
+msgstr "'Lanpetuta' ikonoa"
+
+#: C/status-icons.page:46(gui)
+msgid "Busy"
+msgstr "Lanpetuta"
+
+#: C/status-icons.page:47(p)
+msgid ""
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
+msgstr ""
+"Erabili <em>Lanpetuta</em> egoera zure kontaktuei jakinarazteko une horretan "
+"ez duzula berriketan egin nahi. Halere, zurekin harremanetan jar daitezke, "
+"eztabaidatzeko presako zerbait badute, esate baterako. Modu lehenetsian, "
+"<app>Empathy</app>-k ez du erabiliko jakinarazpen-burbuilarik edo -soinurik "
+"lanpetuta zaudenean. Mezu pertsonalizatu bat ezar diezaiokezu egoera horri."
+
+#: C/status-icons.page:53(media)
+msgid "Away icon"
+msgstr "'Kanpoan' ikonoa"
+
+#: C/status-icons.page:54(gui)
+msgid "Away"
+msgstr "Kanpoan"
+
+#: C/status-icons.page:55(p)
+msgid ""
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
+msgstr ""
+"Erabili <em>Kanpoan</em> egoera ordenagailuaren ondoan ez zaudela "
+"jakinarazteko. <app>Empathy</app>-k automatikoki jarriko du zure egoera "
+"'Kanpoan' moduan, denbora batez ez baduzu ordenagailua erabiltzen, edo "
+"pantaila-babeslea aktibatuta badago. Modu lehenetsian, <app>Empathy</app>-k "
+"ez du erabiliko jakinarazpen-burbuilarik edo -soinurik kanpoan zaudenean. "
+"Mezu pertsonalizatu bat ezar diezaiokezu egoera horri."
+
+#: C/status-icons.page:62(media)
+#: C/status-icons.page:69(media)
+msgid "Offline icon"
+msgstr "'Lineaz kanpo' ikonoa"
+
+#: C/status-icons.page:63(gui)
+msgid "Invisible"
+msgstr "Ikusezina"
+
+#: C/status-icons.page:64(p)
+msgid ""
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
+msgstr ""
+"Zure egoera <em>Ikusezina</em> gisa ezartzean, zure kontaktuek lineaz kanpo "
+"ikusiko zaituzte. Zure kontuekin konektatuta egongo zara, zure kontaktuen "
+"egoerak ikusi ahal izango dituzu, edota haiekin solasaldiak izan."
+
+#: C/status-icons.page:70(gui)
+msgid "Offline"
+msgstr "Lineaz kanpo"
+
+#: C/status-icons.page:71(p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr ""
+"Zure egoeran <em>Lineaz kanpo</em> ezarriz gero, zure kontu guztietatik "
+"deskonektatuko zara."
+
+#: C/share-desktop.page:7(desc)
+msgid "Share the desktop with your contacts."
+msgstr "Partekatu mahaigaina zure kontaktuekin."
+
+#: C/share-desktop.page:28(title)
+msgid "Share your desktop"
+msgstr "Partekatu zure mahaigaina"
+
+#: C/share-desktop.page:30(p)
+msgid ""
+"It is possible, with some of your contacts, to share your desktop with them, "
+"or to start using your contacts desktop. You can use this functionality to "
+"show your desktop to your contacts, to ask for help or to help your contacts "
+"resolve a problem."
+msgstr ""
+"Zure kontaktu batzuekin mahaigaina partekatu ahal izango duzu, edo zure "
+"kontaktuen mahaigaina erabiltzen hasi ahal izango zara. Funtzionaltasun hau "
+"erabil dezakezu zure mahaigaina kontaktuei erakusteko, haiei laguntza "
+"eskatzeko nahiz zuk haiei laguntzeko, arazoren batekin."
+
+#: C/share-desktop.page:38(p)
+msgid ""
+"In order to be able to share your desktop or to remotely use your contacts "
+"desktop, it is necessary to have a remote desktop viewer application "
+"installed in your system."
+msgstr ""
+"Zure mahaigaina partekatzeko gai izateko edo zure kontaktuen mahaigaina "
+"urrunetik erabili ahal izateko, urruneko mahaigainaren ikustaile-aplikazio "
+"bat eduki behar duzu."
+
+#: C/share-desktop.page:46(p)
+#: C/send-file.page:40(p)
+#: C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "<gui>Kontaktu-zerrenda</gui> leihoan, egin hauetako bat:"
+
+#: C/share-desktop.page:51(p)
+msgid ""
+"Select the contact you want to share your desktop with, and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my "
+"desktop</gui></guiseq>."
+msgstr ""
+"Hautatu mahaigaina zein kontakturekin partekatu nahi duzun, eta aukeratu "
+"<guiseq><gui>Editatu</gui><gui>Kontaktua</gui><gui>Partekatu nire "
+"mahaigaina</gui></guiseq>."
+
+#: C/share-desktop.page:57(p)
+msgid ""
+"Right-click on the name of the contact you want to share your desktop with, "
+"and select <gui>Share my desktop</gui>."
+msgstr ""
+"Egin klik eskuin-botoiarekin mahaigaina partekatu nahi duzun kontaktuaren "
+"izenean, eta hautatu <gui>Partekatu nire mahaigaina</gui>."
+
+#: C/share-desktop.page:65(p)
+msgid ""
+"A request will be sent to the contact you want to share your desktop with. "
+"If they accept, the default remote desktop viewer application will be "
+"launched in order to permit you to disconnect the user that is controlling "
+"your desktop."
+msgstr ""
+"Eskaera bidaliko zaio mahaigaina partekatu nahi duzun kontaktuari. Onartzen "
+"badute, urruneko mahaigainaren ikustaile-aplikazio lehenetsia abiaraziko da, "
+"zuri aukera emateko zure mahaigaina kontrolatzen ari den erabiltzailea "
+"deskonektatzeko."
+
+#: C/share-desktop.page:70(p)
+msgid ""
+"For more information about how to use the remote desktop viewer application, "
+"refer to its help."
+msgstr ""
+"Urruneko mahaigainaren ikustaile-aplikazio lehenetsiari buruzko informazio "
+"gehiago lortzeko, ikus hari buruzko Laguntza."
+
+#: C/share-desktop.page:77(p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+msgstr ""
+"Mahaigaina beste norbaitekin partekatzen duzunean, baliteke sistemaren "
+"errendimendua moteltzea eta Interneten abiadura baxuagoa izatea."
+
+#: C/share-desktop.page:83(p)
+msgid ""
+"Not all your contacts might be able to support this functionality. It is "
+"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
+"and a remote desktop viewer application installed in their system."
+msgstr ""
+"Balite zure kontakturen batek funtzionaltasun hau ez onartzea. "
+"<app>Empathy</app>-ren 2.28 bertsioa edo berriagoa eduki behar dute, eta "
+"urruneko mahaigainaren ikustaile-aplikazioa sisteman instalatuta."
+
+#: C/set-custom-status.page:9(desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Gehitu, editatu edo ezabatu mezu pertsonalak zure egoerarako."
+
+#: C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
+
+#: C/set-custom-status.page:34(title)
+msgid "Set a custom message"
+msgstr "Ezarri mezu pertsonalizatua"
+
+#: C/set-custom-status.page:36(p)
+msgid ""
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of "
+"time."
+msgstr ""
+"Batzuetan mezu pertsonalizatu bat ezarri nahiko duzu zure egoeran, esate "
+"baterako, jendeari denbora jakin batean ez zarela egongo jakinarazteko."
+
+#: C/set-custom-status.page:40(p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"Mezu pertsonalizatu bat ezar daiteke, erabilgarri dauden egoeretan "
+"oinarrituta."
+
+#: C/set-custom-status.page:46(p)
+#: C/set-custom-status.page:82(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik goian goitibeherako "
+"zerrendan."
+
+#: C/set-custom-status.page:52(p)
+msgid ""
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
+msgstr ""
+"Hautatu mezu pertsonalizatua gehitu nahi diozun egoera. <gui>Mezu "
+"pertsonalizatua</gui> etiketa duena hautatu behar duzu."
+
+#: C/set-custom-status.page:58(p)
+msgid ""
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
+msgstr ""
+"Sartu zure mezu pertsonalizatua leihoaren goialdeko testu-koadroan, eta "
+"sakatu <key>Sartu</key> tekla, mezua ezartzeko."
+
+#: C/set-custom-status.page:64(p)
+msgid ""
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little star on the right of the text box where "
+"you wrote your custom message."
+msgstr ""
+"Mezu pertsonalizatua gogoko gisa ezarri nahi baduzu, eta berriro erabiltzeko "
+"gorde nahi baduzu, egin klik mezu pertsonalizatua idatzi duzun testu-"
+"koadroaren eskuinaldeko izartxoan."
+
+#: C/set-custom-status.page:69(p)
+msgid ""
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
+msgstr ""
+"Hala egiten ez baduzu, mezu pertsonalizatua ez da erabilgarri egongo "
+"<app>Empathy</app> erabiltzen duzun hurrengoan. Uneko saiorako bakarrik "
+"gordeko da."
+
+#: C/set-custom-status.page:78(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Editatu, kendu eta gehitu mezu pertsonalizatua"
+
+#: C/set-custom-status.page:88(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Hautatu <gui>Editatu mezu pertsonalizatua</gui>."
+
+#: C/set-custom-status.page:95(p)
+msgid "To edit a custom message:"
+msgstr "Mezu pertsonalizatu bat editatzeko:"
+
+#: C/set-custom-status.page:100(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr ""
+"<gui>Gordetako aurrezarpenak</gui> koadroan, hautatu editatu nahi duzun "
+"egoera-mezua, eta egin klik bikoitza bertan."
+
+#: C/set-custom-status.page:106(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr "Idatzi mezu pertsonalizatu berria, eta sakatu <key>Sartu</key>, editatzeko."
+
+#: C/set-custom-status.page:113(p)
+msgid "To remove a custom message:"
+msgstr "Mezu pertsonalizatu bat kentzeko:"
+
+#: C/set-custom-status.page:118(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"<gui>Gordetako aurrezarpenak</gui> koadroan, hautatu kendu nahi duzun "
+"egoera-mezua."
+
+#: C/set-custom-status.page:124(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Egin klik <gui>Kendu</gui> botoian."
+
+#: C/set-custom-status.page:131(p)
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr ""
+"Mezu pertsonalizatu bat gehitzeko, <gui>Gehitu aurrezarpen berria</gui> "
+"atalean:"
+
+#: C/set-custom-status.page:136(p)
+msgid ""
+"Click on the drop-down list to select the status you want to set a custom "
+"message to."
+msgstr ""
+"Egin klik goitibeherako zerrendan mezu pertsonalizatua ezarri nahi diozun "
+"egoera hautatzeko."
+
+#: C/set-custom-status.page:142(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Egin klik testu-koadroan, eta idatzi mezu pertsonalizatua."
+
+#: C/set-custom-status.page:147(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr "Egin klik <gui>Gehitu</gui> botoian, mezu berria aurrezarritakoei gehitzeko."
+
+#: C/set-custom-status.page:156(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Amaitutakoan, egin klik <gui>Itxi</gui> botoian."
+
+#: C/set-custom-status.page:163(p)
+msgid ""
+"When you edit or add a new custom message, it will not be set as the current "
+"status message. You will need to select it from the <gui>Contact List</gui> "
+"window."
+msgstr ""
+"Mezu pertsonalizatu berri bat editatzen edo gehitzen duzunean, ez da "
+"ezarriko uneko egoera-mezu gisa. Hautatu egin beharko duzu <gui>Kontaktu-"
+"zerrenda</gui> leihoan."
+
+#: C/send-message.page:8(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Bidali mezu bat zure kontaktuetako bati."
+
+#: C/send-message.page:17(name)
+#: C/send-file.page:17(name)
+#: C/prob-conn.page:14(name)
+#: C/prob-conn-neterror.page:14(name)
+#: C/prob-conn-auth.page:17(name)
+#: C/prob-conn-acctdisabled.page:14(name)
+#: C/change-status.page:19(name)
+#: C/add-contact.page:18(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/send-message.page:18(email)
+#: C/send-file.page:18(email)
+#: C/prob-conn.page:15(email)
+#: C/prob-conn-neterror.page:15(email)
+#: C/prob-conn-auth.page:18(email)
+#: C/prob-conn-acctdisabled.page:15(email)
+#: C/change-status.page:20(email)
+#: C/add-contact.page:19(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/send-message.page:32(title)
+msgid "Send a message to someone"
+msgstr "Bidali mezu bat norbaiti"
+
+#: C/send-message.page:36(p)
+msgid ""
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik bikoitza solasaldia izan "
+"beharreko kontaktuaren izenean."
+
+#: C/send-message.page:42(p)
+msgid ""
+"A new window will open. Type a message into the box at the bottom of the "
+"window and press <key>Enter</key> to send it."
+msgstr ""
+"Leiho berria irekiko da. Idatzi mezu bat leihoaren behealdeko koadroan, eta "
+"sakatu <key>Sartu</key>, bidaltzeko."
+
+#: C/send-message.page:50(title)
+msgid "Send a message to a meta-contact"
+msgstr "Bidali mezu bat metakontaktu bati"
+
+#: C/send-message.page:58(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Hautatu zein kontakturekin eduki nahi duzun solasaldia, eta hautatu menuan "
+"<gui style=\"menuitem\">Berriketa</gui>."
+
+#: C/send-file.page:8(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Bidali fitxategi bat zure ordenagailutik zure kontaktuetako bati."
+
+#: C/send-file.page:36(title)
+msgid "Send files"
+msgstr "Bidali fitxategiak"
+
+#: C/send-file.page:45(p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr ""
+"Egin klik eskuin-botoiarekin fitxategia bidali nahi diozun kontaktuan, eta "
+"aukeratu <gui>Bidali fitxategia</gui>."
+
+#: C/send-file.page:50(p)
+msgid ""
+"Click on the contact you want to send a file, and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgstr ""
+"Egin klik fitxategia bidali nahi diozun kontaktuan, eta aukeratu "
+"<guiseq><gui>Editatu</gui><gui>Kontaktua</gui><gui>Bidali "
+"fitxategia</gui></guiseq>."
+
+#: C/send-file.page:58(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Hautau bidali beharreko fitxategia, eta egin klik <gui>Bidali</gui> botoian."
+
+#: C/send-file.page:63(p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "<gui>Fitxategi-transferentziak</gui> leihoa azalduko da."
+
+#: C/send-file.page:66(p)
+msgid ""
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr ""
+"Itxaron kontaktuak fitxategi-transferentzia onartu arte, edo aukeratu "
+"<gui>Gelditu</gui>, transferentzia gelditzeko."
+
+#: C/send-file.page:72(p)
+msgid ""
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr ""
+"Behin transferentzia amaituta, <gui>Fitxategi-transferentziak</gui> leihoa "
+"itxi daiteke."
+
+#: C/send-file.page:80(p)
+msgid ""
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
+msgstr ""
+"Leihoan amaitutako transferentzia bat baino gehiago badaude, egin klik "
+"<gui>Garbitu</gui> botoian zerrenda husteko. Horrekin, fitxategiak "
+"zerrendatik kenduko dira, eta ez dira ezabatuko ordenagailutik."
+
+#: C/send-file.page:87(p)
+msgid ""
+"It is possible to send files only using the following services: "
+"<em>Jabber</em>, <em>Google Talk</em> and <em>People Nearby</em>."
+msgstr ""
+"Ondoko zerbitzuen bidez bakarrik bidal daitezke fitxategiak: "
+"<em>Jabber</em>, <em>Google Talk</em> eta <em>People Nearby</em>."
+
+#: C/send-file.page:93(p)
+msgid ""
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
+msgstr ""
+"Fitxategi bat norbaiti bidali ahal izateko, Internetekin nahiz sare lokal "
+"batekin konektatuta egon behar duzu."
+
+#: C/salut-protocol.page:8(desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Hurbileko jendea eginbidea ulertzea."
+
+#: C/salut-protocol.page:33(title)
+msgid "What is People Nearby?"
+msgstr "Zer da Hurbileko jendea?"
+
+#: C/salut-protocol.page:37(p)
+msgid "I'd like to see this played up a bit more."
+msgstr "Horri buruzko azalpen gehiago ikusi nahiko nituzke."
+
+#: C/salut-protocol.page:40(p)
+msgid ""
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
+msgstr ""
+"Hurbileko jendea eginbidea zerbitzaririk gabeko komunikazio-zerbitzu bat da: "
+"ez duzu zerbitzari zentral batekin konektatu eta autentifikatu behar, "
+"erabili ahal izateko."
+
+#: C/salut-protocol.page:45(p)
+msgid ""
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr ""
+"Halako zerbitzaririk gabeko mezularitza-sistemak sare lokaletara mugatzen "
+"dira, eta ez da Interneteko konexio aktiborik behar."
+
+#: C/salut-protocol.page:49(p)
+msgid ""
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
+msgstr ""
+"Sare lokal berean zerbitzu hau erabiltzen duen jendea automatikoki "
+"detektatuko da, eta mezuak nahiz fitxategiak bidali ahal izango zaizkie, "
+"beste zerbitzu batzuekin batera."
+
+#: C/salut-protocol.page:54(p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Sare lokal moderno guztiek gai izan beharko lukete halako zerbitzuak "
+"onartzeko."
+
+#: C/remove-account.page:8(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Kendu kontu bat betiko <app>Empathy</app>-tik."
+
+#: C/remove-account.page:33(title)
+msgid "Remove an account"
+msgstr "Kendu kontu bat"
+
+#: C/remove-account.page:35(p)
+msgid ""
+"You can completely remove an account from <app>Empathy</app> if you no "
+"longer wish to use the account. If you wish to use the account in "
+"<app>Empathy</app> again in the future, you will have to add your account "
+"details again."
+msgstr ""
+"Kontu bat erabat ken dezakezu <app>Empathy</app>-tik, ez baduzu berriro "
+"erabili nahi. Etorkizunean kontu hori <app>Empathy</app>-n berriro erabili "
+"nahi baduzu, kontu-xehetasunak gehitu beharko dituzu berriro."
+
+#: C/remove-account.page:42(p)
+#: C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p)
+#: C/add-account.page:48(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose "
+"<guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, aukeratu "
+"<guiseq><gui>Editatu</gui><gui>Kontuak</gui></guiseq>, edo sakatu "
+"<key>F4</key>."
+
+#: C/remove-account.page:46(p)
+msgid ""
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr "Hautatu kontuen zerrendan kendu nahi duzun kontua, leihoaren ezkerraldean."
+
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Egin klik <gui style=\"button\">Kendu</gui> botoian."
+
+#: C/remove-account.page:53(p)
+msgid ""
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
+msgstr ""
+"Elkarrizketa-koadro bat azalduko da, berrets dezazun. Egin klik <gui>Kendu</gui> "
+"botoian, kontua betiko kentzeko."
+
+#: C/remove-account.page:59(p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
+msgstr ""
+"Kontu bat kendu ondoren, <app>Empathy</app>-k ez du kontu horretako zure "
+"solasaldi-historia ezabatzen."
+
+#: C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnostikatu berehalako mezularitzako zerbitzu batekin konektatzeko arazorik "
+"ohikoenak."
+
+#: C/prob-conn.page:29(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Arazoak berehalako mezularitzako zerbitzu batekin konektatzeko"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/prob-conn-neterror.page:58(None)
+#: C/prob-conn-name.page:43(None)
+#: C/prob-conn-auth.page:58(None)
+#: C/account-irc.page:109(None)
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+
+#: C/prob-conn-neterror.page:7(desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>” appears in the main "
+"window."
+msgstr ""
+"“<gui>Sareko errorea</gui>” dioen errore-mezu bat azalduko da leiho "
+"nagusian."
+
+#: C/prob-conn-neterror.page:33(title)
+msgid "I get a message that says “Network error”"
+msgstr "“Sareko errorea” dioen mezu bat jaso dut"
+
+#: C/prob-conn-neterror.page:36(cite)
+msgid "shaunm"
+msgstr "shaunm"
+
+#: C/prob-conn-neterror.page:37(p)
+msgid ""
+"Empathy no longer allows you to create an IRC account without a valid nick. "
+"I've removed the guide link. Remove the text."
+msgstr ""
+"Empathy-k ez du onartzen IRC konturik sortzea baliozko goitizenik gabe. "
+"Gida-esteka kendu dut. Kendu testua."
+
+#: C/prob-conn-neterror.page:41(p)
+msgid ""
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
+msgstr ""
+"Halako erroreak gertatzen dira <app>Empathy</app> ezin denean komunikatu "
+"berehalako mezularitzako zerbitzuarekin arrazoiren bat dela-eta."
+
+#: C/prob-conn-neterror.page:45(p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr ""
+"Era berean, errore horiek gertatzen dira saiatzen zarenean IRC kontu bat "
+"erabiltzen goitizenik ezarri gabe."
+
+#: C/prob-conn-neterror.page:52(p)
+#: C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:43(p)
+msgid ""
+"Make sure that you are connected to the Internet, or to a local area "
+"network."
+msgstr "Ziurtatu Internetekin konektatuta zaudela, edo sare lokal batekin."
+
+#: C/prob-conn-neterror.page:57(p)
+#: C/prob-conn-name.page:42(p)
+#: C/prob-conn-auth.page:57(p)
+msgid ""
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+"edit.png\">edit</media> icon in the error message."
+msgstr ""
+"Egin klik <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+"edit.png\">editatu</media> ikonoan, errore-mezuan."
+
+#: C/prob-conn-neterror.page:65(p)
+#: C/prob-conn-acctdisabled.page:59(p)
+msgid ""
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
+msgstr ""
+"Egiaztatu <gui>Aurreratua</gui> atalean xehetasun guztiak ondo dauden ala "
+"ez. Mezularitza-zerbitzuaren webgunean ere badaude xehetasun horiek."
+
+#: C/prob-conn-neterror.page:82(p)
+#: C/prob-conn-auth.page:68(p)
+msgid ""
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
+msgstr ""
+"Desautatu <gui>Gaituta</gui> koadroa, eta hautatu berriro, zerbitzuarekin "
+"berriro konektatzen saiatzeko."
+
+#: C/prob-conn-neterror.page:90(title)
+msgid "Proxy support"
+msgstr "Proxy euskarria"
+
+#: C/prob-conn-neterror.page:91(p)
+msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr "Une honetan,<app>Empathy</app> ezin da konfiguratu proxy-rekin lan egiteko."
+
+#: C/prob-conn-name.page:9(title)
+msgid "“Name in use”"
+msgstr "“Izena hartuta dago”"
+
+#: C/prob-conn-name.page:10(desc)
+msgid ""
+"An error message which says “<gui>Name in use</gui>” appears in the main "
+"window."
+msgstr ""
+"“<gui>Izena hartuta dago</gui>” dioen errore-mezu bat azalduko da leiho "
+"nagusian."
+
+#: C/prob-conn-name.page:32(title)
+msgid "I get a message that says “Name in use”"
+msgstr "“Izena hartuta dago” dioen mezu bat jaso dut"
+
+#: C/prob-conn-name.page:34(p)
+msgid ""
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
+msgstr ""
+"Halako erroreak gertatzen dira saiatzen zarenean zure IRC kontuarekin "
+"konektatzen beste norbaitek sare horretan bertan erabiltzen duen "
+"goitizenarekin."
+
+#: C/prob-conn-name.page:50(p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "<gui>Goitizena</gui> testu-koadroan, idatzi goitizen berria."
+
+#: C/prob-conn-name.page:55(p)
+msgid ""
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
+msgstr ""
+"Pasahitz hori erabiltzen ari zaren sarean erregistratu baduzu, ezarri "
+"goitizen horren pasahitza. Informazio gehiago lortzeko, ikus <link xref"
+"=\"irc-nick-password\"/>."
+
+#: C/prob-conn-name.page:64(p)
+msgid ""
+"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
+"and then select it again to try to reconnect to the service."
+msgstr ""
+"Desautatu zure kontuaren izenaren ondoko <gui>Gaituta</gui> kontrol-laukia, "
+"eta hautatu berriro zerbitzuarekin berriro konektatzeko."
+
+#: C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>” appears in "
+"the main window."
+msgstr ""
+"“<gui>Autentifikazioak huts egin du</gui>” dioen errore-mezu bat azalduko da "
+"leiho nagusian."
+
+#: C/prob-conn-auth.page:36(title)
+msgid "I get a message that says “Authentication failed”"
+msgstr "“Autentifikazioak huts egin du” dioen mezu bat jaso dut"
+
+#: C/prob-conn-auth.page:38(p)
+msgid ""
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
+msgstr ""
+"Horrelako erroreak gertatzen dira zure berehalako mezularitzako zerbitzuak ez "
+"dizunean konektatzen uzten ez duelako ezagutzen zure erabiltzaile-izena edo "
+"pasahitza, arrazoiren bat dela-eta."
+
+#: C/prob-conn-auth.page:50(p)
+msgid ""
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
+msgstr ""
+"Ziurtatu kontu bat erregistratu duzula konektatzen saiatzen ari zaren "
+"zerbitzuarekin. Konturik ez baduzu, zerbitzu gehienek ez dizute konektatzen "
+"utziko."
+
+#: C/prob-conn-auth.page:63(p)
+#: C/prob-conn-acctdisabled.page:54(p)
+msgid "Type your username and password again to make sure that they are correct."
+msgstr ""
+"Idatzi berriro zure erabiltzaile-izena eta pasahitza, zuzenak direla "
+"ziurtatzeko."
+
+#: C/prob-conn-acctdisabled.page:7(desc)
+msgid ""
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr ""
+"Erabili nahi duzun berehalako mezularitzako kontua ez dago gaituta kontuen "
+"zerrendan."
+
+#: C/prob-conn-acctdisabled.page:33(title)
+msgid "My account is not enabled"
+msgstr "Nire kontua ez dago gaituta"
+
+#: C/prob-conn-acctdisabled.page:35(p)
+msgid ""
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
+msgstr ""
+"Erabili nahi duzun berehalako mezularitzako kontua ez badago gaituta "
+"goitibeherako kontu-zerrendan solasaldi berri bat hasten edo gela batean "
+"sartzen saiatzen zarenean, agian kontuaren xehetasunak ez dira zuzenak "
+"izango."
+
+#: C/prob-conn-acctdisabled.page:48(p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
+msgstr ""
+"Aukeratu <guiseq><gui>Editatu</gui><gui>Kontuak</gui></guiseq>, eta hautatu "
+"ondo ez dabilen kontua."
+
+#: C/prob-conn-acctdisabled.page:65(p)
+msgid ""
+"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. If "
+"it is not, select the check-box to enable the account."
+msgstr ""
+"Ziurtatu <gui style=\"checkbox\">Gaituta</gui> kontrol-laukia hautatuta "
+"dagoela. Hautatuta ez badago, hauta ezazu kontrol-laukia, kontua gaitzeko."
+
+#: C/prev-conv.page:8(desc)
+msgid "Browse or search your previous conversations."
+msgstr "Arakatu edo bilatu lehenagoko zure solasaldiak."
+
+#: C/prev-conv.page:35(title)
+msgid "View previous conversations"
+msgstr "Ikusi lehenagoko solasaldiak"
+
+#: C/prev-conv.page:39(p)
+msgid ""
+"Highlighting text is quirky: <link "
+"href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. If "
+"there's an actual highlighting going on, independent of the selection (like "
+"in yellow or something), we can use the term \"highlight\". Otherwise we need "
+"to use the term \"select\". Watch that bug."
+msgstr ""
+"Testua nabarmentzea ez dabil ondo: <link "
+"href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. "
+"Nabarmentzeren bat badago, hautapenetik kanpo (horiz edo horrelako zerbait), "
+"\"nabarmendu\" terminoa erabil dezakegu. Bestela, \"hautatu\" terminoa erabili "
+"behar dugu. Ikus akatsa."
+
+#: C/prev-conv.page:46(p)
+msgid ""
+"<app>Empathy</app> automatically saves all your text conversations you have "
+"with your contacts. You can <link xref=\"#search\">search through all of your "
+"previous conversations</link> or <link xref=\"#browse\">browse previous "
+"conversations</link> by contact and date."
+msgstr ""
+"<app>Empathy</app>-k automatikoki gordetzen ditu zuk kontaktuekin dituzun "
+"testu-solasaldi guztiak. <link xref=\"#search\">Lehenagoko zure solasaldi "
+"guztiak bila ditzakezu</link>, edo <link xref=\"#browse\">lehenagoko "
+"solasaldiak araka ditzakezu</link> kontaktuaren eta dataren arabera."
+
+#: C/prev-conv.page:54(p)
+msgid ""
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr ""
+"Ez duzu Internetekin konektatu beharrik lehenagoko zure solasaldiak ikusteko "
+"eta bilatzeko."
+
+#: C/prev-conv.page:61(title)
+msgid "Search previous conversations"
+msgstr "Bilatu lehenagoko solasaldiak"
+
+#: C/prev-conv.page:63(p)
+msgid ""
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "Testu osoko bilaketa egin dezakezu lehenagoko zure solasaldi guztietan."
+
+#: C/prev-conv.page:67(p)
+#: C/prev-conv.page:96(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose "
+"<guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>. "
+"Alternatively, press <key>F3</key>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, aukeratu "
+"<guiseq><gui>Ikusi</gui><gui>Lehenagoko solasaldiak</gui></guiseq>. Bestela, "
+"sakatu <key>F3</key>."
+
+#: C/prev-conv.page:71(p)
+msgid "Select the <gui>Search</gui> tab."
+msgstr "Hautatu <gui>Bilatu</gui> fitxa."
+
+#: C/prev-conv.page:74(p)
+msgid ""
+"In the <gui>For</gui> field, type the text you want to search for. Click "
+"<gui>Find</gui> or press <key>Enter</key>."
+msgstr ""
+"<gui>Bilatu hau</gui> eremuan, idatzi bilatu nahi duzun testua. Egin klik "
+"<gui>Bilatu</gui> botoian, eta sakatu <key>Sartu</key>."
+
+#: C/prev-conv.page:78(p)
+msgid ""
+"Any conversations that matched your search terms will be shown in the list "
+"below the search field. By default, conversations are ordered by date."
+msgstr ""
+"Zure bilaketa-terminoekin bat datozen solasaldi guztiak beheko zerrendan "
+"azalduko dira, bilaketa-eremuaren azpian. Modu lehenetsian, solasaldiak "
+"dataren arabera ordenatzen dira."
+
+#: C/prev-conv.page:82(p)
+msgid ""
+"Click on a conversation to view it. <app>Empathy</app> will select the text "
+"in the conversation that matched your search terms."
+msgstr ""
+"Egin klik solasaldi batean, ikusteko. <app>Empathy</app>-k zure bilaketa-"
+"terminoekin bat datorren solasaldiko testua hautatuko du."
+
+#: C/prev-conv.page:89(title)
+msgid "Browse previous conversations"
+msgstr "Arakatu lehenagoko solasaldiak"
+
+#: C/prev-conv.page:91(p)
+msgid ""
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr ""
+"Zure kontaktuekin nahiz berriketa-geletan izandako lehenagoko solasaldiak "
+"araka ditzakezu dataren arabera."
+
+#: C/prev-conv.page:100(p)
+msgid "Select the <gui>Conversations</gui> tab."
+msgstr "Hautatu <gui>Solasaldiak</gui> fitxa."
+
+#: C/prev-conv.page:103(p)
+msgid ""
+"Select an account from the drop-down list in the top left. A list of "
+"contacts and chat room for that account will be shown below."
+msgstr ""
+"Hautatu kontu bat goi-ezkerraldeko goitibeherako zerrendan. Kontu horren "
+"kontaktuen eta berriketa-gelen zerrenda bat azalduko da behean."
+
+#: C/prev-conv.page:107(p)
+msgid ""
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr ""
+"Hautatu kontaktua edo berriketa-gela zure lehenagoko solasaldiak ikusteko. "
+"Modu lehenetsian, azken solasaldiak azalduko dira."
+
+#: C/prev-conv.page:111(p)
+msgid ""
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
+msgstr ""
+"Dataren arabera araka ditzakezu solasaldiak. Hautatutako kontaktuarekin "
+"solasaldi bat izandako egunak letra lodiz bistaratuko dira. Egin klik data "
+"batean, hautatzeko. Egin klik hilabetearen eta urtearen ondoko gezietan "
+"lehenagoko datak arakatzeko."
+
+#: C/prev-conv.page:117(p)
+msgid ""
+"You can search for text in the displayed conversation by typing into the "
+"search field at the top. The matching text will be highlighted."
+msgstr ""
+"Bistaratutako solasaldian testua bilatzeko, idatz ezazu goiko bilaketa-"
+"eremuan. Bat datorren testua nabarmenduko da."
+
+#: C/prev-conv.page:121(p)
+msgid ""
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
+"Conversations</gui> window will open with that contact already selected."
+msgstr ""
+"Lehenagoko solasaldiak bizkor ikusteko, joan <gui>Kontaktu-zerrenda</gui> "
+"leihora. Egin klik eskuin-botoiarekin kontaktuan, eta aukeratu <gui>Ikusi "
+"lehenagoko solasaldiak</gui>. <gui>Lehenagoko solasaldiak</gui> leihoa "
+"irekiko da, kontaktu hori hautatuta dagoela."
+
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Batu eta bereizi hainbat kontaktu bakar batean."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Konbinatu eta bereizi kontaktuak"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+"Zure kontakturen batek hainbat kontu baditu mezularitza-zerbitzu batekin "
+"baino gehiagorekin, kontaktu horiek bakar batean konbina ditzakezu."
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+"Horren emaitza <em>metakontaktua</em> izango da: hainbat kontaktuk osatutako "
+"kontaktu bat."
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Baldin baduzu Jane Smith izeneko kontaktu bat, hiru mezularitza-zerbitzu "
+"erabiltzen dituena, esate baterako:"
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Kontaktu horiek konbina ditzakezu Jane Smith izeneko kontaktu bakar batean."
+
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "Kontaktuak konbinatzea"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link "
+"Contacts...</gui>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik eskuin-botoiarekin kontu bat "
+"baino gehiago dituen kontaktu batean, eta hautatu <gui "
+"style=\"menuitem\">Estekatu kontaktuak...</gui>."
+
+#: C/link-contacts.page:70(p)
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"<gui>Estekatu kontaktuak</gui> leihoaren ezkerraldeko panelean, hautatu "
+"konbinatu nahi dituzun kontaktuak."
+
+#: C/link-contacts.page:76(p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Egin klik <gui style=\"button\">Estekatu</gui> botoian."
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+"Metakontaktu bat sortu ondoren, zuk klik bikoitza kontaktuan egitean "
+"solasaldia harekin edukitzeko erabiliko den kontaktu lehenetsia linean "
+"presentzia handiena duen kontaktua izango da."
+
+#: C/link-contacts.page:91(title)
+msgid "Separating contacts"
+msgstr "Kontaktuak bereiztea"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"<gui>Kontaktu-zerrendan</gui>, egin klik eskuin-botoiarekin bereizi "
+"beharreko kontaktuan, eta hautatu <gui style=\"menuitem\">Estekatu "
+"kontaktuak...</gui>."
+
+#: C/link-contacts.page:100(p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Egin klik <gui style=\"button\">Desestekatu</gui> botoian."
+
+#: C/license.page:8(desc)
+msgid "Legal information."
+msgstr "Lege-informazioa."
+
+#: C/license.page:11(title)
+msgid "License"
+msgstr "Lizentzia"
+
+#: C/license.page:12(p)
+msgid ""
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
+msgstr ""
+"CreativeCommons Aitortu-PartekatuBerdin 3.0 Unported lizentziapean banatzen "
+"da lan hau."
+
+#: C/license.page:20(p)
+msgid "You are free:"
+msgstr "Aske zara:"
+
+#: C/license.page:25(em)
+msgid "To share"
+msgstr "Partekatzeko"
+
+#: C/license.page:26(p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Lana kopiatu, banatu eta jendaurrean hedatzeko."
+
+#: C/license.page:29(em)
+msgid "To remix"
+msgstr "Nahasteko"
+
+#: C/license.page:30(p)
+msgid "To adapt the work."
+msgstr "Lana egokitzeko."
+
+#: C/license.page:33(p)
+msgid "Under the following conditions:"
+msgstr "Baldintza hauetan:"
+
+#: C/license.page:38(em)
+msgid "Attribution"
+msgstr "Aitortu"
+
+#: C/license.page:39(p)
+msgid ""
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
+msgstr ""
+"Lanaren kredituak aitortu behar dituzu, egileak edo baimendunak zehaztutako "
+"eran (baina ez aditzera emanez haien babesa duzunik edo haiek lanaren "
+"erabilera hori babesten dutenik)."
+
+#: C/license.page:46(em)
+msgid "Share Alike"
+msgstr "Partekatu baimen beraren arabera"
+
+#: C/license.page:47(p)
+msgid ""
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
+msgstr ""
+"Lan hau aldatzen baldin baduzu, edo lan eratorri bat sortzen baduzu, "
+"sortutako lana bana dezakezu soil-soilik baimen beraren edo antzeko nahiz "
+"bateragarri baten mende."
+
+#: C/license.page:53(p)
+msgid ""
+"For the full text of the license, see the <link "
+"href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/legalcode\">CreativeCommons website</link>, or read the full <link "
+"href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
+msgstr ""
+"Lizentziaren testu osoa irakurtzeko, ikus <link "
+"href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/legalcode\">CreativeCommons webgunea</link>, edo irakurri <link "
+"href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
+
+#: C/irc-start-conversation.page:8(desc)
+msgid "Start a conversation witn an IRC contact."
+msgstr "Hasi solasaldi bat IRC kontaktu batekin."
+
+#: C/irc-start-conversation.page:30(title)
+msgid "Chat with somebody on IRC"
+msgstr "Egin berriketan IRCko norbaitekin"
+
+#: C/irc-start-conversation.page:32(p)
+msgid ""
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr ""
+"Solasaldi pribatuak izan ditzakezu IRC erabiltzaileekin, IRC berriketa-gela "
+"publikoetatik kanpo. Solasaldi bat hasteko beste IRC erabiltzaile batekin:"
+
+#: C/irc-start-conversation.page:37(p)
+msgid ""
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
+msgstr ""
+"IRC berriketa-gela bateko kontaktu-zerrendan, egin klik bikoitza berriketan "
+"egin nahi duzun erabiltzailean. Bestela, egin klik eskuin-botoiarekin "
+"erabiltzailean, eta aukeratu <gui>Berriketa</gui>."
+
+#: C/irc-start-conversation.page:45(p)
+msgid ""
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
+msgstr ""
+"IRC gelako kontaktu-zerrenda ez da <app>Empathy</app>-ren kontaktu-zerrenda "
+"bera. Zu sartu zaren IRC berriketa-gelako erabiltzaileen zerrenda dauka. "
+"Gela bakoitzak kontaktu desberdinak izan ditzake zerrendan."
+
+#: C/irc-start-conversation.page:52(p)
+msgid ""
+"The IRC room contact list is usually on the right side of the IRC room "
+"window. If you do not see it, choose "
+"<guiseq><gui>Conversation</gui><gui>Show Contact List</gui></guiseq>."
+msgstr ""
+"IRC gelako kontaktu-zerrenda IRC gelaren leihoaren eskuinaldean egoten da "
+"normalean. Ez baduzu ikusten, aukeratu "
+"<guiseq><gui>Solasaldia</gui><gui>Erakutsi kontaktu-zerrenda</gui></guiseq>."
+
+#: C/irc-send-file.page:9(desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr ""
+"<app>Empathy</app>-k ez du onartzen gaur egun fitxategiak IRC bidez "
+"bidaltzea."
+
+#: C/irc-send-file.page:31(title)
+msgid "Send files over IRC"
+msgstr "Bidali fitxategiak IRC bidez"
+
+#: C/irc-send-file.page:33(p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Gaur egun, ezin da fitxategirik bidali IRC bidez."
+
+#: C/irc-nick-password.page:10(desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Babestu zure goitizena beste IRC erabiltzaileek erabil ez dezaten."
+
+#: C/irc-nick-password.page:33(title)
+msgid "Use a nickname password on IRC"
+msgstr "Erabili goitizen-pasahitz bat IRCn"
+
+#: C/irc-nick-password.page:35(p)
+msgid ""
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join "
+"without a registered nickname."
+msgstr ""
+"IRC sare batzuetan, zure goitizena erregistra dezakezu, NickServ izeneko "
+"zerbitzuarekin. NickServ-i mezu bereziak bidaliz gero, zure pasahitza ezarri "
+"eta zure burua identifikatu ahal izango duzu. Baliteke IRC berriketa-gela "
+"batzuek ez onartzea zu erregistratutako goitizenik gabe sartzea."
+
+#: C/irc-nick-password.page:40(p)
+msgid ""
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
+msgstr ""
+"<app>Empathy</app>-k gaur egun ez du onartzen goitizen-erregistrorik. IRC "
+"sare batzuek, nolanahi ere, automatikoki bidaliko dute <em>zerbitzariko "
+"pasahitz</em> bat NickServ-era. Sare horietan, IRC pasahitza erabil dezakezu "
+"<app>Empathy</app>-n, zure burua identifikatzeko NickServ-en. Freenode sare "
+"ezagunak badu eginbide hori."
+
+#: C/irc-nick-password.page:46(p)
+msgid "To set an IRC server password:"
+msgstr "IRC zerbitzariaren pasahitza ezartzeko:"
+
+#: C/irc-nick-password.page:54(p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Hautatu IRC kontua elkarrizketa-koadroaren ezkerraldeko zerrendan."
+
+#: C/irc-nick-password.page:57(p)
+msgid ""
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr ""
+"<gui>Pasahitza</gui> eremuan, idatzi zure goitizena erregistratzeko erabili "
+"duzun pasahitza."
+
+#: C/irc-nick-password.page:63(p)
+#: C/import-account.page:61(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Egin klik <gui style=\"button\">Aplikatu</gui> botoian."
+
+#: C/irc-nick-password.page:69(p)
+msgid ""
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
+msgstr ""
+"Jarraibide horiek pasahitzez babestutako goitizena IRC sare batzuetan "
+"bakarrik erabiltzeko aukera ematen dizute. Gaur egun, ezin da IRC goitizenik "
+"erregistratu edo goitizenik aldatu <app>Empathy</app>-rekin."
+
+#: C/irc-manage.page:9(desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Nola erabili IRC <app>Empathy</app>-rekin."
+
+#: C/irc-manage.page:34(title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Interneteko berriketa-zerbitzua (Internet Relay Chat: IRC)"
+
+#: C/irc-manage.page:37(p)
+#: C/account-irc.page:39(p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"<sys>telepathy-idle</sys> paketea instalatuta eduki behar duzu IRC "
+"<app>Empathy</app>-n erabili ahal izateko."
+
+#: C/irc-manage.page:43(title)
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC berriketa-gelak eta solasaldiak"
+
+#: C/irc-manage.page:45(title)
+msgid "Chat Rooms and Conversations"
+msgstr "Berriketa-gelak eta solasaldiak"
+
+#: C/irc-manage.page:50(title)
+msgid "Common IRC Problems"
+msgstr "IRC arazorik ohikoenak"
+
+#: C/irc-manage.page:52(title)
+#: C/index.page:55(title)
+msgid "Common Problems"
+msgstr "Arazorik ohikoenak"
+
+#: C/irc-join-room.page:8(desc)
+msgid "Join an IRC channel."
+msgstr "Sartu IRC kanal batean."
+
+#: C/irc-join-room.page:31(title)
+msgid "Join an IRC chat room"
+msgstr "Sartu IRC berriketa-gela batean"
+
+#: C/irc-join-room.page:33(p)
+msgid ""
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
+msgstr ""
+"IRC berriketa-geletan (IRC kanal gisa ere ezagutzendira) sar zaitezke "
+"konektatuta zauden IRC sare guztietan. IRC sare batekin konektatzeko, ikus "
+"<link xref=\"add-account\"/> eta <link xref=\"account-irc\"/>."
+
+#: C/irc-join-room.page:39(p)
+#: C/group-conversations.page:58(p)
+#: C/group-conversations.page:122(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose "
+"<guiseq><gui>Room</gui><gui>Join</gui></guiseq>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, aukeratu "
+"<guiseq><gui>Gela</gui><gui>Sartu</gui></guiseq>."
+
+#: C/irc-join-room.page:45(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr ""
+"Goitibeherako <gui>Kontua</gui> zerrendan, hautatu erabili nahi duzun "
+"sareari dagokion IRC kontua."
+
+#: C/irc-join-room.page:51(p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
+msgstr ""
+"<gui>Gela</gui> testu-koadroan, idatzi sartu nahi duzun kanalaren izena. IRC "
+"kanal-izenak traolarekin (<sys>#</sys>) hasten dira."
+
+#: C/irc-join-room.page:57(p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Egin klik <gui>Sartu</gui> botoian, gelan sartzeko."
+
+#: C/irc-join-room.page:64(p)
+msgid "To join multiple rooms, you need to repeat the steps above for each room."
+msgstr ""
+"Hainbat gelatan sartzeko, goiko urratsak errepikatu behar dituzu gela "
+"bakoitzean."
+
+#: C/irc-join-pwd.page:9(desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Sartu pasahitzez babestutako IRC berriketa-gelak."
+
+#: C/irc-join-pwd.page:25(title)
+msgid "Join a protected IRC chat room"
+msgstr "Sartu babestutako IRC berriketa-gela batean"
+
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
+msgstr ""
+"IRC sare batzuetan, IRC gela pribatuak pasahitz batez babestuta egon "
+"daitezke. Pasahitza badakizu, erabili hurrengo urratsak sartzeko:"
+
+#: C/irc-join-pwd.page:33(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Sartu gelan</link> normalean bezala."
+
+#: C/irc-join-pwd.page:38(p)
+msgid ""
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
+msgstr ""
+"Empathy-k pasahitza eskatuko dizu. Sartu IRC berriketa-gelaren pasahitza, "
+"eta egin klik <gui style=\"button\">Sartu</gui> botoian."
+
+#: C/irc-commands.page:7(desc)
+msgid "The supported IRC commands."
+msgstr "Onartutako IRC komandoak."
+
+#: C/irc-commands.page:18(title)
+msgid "Supported IRC commands"
+msgstr "Onartutako IRC komandoak"
+
+#: C/irc-commands.page:19(p)
+msgid ""
+"To see the list of the supported IRC commands, in a chat room type "
+"<input>/help</input> and press <key>Enter</key>."
+msgstr ""
+"Onartutako IRC komandoen zerrenda ikusteko, idatzi <input>/help</input> "
+"berriketa-gela batean, eta sakatu <key>Sartu</key>."
+
+#: C/irc-commands.page:24(p)
+msgid "All commands available have a small description on their usage."
+msgstr ""
+"Komando erabilgarri guztiek beren erabilerari buruzko azalpen laburra "
+"daukate."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/introduction.page:41(None)
+msgid ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=489ba00b0fc377aba4c691210b6e0650"
+msgstr ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=489ba00b0fc377aba4c691210b6e0650"
+
+#: C/introduction.page:9(desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "<app>Empathy</app> berehalako mezulariaren sarrera."
+
+#: C/introduction.page:21(title)
+msgid "Introduction"
+msgstr "Sarrera"
+
+#: C/introduction.page:23(p)
+msgid ""
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
+msgstr ""
+"<app>Empathy</app> berehalako mezularitza-aplikazioa da GNOME mahaigainerako. "
+"Testu-mezularitza, ahots- eta bideo-deiak, fitxategi-transferentziak, eta "
+"gehien erabilitako mezularitza-sistemak, MSN eta Google Talk, esate "
+"baterako."
+
+#: C/introduction.page:28(p)
+msgid ""
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
+msgstr ""
+"<app>Empathy</app>-k lanean zaudenean elkarlanean aritzen lagunduko dizuten "
+"eginbideak dauzka, lagunekin harremanetan errazago egoteko."
+
+#: C/introduction.page:32(p)
+msgid ""
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
+msgstr ""
+"<app>Empathy</app> erabiliz gero, solasaldi guztiak leiho bakar batean "
+"taldeka ditzakezu, hainbat leiho eduki hainbat solasaldi motatarako, "
+"lehenagoko solasaldietan erraz bilatu, eta zure mahaigaina partekatu bi klik "
+"bakarrik eginez."
+
+#: C/introduction.page:39(title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>Kontaktu-zerrenda</gui> leihoa"
+
+#: C/introduction.page:40(desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app> leiho nagusia"
+
+#: C/introduction.page:42(p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app> leiho nagusia."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:28(None)
+msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+
+#: C/index.page:7(title)
+#: C/index.page:8(title)
+msgid "Empathy Internet Messenger"
+msgstr "Empathy Internet mezularitza"
+
+#: C/index.page:27(title)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy "
+"Internet Messenger logo </media> Empathy Internet Messenger"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy "
+"Internet mezularitzaren logotipoa </media> Empathy Internet mezularitza"
+
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Kontuaren kudeaketa"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Kontaktuak kudeatzea"
+
+#: C/index.page:43(title)
+msgid "Text Conversations"
+msgstr "Testu-solasaldiak"
+
+#: C/index.page:47(title)
+msgid "Audio and Video Conversations"
+msgstr "Audio- eta bideo-solasaldiak"
+
+#: C/index.page:51(title)
+msgid "Advanced Actions"
+msgstr "Ekintza aurreratuak"
+
+#: C/import-account.page:10(desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Inportatu kontu bat berehalako mezularitzako beste aplikazio batetik."
+
+#: C/import-account.page:19(name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
+
+#: C/import-account.page:20(email)
+msgid "peter.haslam@freenet.de"
+msgstr "peter.haslam@freenet.de"
+
+#: C/import-account.page:42(title)
+msgid "Import an existing account"
+msgstr "Inportatu lehendik dagoen kontu bat"
+
+#: C/import-account.page:44(p)
+msgid ""
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
+msgstr ""
+"<app>Empathy</app> exekutatzen duzun lehen aldian, aukera emango dizu zure "
+"kontuak beste berehalako mezularitzako aplikazioetatik inportatzeko. Une "
+"honetan, onartzen den aplikazio bakarra <app>Pidgin</app> da."
+
+#: C/import-account.page:50(p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"Exekutatu <app>Empathy</app> lehen aldiz. Laguntzaile batek hainbat aukera "
+"emango dizkizu kontu berriak sortzeko."
+
+#: C/import-account.page:54(p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Hautatu <gui>Bai, inportatu nire kontu-xehetasunak hemendik</gui>, eta egin "
+"klik <gui>Aurrera</gui> botoian."
+
+#: C/import-account.page:58(p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Hautatu inportatu nahi duzun kontu bakoitzaren ondoko kontrol-laukia."
+
+#: C/import-account.page:66(p)
+msgid ""
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
+msgstr "Gaur egun ezin da konturik inportatu lehen aldiko laguntzailea osatu arte."
+
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Ezkutatu lineaz kanpoko kontaktuak <gui>Kontaktu-zerrendan</gui>."
+
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Ezkutatu lineaz kanpoko kontaktuak"
+
+#: C/hide-contacts.page:21(p)
+msgid ""
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
+msgstr ""
+"Normalean, <app>Empathy</app>-k zure kontaktu guztiak erakusten ditu: linean "
+"daudenak (horiekin solasaldi bat izan dezakezu), eta lineaz kanpo daudenak."
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Lineaz kanpo dauden kontaktuak ezkutatzeko:"
+
+#: C/hide-contacts.page:31(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose "
+"<guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>, or press "
+"<keyseq><key>Ctrl</key><key>H</key></keyseq>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, aukeratu "
+"<guiseq><gui>Ikusi</gui><gui>Lineaz kanpoko kontaktuak</gui></guiseq>, edo "
+"sakatu <keyseq><key>Ktrl</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "Lineaz kanpoko kontaktuak berriro erakusteko, errepikatu goiko prozedura."
+
+#: C/group-conversations.page:8(desc)
+msgid "Start or join a group conversation with your contacts."
+msgstr "Hasi edo sartu talde-solasaldi batean zure kontaktuekin."
+
+#: C/group-conversations.page:34(title)
+msgid "Group conversations"
+msgstr "Talde-solasaldiak"
+
+#: C/group-conversations.page:36(p)
+msgid ""
+"Group conversations permits you to have text conversations with more than "
+"one contact at the same time."
+msgstr ""
+"Talde-solasaldiek aukera ematen dizute testu-solasaldiak edukitzeko kontaktu "
+"batekin baino gehiagorekin batera."
+
+#: C/group-conversations.page:40(p)
+msgid ""
+"To have a group conversation you need to have a registered account with "
+"either Jabber or Google Talk, or a People Nearby account."
+msgstr ""
+"Talde-solasaldi bat edukitzeko, Jabber edo Google Talk-en erregistratutako "
+"kontu bat eduki behar duzu, edo Hurbileko jendea zerbitzuaren kontu bat."
+
+#: C/group-conversations.page:46(p)
+msgid ""
+"You can have a group conversation only with the contacts that are using the "
+"same service as yours."
+msgstr ""
+"Talde-solasaldi bat edukitzeko, kontaktuek zure zerbitzu bera erabili behar "
+"dute."
+
+#: C/group-conversations.page:54(title)
+msgid "Start a group conversation"
+msgstr "Hasi talde-solasaldi bat"
+
+#: C/group-conversations.page:63(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"use for the group conversation."
+msgstr ""
+"Goitibeherako <gui>Kontua</gui> zerrendan, hautatu talde-solasaldirako "
+"erabili nahi duzun kontua."
+
+#: C/group-conversations.page:69(p)
+msgid ""
+"In the <gui>Server</gui> text box, type the name of server in which the "
+"conversation will be hosted."
+msgstr ""
+"<gui>Zerbitzaria</gui> testu-koadroan, idatzi solasaldiaren ostalaria izango "
+"den zerbitzariaren izena."
+
+#: C/group-conversations.page:73(p)
+msgid "Leave it empty if it will be on the current server."
+msgstr "Utzi hutsik, uneko zerbitzarian balitz."
+
+#: C/group-conversations.page:78(p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name you want to give to the "
+"conversation."
+msgstr "<gui>Gela</gui> testu-koadroan, idatzi solasaldiari eman nahi diozun izena."
+
+#: C/group-conversations.page:82(p)
+msgid ""
+"This will be the name of the room you are going to have a conversation. This "
+"name will be publicly available for other people to join. It is not "
+"possible to create a private room."
+msgstr ""
+"Solasaldia izango duzun gelaren izena izango da. Izen hori publikoki "
+"erabilgarria izango da sartzen diren besteentzat. Ezin da gela pribaturik "
+"sortu."
+
+#: C/group-conversations.page:90(p)
+msgid ""
+"To invite other contacts to join the group conversation, from the "
+"<gui>Contact List</gui> window, select the contact you want to invite, and "
+"perform one of the following:"
+msgstr ""
+"Beste kontaktuak talde-solasaldian sartzeko gonbidatzeko, <gui>Kontaktu-"
+"zerrenda</gui> leihoan, hautatu gonbidatu nahi duzun kontaktua, eta egin "
+"hauetako bat:"
+
+#: C/group-conversations.page:97(p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+msgstr ""
+"Egin klik eskuin-botoiarekin kontaktuan, eta aukeratu <gui>Gonbidatu "
+"berriketa-gelara</gui>."
+
+#: C/group-conversations.page:102(p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to "
+"chatroom</gui></guiseq>."
+msgstr ""
+"Aukeratu <guiseq><gui>Editatu</gui><gui>Kontaktua</gui><gui>Gonbidatu "
+"berriketa-gelara</gui></guiseq>."
+
+#: C/group-conversations.page:107(p)
+msgid ""
+"If you have more than one group conversation open, select the one you want "
+"to invite your contacts."
+msgstr ""
+"Talde-solasaldi bat baino gehiago irekita badauzkazu, hautatu kontaktuak "
+"gonbidatu nahi dituzuna."
+
+#: C/group-conversations.page:118(title)
+msgid "Join a group conversation"
+msgstr "Sartu talde-solasaldi batean"
+
+#: C/group-conversations.page:128(p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
+msgstr "Zabaldu <gui>Gelen zerrenda</gui> atala, dauden gela guztiak ikusteko."
+
+#: C/group-conversations.page:133(p)
+msgid "Double-click on the name of a room to join it."
+msgstr "Egin klik bikoitza gela baten izenean, bertan sartzeko."
+
+#: C/group-conversations.page:139(p)
+msgid ""
+"It is not possible to join all existing rooms. Some of the rooms might "
+"require a password, or might be invitation only. <app>Empathy</app> does not "
+"support these kind of rooms."
+msgstr ""
+"Ezin da sartu dauden gela guztietan. Gela batzuek pasahitza behar dezakete, "
+"edo gonbidapenarekin nahikoa izan daiteke agian. <app>Empathy</app>-k ez "
+"ditu horrelako gelak onartzen."
+
+#: C/geolocation-what-is.page:9(desc)
+msgid "Understanding geolocation."
+msgstr "Geokokalekua ulertzea."
+
+#: C/geolocation-what-is.page:33(title)
+msgid "What is geolocation"
+msgstr "Zer da geokokalekua?"
+
+#: C/geolocation-what-is.page:35(p)
+msgid ""
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
+msgstr ""
+"Geokokalekuak aukera ematen dizu Internetekin konektatutako ordenagailu "
+"nahiz gailu baten benetako kokaleku geografikoa identifikatzeko."
+
+#: C/geolocation-what-is.page:37(p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Geokokalekuari esker, hau dena egin dezakezu <app>Empathy</app>-n:"
+
+#: C/geolocation-what-is.page:42(p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Zure kokaleku geografikoa zure kontaktuei argitaratu."
+
+#: C/geolocation-what-is.page:47(p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr ""
+"Ikusi zure kontaktuen kokaleku geografikoa, eta jarri haiekin bizkor "
+"harremanetan."
+
+#: C/geolocation-what-is.page:52(p)
+msgid ""
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr ""
+"Ezarri zure kokalekuaren zehaztasuna, eta zure kokalekua aurkitzeko "
+"erabilitako gailua."
+
+#: C/geolocation-what-is.page:60(p)
+msgid ""
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
+msgstr ""
+"Zure kontaktuen kokaleku geografikoak ikusi ahal izateko, geokokalekua "
+"onartzen duten zerbitzua eta aplikazioa erabili behar dituzte."
+
+#: C/geolocation-turn.page:9(desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Nola aktibatu eta desaktibatu geokokalekua <app>Empathy</app>-n?"
+
+#: C/geolocation-turn.page:33(title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Aktibatu/desaktibatu geokokalekua"
+
+#: C/geolocation-turn.page:37(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Aukeratu <guiseq><gui>Editatu</gui><gui>Hobespenak</gui></guiseq>."
+
+#: C/geolocation-turn.page:42(p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Hautatu <gui>Kokalekua</gui> fitxa."
+
+#: C/geolocation-turn.page:47(p)
+msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr ""
+"Hautatu <gui>Argitaratu kokalekua nire kontaktuei</gui> geokokalekua "
+"aktibatzeko."
+
+#: C/geolocation-turn.page:50(p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Geokokalekua desaktibatzeko, desauta ezazu."
+
+#: C/geolocation-turn.page:55(p)
+msgid ""
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
+msgstr ""
+"Zure kokalekuaren zehaztasuna handiagotzeko, desautatu <gui>Txikiagotu "
+"kokalekuaren zehaztasuna</gui>."
+
+#: C/geolocation-turn.page:61(p)
+msgid ""
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"section."
+msgstr ""
+"Kanpoko gailu bat badaukazu (GPS bat, esate baterako), edo kokaleku "
+"zehatzago bat bidali nahi baduzu, hautatu dagokion aukera <gui>Geoclue "
+"ezarpenak</gui> atalean."
+
+#: C/geolocation-supported.page:7(desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Geokokalekua eta bateragarritasuna onartzen dituzten zerbitzuak."
+
+#: C/geolocation-supported.page:31(title)
+msgid "Supported services"
+msgstr "Onartutako zerbitzuak"
+
+#: C/geolocation-supported.page:33(p)
+msgid ""
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
+msgstr ""
+"Geokokalekuaren eginbidea Jabber zerbitzuarekin bakarrik erabil daiteke gaur "
+"egun. Erabili ahal izateko, bai zuk eta bai zure kontaktuek Jabber kontu "
+"bat eduki behar duzue."
+
+#: C/geolocation-supported.page:39(p)
+msgid ""
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
+msgstr ""
+"Erabiltzen ari zaren zerbitzariak ere onartu behar du geokokalekuaren "
+"eginbidea. Jabber zerbitzari gehienek onartzen dute. Ikus zure zerbitzuaren "
+"webguneko dokumentazioa informazio gehiago izateko."
+
+#: C/geolocation-supported.page:47(title)
+msgid "Compatibility"
+msgstr "Bateragarritasuna"
+
+#: C/geolocation-supported.page:49(p)
+msgid ""
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
+msgstr ""
+"<app>Empathy</app>-ren geokokalekuaren eginbidea ez da bateragarria beste "
+"zerbitzuekin (<em>Google Latitude</em>, <em>Yahoo Fire Eagle</em>, "
+"<em>Brightkite</em>...)."
+
+#: C/geolocation-privacy.page:8(desc)
+msgid "What information are sent and to who."
+msgstr "Zein informazio bidaltzen da, eta nori?"
+
+#: C/geolocation-privacy.page:32(title)
+msgid "Geolocation Privacy"
+msgstr "Geokokalekuaren pribatutasuna"
+
+#: C/geolocation-privacy.page:35(title)
+msgid "What information is sent"
+msgstr "Zein informazio bidaltzen da?"
+
+#: C/geolocation-privacy.page:36(p)
+msgid ""
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
+msgstr ""
+"Hau dena bidal daiteke: zure herrialdea, eskualdea, hiria edo herria, area, "
+"kalea, eraikina, solairua, letra, eta posta-kodea, longitudea, latitudea, "
+"altitudea, abiadura eta orientazioa."
+
+#: C/geolocation-privacy.page:40(p)
+msgid ""
+"The accuracy and the quantity of information about your geographical "
+"position are based on the software or on the infrastructure used to discover "
+"your position."
+msgstr ""
+"Zure kokaleku geografikoari buruzko informazioaren kopurua eta zehaztasuna "
+"oinarrituta daude zure kokalekua aurkitzeko erabilitako azpiegituraren "
+"softwarean."
+
+#: C/geolocation-privacy.page:44(p)
+msgid ""
+"Different kind of networks may have different accuracy settings, and may "
+"send different information. The use of external devices such as GPS or "
+"mobile phone will increase the accuracy of the information sent."
+msgstr ""
+"Hainbat sare motak zehaztasun-ezarpen desberdinak eduki ditzakete, eta "
+"informazio desberdina bidal dezakete. Kanpoko gailuak erabiltzea, GPSak edo "
+"telefono mugikorrak esate baterako, bidalitako informazioaren zehaztasuna "
+"handiagotuko dute."
+
+#: C/geolocation-privacy.page:49(p)
+msgid ""
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
+msgstr ""
+"Pribatutasun modua gaituta dagoenean, hiria besterik ez da bidaliko, kanpoko "
+"gailu bat erabiltzen ari bazara ere."
+
+#: C/geolocation-privacy.page:56(title)
+msgid "Who can see the information sent"
+msgstr "Nork ikus dezake bidalitako informazioa?"
+
+#: C/geolocation-privacy.page:57(p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Zure kontaktuek bakarrik ikusi ahal izango dute zure kokaleku geografikoa."
+
+#: C/geolocation-privacy.page:63(title)
+msgid "What is the privacy mode"
+msgstr "Zer da pribatutasun modua?"
+
+#: C/geolocation-privacy.page:64(p)
+msgid ""
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
+msgstr ""
+"Pribatutasun modua modu lehenetsian gaitua dago, eta zure kontaktuei "
+"bidalitako kokaleku geografikoaren zehaztasuna txikiagotuko du."
+
+#: C/geolocation-privacy.page:71(title)
+msgid "Privacy overview"
+msgstr "Pribatutasunaren sarrera"
+
+#: C/geolocation-privacy.page:72(p)
+msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr ""
+"<app>Empathy</app>-ren geokokalekuaren pribatutasun-ezarpenen ikuspegi "
+"orokorra."
+
+#: C/geolocation-privacy.page:77(p)
+msgid "Geolocation is not enabled by default."
+msgstr "Geokokalekua ez dago gaituta modu lehenetsian."
+
+#: C/geolocation-privacy.page:82(p)
+msgid "Privacy mode is enabled by default."
+msgstr "Pribatutasun modua dago modu lehenetsian gaituta."
+
+#: C/geolocation-privacy.page:87(p)
+msgid "Privacy mode prevails even when using external and more precise devices."
+msgstr ""
+"Pribatutasun modua aplikatuko da, kanpoko gailuak nahiz gailu zehatzagoak "
+"erabili arren."
+
+#: C/geolocation-privacy.page:92(p)
+msgid "Only your contacts can see your position."
+msgstr "Zure kontaktuek bakarrik ikusi ahal izango dute zure kokalekua."
+
+#: C/geolocation-not-showing.page:8(desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app>-k ez du argitaratzen nire kokaleku geografikoa."
+
+#: C/geolocation-not-showing.page:32(title)
+msgid "Geographical position not published"
+msgstr "Kokaleku geografikoa ez da argitaratu"
+
+#: C/geolocation-not-showing.page:34(p)
+msgid ""
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
+msgstr ""
+"Zure kontaktuek ezin badute zure kokalekua ikusi, agian <app>Empathy</app>-k "
+"ezingo du aurkitu zure kokaleku geografikoa zehaztasun-marjina on batekin."
+
+#: C/geolocation-not-showing.page:38(p)
+msgid ""
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
+msgstr ""
+"Kasu horretan, zure kokalekua ez da argitaratuko, baina zure kontaktuen "
+"kokalekua ikusi ahal izango duzu."
+
+#: C/geolocation-not-showing.page:42(p)
+msgid ""
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr ""
+"Zure kokaleku geografikoa argitaratu nahi baduzu, saiatu kanpoko gailu bat "
+"erabiltzen, GPS bat, esate baterako."
+
+#: C/geolocation-not-showing.page:48(p)
+msgid ""
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link "
+"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">servers which "
+"support PEP</link> is maintained online. Google Talk does not support this "
+"feature at this time."
+msgstr ""
+"Zure kokaleku geografikoa argitaratu ahal izateko, zure Jabber zerbitzariak "
+"Personal Eventing Protocol (PEP) onartu behar du. <link "
+"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">PEP onartzen "
+"duten zerbitzarien</link> zerrenda bat mantentzen da linean. Google Talk-ek "
+"ez du, gaur egun, eginbide hau onartzen."
+
+#: C/geolocation.page:8(desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Erabili eta ulertu geokokalekua <app>Empathy</app>-n."
+
+#: C/geolocation.page:32(title)
+msgid "Geographical position"
+msgstr "Kokaleku geografikoa"
+
+#: C/geolocation.page:35(title)
+msgid "Geolocation"
+msgstr "Geokokalekua"
+
+#: C/geolocation.page:39(title)
+msgid "Fix common problems"
+msgstr "Konpondu arazorik ohikoenak"
+
+#: C/favorite-rooms.page:10(desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Ezarri, sartu eta kudeatu gela gogokoenak."
+
+#: C/favorite-rooms.page:29(title)
+msgid "Favorite rooms"
+msgstr "Gela gogokoenak"
+
+#: C/favorite-rooms.page:32(title)
+msgid "Set a room as a favorite"
+msgstr "Ezarri gela bat gogoko gisa"
+
+#: C/favorite-rooms.page:35(p)
+msgid "Join a room."
+msgstr "Sartu gela batean."
+
+#: C/favorite-rooms.page:40(p)
+msgid ""
+"See <link xref=\"irc-join-room\"/> for more information on how to join an IRC "
+"room."
+msgstr "Ikus <link xref=\"irc-join-room\"/>, IRC gela batean nola sartu jakiteko."
+
+#: C/favorite-rooms.page:46(p)
+msgid ""
+"See <link xref=\"group-conversations\"/> for more information on how to start "
+"or join a group conversation."
+msgstr ""
+"Ikus <link xref=\"group-conversations\"/>, talde-solasaldi bat nola hasi edo "
+"bertan nola sartu jakiteko."
+
+#: C/favorite-rooms.page:54(p)
+msgid ""
+"From the conversation window, choose "
+"<guiseq><gui>Conversation</gui><gui>Favorite Chat Room</gui></guiseq>."
+msgstr ""
+"Solasaldiaren leihoan, hautatu <guiseq><gui>Solasaldia</gui><gui>Berriketa-"
+"gela gogokoena</gui></guiseq>."
+
+#: C/favorite-rooms.page:63(title)
+msgid "Join favorite rooms"
+msgstr "Sartu gela gogokoenetan"
+
+#: C/favorite-rooms.page:71(p)
+msgid "Press <key>F5</key>."
+msgstr "Sakatu <key>F5</key>."
+
+#: C/favorite-rooms.page:76(p)
+msgid ""
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
+msgstr ""
+"Aukeratu <guiseq><gui>Gela</gui><gui>Sartu gogokoetan</gui></guiseq>, zure "
+"gela gogoko guztietan sartzeko."
+
+#: C/favorite-rooms.page:82(p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Aukeratu <gui>Gela</gui>, eta hautatu zein gela gogokotan sartu nahi duzun."
+
+#: C/favorite-rooms.page:90(p)
+msgid ""
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr ""
+"Gela gogoko batean sartzeko, Internetekin eta zure kontuarekin konektatuta "
+"egon behar duzu."
+
+#: C/favorite-rooms.page:98(title)
+msgid "Manage favorite rooms"
+msgstr "Kudeatu gela gogokoak"
+
+#: C/favorite-rooms.page:101(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose "
+"<guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, aukeratu "
+"<guiseq><gui>Gela</gui><gui>Kudeatu gogokoak</gui></guiseq>."
+
+#: C/favorite-rooms.page:107(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr ""
+"Goitibeherako <gui>Kontua</gui> zerrendan, hautatu zein kontutan kudeatu "
+"nahi dituzun gela gogokoak."
+
+#: C/favorite-rooms.page:111(p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Hautatu <gui>Denak</gui> zure gela gogoko guztiak ikusteko."
+
+#: C/favorite-rooms.page:116(p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Hautatu kudeatu nahi duzun gela gogokoa:"
+
+#: C/favorite-rooms.page:121(p)
+msgid ""
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
+msgstr ""
+"Hautatu <gui>Automatikoki konektatu</gui> kontrol-laukia, kontu horrekin "
+"konektatzen zarenean automatikoki gela horretan sartzeko."
+
+#: C/favorite-rooms.page:127(p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Egin klik <gui>Kendu</gui> botoian, gela gogokoetatik kentzeko."
+
+#: C/favorite-rooms.page:134(p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Amaitutakoan, egin klik <gui>Itxi</gui> botoian."
+
+#: C/disable-account.page:9(desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Eragotzi <app>Empathy</app>-k kontu batean saioa automatikoki hastea."
+
+#: C/disable-account.page:39(title)
+msgid "Disable an account"
+msgstr "Desgaitu kontu bat"
+
+#: C/disable-account.page:41(p)
+msgid ""
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
+msgstr ""
+"Kontu bat desgaitu dezakezu, <app>Empathy</app> kontu horretan saioa has ez "
+"dezan baina kontua guztiz kendu gabe. Agian kontua desgaitu eta birgaitu "
+"nahi izango duzu, hainbatetan bakarrik hasi nahi baduzu saioa kontu "
+"horretan, baina <app>Empathy</app> erabili nahi baduzu beste kontu "
+"batzuekin."
+
+#: C/disable-account.page:52(p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Hautatu kontuen zerrendan desgaitu nahi duzun kontua, leihoaren "
+"ezkerraldean."
+
+#: C/disable-account.page:56(p)
+msgid ""
+"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+"window."
+msgstr "Desautatu <gui style=\"checkbox\">Gaituta</gui>, leihoaren eskuinaldean."
+
+#: C/disable-account.page:62(p)
+msgid "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
+msgstr "Kontua berriro gaitzeko, hautatu <gui style=\"checkbox\">Gaituta</gui>."
+
+#: C/create-account.page:9(desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Erregistratu kontu baterako onartutako mezularitza-zerbitzuetako batekin."
+
+#: C/create-account.page:33(title)
+msgid "Register for a new account"
+msgstr "Erregistratu kontu berri baterako"
+
+#: C/create-account.page:35(p)
+msgid ""
+"Most account types require you to create an account with a account provider "
+"before you can connect using instant messaging applications like "
+"<app>Empathy</app>. With some account providers, you can use "
+"<app>Empathy</app> to register for a new account, using the same steps as "
+"you would to <link xref=\"add-account\">add an account</link>."
+msgstr ""
+"Kontu mota gehienek zuk kontu-hornitzaile batekin kontu bat sortzea eskatzen "
+"dute, <app>Empathy</app> bezalako berehalako mezularitzako aplikazioak "
+"erabiliz konektatu ahal izateko. Kontu-hornitzaile batzuekin "
+"<app>Empathy</app> erabil dezakezu kontu berri batean erregistratzeko, <link "
+"xref=\"add-account\">kontu bat gehitzeko</link> erabiliko zenituzkeen urrats "
+"berekin."
+
+#: C/create-account.page:41(p)
+msgid ""
+"This page provides information on creating a new account for various types "
+"of accounts. Your account provider should give you a login ID and a "
+"password, as well as any additional information you need to connect using "
+"<app>Empathy</app>."
+msgstr ""
+"Orri honetan hainbat kontu mota berri nola sortu azaltzen da. Zure kontu-"
+"hornitzaileak saio-hasierako ID eta pasahitz bat eman beharko lizkizuke, "
+"baita <app>Empathy</app> erabiliz konektatzeko behar duzun edozein "
+"informazio gehigarri."
+
+#: C/create-account.page:46(title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:47(p)
+msgid ""
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
+msgstr ""
+"Facebook gehien erabiltzen diren sare sozialetako bat da. Aukera ematen die "
+"erabiltzaileei beren profil propioa sortzeko, eta beren lagunekin "
+"komunikatzeko."
+
+#: C/create-account.page:51(p)
+msgid ""
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link "
+"href=\"http://www.facebook.com\">www.facebook.com</link>."
+msgstr ""
+"Zure lagunekin komunikatzeko Facebook erabili ahal izateko, kontu berri bat "
+"sortu beharko duzu webgune honetan: <link "
+"href=\"http://www.facebook.com\">www.facebook.com</link>."
+
+#: C/create-account.page:59(title)
+#: C/audio-video.page:170(p)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: C/create-account.page:61(p)
+msgid ""
+"Jabber is an open instant messaging system. Like email, Jabber allows you to "
+"choose your account provider and communicate with all other Jabber users, "
+"regardless of their account provider."
+msgstr ""
+"Jabber berehalako mezularitzako sistema irekia da. Postarako bezala, Jabber-"
+"ek aukera ematen dizu kontu-hornitzailea aukeratu eta beste Jabber "
+"erabiltzaileekin komunikatzeko, haien kontu-hornitzailea kontuan hartu gabe."
+
+#: C/create-account.page:65(p)
+msgid ""
+"You will need to create a new account with a Jabber provider. There are many "
+"free providers; one popular provider is <link "
+"href=\"http://register.jabber.org/\">Jabber.org</link>."
+msgstr ""
+"Kontu berri bat sortu beharko duzu Jabber hornitzaile batekin. Doako "
+"hornitzaile bat baino gehiago daude; ezagunetako bat <link "
+"href=\"http://register.jabber.org/\">Jabber.org</link> da."
+
+#: C/create-account.page:70(p)
+msgid ""
+"If you use Google Mail or Google Talk, you already have a Jabber account. "
+"Google Talk is a Jabber service. Simply use your Google Mail address and "
+"password in <app>Empathy</app> to connect."
+msgstr ""
+"Google Mail edo Google Talk erabiltzen baduzu, baduzu Jabber kontu bat. "
+"Google Talk Jabber zerbitzu bat da. Besterik gabe, erabili zure Google Mail "
+"helbidea eta pasahitza <app>Empathy</app>-n, konektatzeko"
+
+#: C/create-account.page:77(title)
+#: C/audio-video.page:190(p)
+msgid "People Nearby"
+msgstr "Hurbileko jendea"
+
+#: C/create-account.page:79(p)
+msgid ""
+"You do not need to create an account with a service provider to use this "
+"feature. This service works whenever you are connected to a local network, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
+msgstr ""
+"Ez duzu zerbitzu-hornitzaile batekin konturik sortu behar eginbide hau "
+"erabili ahal izateko. Zerbitzuak sare lokal batekin konektatuta zauden "
+"guztietan funtzionatuko du, haririk gabeko wifigune gisa. Automatikoki "
+"aurkitzen ditu zerbitzu hau erabiltzen duten sareko beste erabiltzaileak."
+
+#: C/create-account.page:84(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Informazio gehiago lortzeko, ikus <link xref=\"salut-protocol\"/>."
+
+#: C/create-account.page:88(title)
+#: C/audio-video.page:205(p)
+msgid "SIP"
+msgstr "SIP"
+
+#: C/create-account.page:90(p)
+msgid ""
+"SIP is an open system which allows users to have audio and video "
+"conversations over the Internet. You need to create an account with a SIP "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
+msgstr ""
+"SIP sistema irekiak aukera ematen die erabiltzaileei audio- eta bideo-"
+"solasaldiak edukitzeko Internet bidez. Kontu bat sortu behar duzu SIP "
+"hornitzaile batekin. Beste SIP erabiltzaile guztiekin komunika zaitezke, "
+"erabiltzen duten SIP hornitzailea kontuan hartu gabe."
+
+#: C/create-account.page:95(p)
+msgid ""
+"There are a number of popular free SIP account providers; one popular "
+"provider is <link href=\"https://signup.sipphone.com/new-"
+"users/app?class=NewUser;proc=start\">Sipphone</link>."
+msgstr ""
+"Hainbat doako SIP kontu-hornitzaile daude; ezagunenetako bat <link "
+"href=\"https://signup.sipphone.com/new-"
+"users/app?class=NewUser;proc=start\">Sipphone</link> da."
+
+#: C/create-account.page:100(p)
+msgid ""
+"Due to technical differences, the free <link "
+"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> "
+"service does not currently work with <app>Empathy</app>."
+msgstr ""
+"Arazo teknikoak direla-eta, doako <link "
+"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> "
+"zerbitzua ez dabil gaur egun <app>Empathy</app>-rekin."
+
+#: C/create-account.page:105(p)
+msgid ""
+"Some SIP providers allow you to call normal phones from your computer. "
+"Generally, you will need to subscribe to a paid service for this feature."
+msgstr ""
+"SIP hornitzaile batzuek aukera ematen dizute telefono normaletara deitzeko "
+"zure ordenagailutik. Normalean, ordaindu beharreko zerbitzu batean harpidetu "
+"beharko duzu eginbide hau erabili ahal izateko."
+
+#: C/create-account.page:110(title)
+#: C/audio-video.page:165(p)
+msgid "IRC"
+msgstr "IRC"
+
+#: C/create-account.page:112(p)
+msgid ""
+"You do not need to register for an account to use IRC. Although you specify "
+"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
+"is only established each time you connect. If another user is using the "
+"nickname, you will need to choose a new nickname."
+msgstr ""
+"Ez duzu kontu batean erregistratu behar IRC erabili ahal izateko. IRC kontua "
+"<app>Empathy</app>-n gehitzean goitizena zehaztu duzun arren, goitizen hori "
+"konektatzen zaren bakoitzean ezartzen da. Beste erabiltzaile bat goitizen "
+"hori erabiltzen ari bada, goitizen berria aukeratu beharko duzu."
+
+#: C/create-account.page:117(p)
+msgid ""
+"Some IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+msgstr ""
+"IRC sare batzuek NickServ izeneko zerbitzua erabiltzen dute, erabiltzaileei "
+"beren goitizenak babesten laguntzeko. Informazio gehiago lortzeko, ikus "
+"<link xref=\"irc-nick-password\"/>."
+
+#: C/create-account.page:120(p)
+msgid ""
+"Some IRC servers are password protected. You will need to know the password "
+"to connect to these servers. Generally, these are private IRC networks."
+msgstr ""
+"IRC zerbitzari batzuk pasahitzez babestuta daude. Pasahitza jakin behar duzu "
+"zerbitzari horiekin konektatu ahal izateko. Normalean, IRC sare pribatuak "
+"dira."
+
+#: C/create-account.page:125(title)
+msgid "Proprietary Services"
+msgstr "Zerbitzu pribatuak"
+
+#: C/create-account.page:127(p)
+msgid ""
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create "
+"a new account with one of these services, you will need to visit the "
+"service’s web site and agree to its terms of use."
+msgstr ""
+"Hainbat konpainiak edo erakundek garatutako berehalako mezularitzako zerbitzu "
+"pribatu ugari daude. <app>Empathy</app>-k aukera ematen dizu zerbitzu "
+"ezagunenetako kontuekin konektatzeko. Zerbitzu hauetako batekin kontu berria "
+"sortzeko, zerbitzuaren webgunea bisitatu beharko duzu, eta bertako "
+"erabilera-baldintzekin bat egin."
+
+#: C/create-account.page:136(link)
+#: C/audio-video.page:135(p)
+msgid "AIM"
+msgstr "AIM"
+
+#: C/create-account.page:141(link)
+#: C/audio-video.page:160(p)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: C/create-account.page:146(link)
+#: C/audio-video.page:175(p)
+msgid "MSN"
+msgstr "MSN"
+
+#: C/create-account.page:151(link)
+#: C/audio-video.page:210(p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: C/change-status.page:9(desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Aldatu zure egoera kontaktuei erabilgarri zauden ala ez jakinarazteko."
+
+#: C/change-status.page:34(title)
+msgid "Change your status"
+msgstr "Aldatu zure egoera"
+
+#: C/change-status.page:36(p)
+msgid ""
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
+msgstr ""
+"Egoera ezar dezakezu, zure kontaktuei erabilgarri zauden ala ez "
+"jakinarazteko. <app>Empathy</app>-k aukera ematen dizu definitutako egoeren "
+"zerrenda batean hautatzeko."
+
+#: C/change-status.page:41(p)
+msgid ""
+"Click on the drop-down list at the top of the <gui>Contact List</gui> "
+"window."
+msgstr ""
+"Egin klik goitibeherako zerrrendan, <gui>Kontaktu-zerrenda</gui> leihoaren "
+"goialdean."
+
+#: C/change-status.page:46(p)
+msgid "Select a status from the list."
+msgstr "Hautatu egoera zerrendan."
+
+#: C/change-status.page:52(p)
+msgid ""
+"See <link xref=\"status-icons\"/> for a list of the built-in statuses and what "
+"they mean. You can also <link xref=\"set-custom-message\">add custom status "
+"messages</link> to provide more information about your availability to your "
+"contacts."
+msgstr ""
+"Ikus <link xref=\"status-icons\"/> egoera inkorporatuen zerrenda eta haien "
+"esanahia ikusteko. Era berean, <link xref=\"set-custom-message\">egoera-mezu "
+"pertsonalizatuak gehi ditzakezu</link>, zure kontaktuei zure "
+"erabilgarritasunari buruzko informazio gehiago emateko."
+
+#: C/change-status.page:58(p)
+msgid ""
+"If you do not use your computer for a while, or if the screensaver is on, "
+"the status will be automatically set to Away."
+msgstr ""
+"Ez baduzu ordenagailua denboraldi batez erabiltzen, edo pantaila-babeslea "
+"aktibatuta badago, 'Kanpoan' egoera ezarriko da automatikoki."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/audio-video.page:58(None)
+msgid ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+
+#: C/audio-video.page:8(desc)
+msgid "Information on when it is possible to have an audio or video conversation."
+msgstr "Audio- nahiz bideo-solasaldi bat noiz eduki daitekeen jakinarazten du."
+
+#: C/audio-video.page:32(title)
+msgid "Audio and video support"
+msgstr "Audio- eta bideo-euskarria"
+
+#: C/audio-video.page:34(p)
+msgid ""
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
+msgstr ""
+"Eginbide hau onartzen duen aplikazioa darabilten kontaktuekin bakarrik izan "
+"ditzakezu audio- eta bideo-solasdaldiak. Zure kontaktuek audio- edo bideo-"
+"solasaldiak onartzen dituztenean, ikono hauek ikusiko dituzu kontaktu-"
+"zerrendako haien izenen ondoan:"
+
+#: C/audio-video.page:43(p)
+msgid "Icon"
+msgstr "Ikonoa"
+
+#: C/audio-video.page:48(p)
+msgid "Description"
+msgstr "Azalpena"
+
+#: C/audio-video.page:58(media)
+msgid "Icon for audio conversation"
+msgstr "Audio-solasaldiaren ikonoa"
+
+#: C/audio-video.page:64(p)
+msgid "The contact is able to have an audio conversation."
+msgstr "Kontaktuak audio-solasaldiak izan ditzake."
+
+#: C/audio-video.page:70(media)
+msgid "Icon for video conversation"
+msgstr "Bideo-solasaldiaren ikonoa"
+
+#: C/audio-video.page:76(p)
+msgid "The contact is able to have a video conversation."
+msgstr "Kontaktuak bideo-solasaldiak izan ditzake."
+
+#: C/audio-video.page:83(p)
+msgid ""
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
+msgstr ""
+"Audio-solasaldi bat eduki ahal izateko, zure sistema eragileak onartutako "
+"soinu-txartela eta ondo dabilen mikrofonoa behar dituzu."
+
+#: C/audio-video.page:87(p)
+msgid ""
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
+msgstr ""
+"Bideo-solasaldi bat eduki ahal izateko, zure sistema eragileak onartutako "
+"web-kamera eta ondo dabilen mikrofonoa behar dituzu."
+
+#: C/audio-video.page:95(title)
+msgid "Supported Account Types"
+msgstr "Onartutako kontu motak"
+
+#: C/audio-video.page:97(p)
+msgid ""
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
+msgstr ""
+"Onartutako hainbat zerbitzutako kontuak izan behar dituzu audio- eta bideo-"
+"solasaldiak eduki ahal izateko. Ondoko taulako zerrendan kontu mota "
+"bakoitzak audioa eta bideoa onartzen dituen ala ez zehazten da."
+
+#: C/audio-video.page:102(p)
+msgid ""
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
+msgstr ""
+"Kontu motak pluginek hornitzen dituzte. Agian zure sistemak ez ditu izango "
+"mota erabilgarri guztiak, edo agian mota guztiak ez dira zerrendan azaltzen. "
+"Bestalde, plugin eguneratuek posible egin ditzakete audio- eta bideo-"
+"solasaldiak zerrendan ez onartutako gisa azeltzen diren kontu motekin."
+
+#: C/audio-video.page:110(p)
+msgid ""
+"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
+"need to look at the accessibility impact. I've <link "
+"href=\"http://mail.gnome.org/archives/gnome-doc-"
+"list/2009-September/msg00006.html\">asked the accessibility team</link> for "
+"input."
+msgstr ""
+"Egin nahiko nituzke taula batzuk ezer ez jartzeko Ez denean eta ✔ Bai "
+"denean, baina erabilerraztasun-inpaktuari begiratu behar zaio. <link "
+"href=\"http://mail.gnome.org/archives/gnome-doc-"
+"list/2009-September/msg00006.html\">Erabilerraztasun-taldeari</link> galdetu "
+"diot."
+
+#: C/audio-video.page:118(p)
+msgid ""
+"There's recent work on telepathy-butterfly and papyon to support audio and "
+"video for MSN. It might be released in time for 2.28, but since it doesn't "
+"follow the Gnome release schedule, I can't be sure. If it looks like it's "
+"going to ship, let's mark it Yes."
+msgstr ""
+"Azkenaldian telepathy-butterfly eta papyon-ekin lan egin da, audio- eta "
+"bideo-euskarria lortzeko MSNrako. 2.28 bertsiorako argitaratuta egon behar "
+"zuen, baina ez duenez jarraitzen Gnome-ren bertsioaren programazioa, ez "
+"dakit seguru. Aterako dela ematen badu, marka dezagun Bai."
+
+#: C/audio-video.page:128(p)
+msgid "Service"
+msgstr "Zerbitzua"
+
+#: C/audio-video.page:129(p)
+msgid "Audio"
+msgstr "Audioa"
+
+#: C/audio-video.page:130(p)
+msgid "Video"
+msgstr "Bideoa"
+
+#: C/audio-video.page:136(p)
+#: C/audio-video.page:137(p)
+#: C/audio-video.page:141(p)
+#: C/audio-video.page:142(p)
+#: C/audio-video.page:146(p)
+#: C/audio-video.page:147(p)
+#: C/audio-video.page:156(p)
+#: C/audio-video.page:157(p)
+#: C/audio-video.page:161(p)
+#: C/audio-video.page:162(p)
+#: C/audio-video.page:166(p)
+#: C/audio-video.page:167(p)
+#: C/audio-video.page:181(p)
+#: C/audio-video.page:182(p)
+#: C/audio-video.page:186(p)
+#: C/audio-video.page:187(p)
+#: C/audio-video.page:191(p)
+#: C/audio-video.page:192(p)
+#: C/audio-video.page:196(p)
+#: C/audio-video.page:197(p)
+#: C/audio-video.page:201(p)
+#: C/audio-video.page:202(p)
+#: C/audio-video.page:211(p)
+#: C/audio-video.page:212(p)
+#: C/audio-video.page:216(p)
+#: C/audio-video.page:217(p)
+msgid "No"
+msgstr "Ez"
+
+#: C/audio-video.page:140(p)
+msgid "Facebook Chat"
+msgstr "Facebook berriketa"
+
+#: C/audio-video.page:145(p)
+msgid "gadugadu"
+msgstr "gadugadu"
+
+#: C/audio-video.page:150(p)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: C/audio-video.page:151(p)
+#: C/audio-video.page:152(p)
+#: C/audio-video.page:171(p)
+#: C/audio-video.page:172(p)
+#: C/audio-video.page:176(p)
+#: C/audio-video.page:177(p)
+#: C/audio-video.page:206(p)
+#: C/audio-video.page:207(p)
+msgid "Yes"
+msgstr "Bai"
+
+#: C/audio-video.page:155(p)
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: C/audio-video.page:180(p)
+msgid "myspace"
+msgstr "myspace"
+
+#: C/audio-video.page:185(p)
+msgid "qq"
+msgstr "qq"
+
+#: C/audio-video.page:195(p)
+msgid "sametime"
+msgstr "sametime"
+
+#: C/audio-video.page:200(p)
+msgid "silc"
+msgstr "silc"
+
+#: C/audio-video.page:215(p)
+msgid "zephyr"
+msgstr "zephyr"
+
+#: C/audio-call.page:9(desc)
+msgid "Call your contacts over the Internet."
+msgstr "Deitu zure kontaktuei Internet bidez."
+
+#: C/audio-call.page:27(title)
+msgid "Start an audio conversation"
+msgstr "Hasi audio-solasaldi bat"
+
+#: C/audio-call.page:29(p)
+msgid ""
+"You can call your contacts and have an audio conversation with them. This "
+"features only works with certain types of accounts, and it requires the "
+"other person to have an application that supports audio calls."
+msgstr ""
+"Kontaktuei dei diezaiekezu eta audio-solasaldiak izan beraiekin. Eginbide "
+"honek kontu mota jakin batzuekin bakarrik funtzionatzen du, eta beste "
+"pertsonak audio-deiak onartzen dituen aplikazio bat eduki behar du."
+
+#: C/audio-call.page:34(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next "
+"to the name of the contact you wish to call and choose <gui "
+"style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"<gui>Kontaktu-zerrenda</gui> leihoan, egin klik deitu nahi diozun "
+"kontaktuaren ondoko <media type=\"image\" mime=\"image/png\" src=\"figures"
+"/camera-web.png\">bideo-deia</media> ikonoan, eta aukeratu <gui "
+"style=\"menuitem\">Audio-deia</gui>."
+
+#: C/audio-call.page:55(p)
+msgid ""
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr ""
+"Audio-solasaldi bat bideo-solasaldi bihurtzeko, aukeratu <guiseq><gui "
+"style=\"menu\">Bideoa</gui><gui style=\"menuitem\">Aktibatu "
+"bideoa</gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Hasi audio-solasaldi bat metakontaktu batekin"
+
+#: C/audio-call.page:71(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"Hautatu zein kontakturekin eduki nahi duzun solasaldia, eta hautatu menuan "
+"<gui style=\"menuitem\">Audio-deia</gui>."
+
+#: C/add-contact.page:9(desc)
+msgid "Add someone to the contact list."
+msgstr "Gehitu norbait kontaktu-zerrendari."
+
+#: C/add-contact.page:33(title)
+msgid "Add someone to your list of contacts"
+msgstr "Gehitu norbait zure kontaktuen zerrendari"
+
+#: C/add-contact.page:37(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Aukeratu <guiseq><gui>Berriketa</gui><gui>Gehitu kontaktua</gui></guiseq>."
+
+#: C/add-contact.page:40(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
+msgstr ""
+"Goitibeherako <gui>Kontua</gui> zerrendan, hautatu kontaktuarekin "
+"konektatzeko erabili nahi duzun kontua. Zure kontaktuak zuk hautatutako "
+"kontuaren zerbitzu bera erabili beharko du."
+
+#: C/add-contact.page:45(p)
+msgid ""
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
+msgstr ""
+"<gui>Identifikatzailea</gui> eremuan, sartu zure kontaktuaren saioa hasteko "
+"IDa, erabiltzaile-izena, pantaila-izena, edo zerbitzu motaren beste "
+"identifikatzaile egokiren bat."
+
+#: C/add-contact.page:49(p)
+msgid ""
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr ""
+"<gui>Aliasa</gui> eremuan, idatzi zure kontaktuaren izena, zure kontaktu-"
+"zerrendan azaltzea nahiko zenukeen bezala."
+
+#: C/add-contact.page:53(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Egin klik <gui>Gehitu</gui> botoian, pertsona zure kontaktu-zerrendan "
+"gehitzeko."
+
+#: C/add-contact.page:61(p)
+msgid ""
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
+msgstr ""
+"Pertsona berri bat kontaktu-zerrendan gehitzeko, Internetekin eta zure "
+"kontuarekin konektatuta egon behar duzu."
+
+#: C/add-account.page:9(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Gehitu kontu berri bat <app>Empathy</app>-ri."
+
+#: C/add-account.page:39(title)
+msgid "Add a new account"
+msgstr "Gehitu kontu berria"
+
+#: C/add-account.page:41(p)
+msgid ""
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
+msgstr ""
+"Berehalako mezularitzako kontuak gehi ditzakezu onartutako edozein "
+"zerbitzutatik, zure kontaktu guztiekin komunikatzeko <app>Empathy</app>-n. "
+"Kontu-hornitzaile batzuen kasuan, urrats hauek kontu berri batean "
+"erregistratzeko ere balioko dizute. Xehetasun gehiago lortzeko, ikus <link "
+"xref=\"create-account\"/>."
+
+#: C/add-account.page:52(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Egin klik <gui style=\"button\">Gehitu</gui> botoian."
+
+#: C/add-account.page:57(p)
+msgid ""
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr ""
+"Goitibeherako <gui>Protokoloa</gui> zerrendan, hautatu gehitu nahi duzun "
+"kontu mota."
+
+#: C/add-account.page:61(p)
+msgid ""
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
+msgstr ""
+"Ez badaukazu konturik erregistratuta, hautatu <gui>Sortu kontu bat "
+"zerbitzarian</gui>. Eginbide hau ez dago erabilgarri kontu mota "
+"guztietarako, eta baliteke ez funtzionatzea kontu-hornitzaile batzuekin. "
+"Ikus <link xref=\"create-account\"/> informazio gehiago lortzeko."
+
+#: C/add-account.page:66(p)
+msgid ""
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/> for more information."
+msgstr ""
+"Sartu eskatutako informazioa. Kontu gehienekin, saioa hasteko IDa eta "
+"pasahitza bakarrik beharko dituzu. Kontu batzuek informazio gehigarria behar "
+"dezakete. Ikus <link xref=\"accounts-window#details\"/> informazio gehiago "
+"lortzeko."
+
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Egin klik <gui style=\"button\">Saio-hasiera</gui> botoian."
+
+#: C/add-account.page:78(p)
+msgid ""
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press "
+"<key>Enter</key> when you’re finished."
+msgstr ""
+"Kontua identifikatzen duen izena aldatzeko <gui>Kontuak</gui> leihoan, "
+"hautatu kontua ezkerraldeko zerrendan, eta egin klik izenean edo sakatu "
+"zuriune-barra. Editatu kontuaren izena, eta, amaitutakoan, sakatu "
+"<key>Sartu</key>."
+
+#: C/accounts-window.page:11(desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Gehitu, aldatu eta ezabatu kontuak."
+
+#: C/accounts-window.page:33(title)
+msgid "Accounts Window"
+msgstr "Kontuen leihoa"
+
+#: C/accounts-window.page:35(p)
+msgid ""
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr ""
+"<gui>Kontuak</gui> leihoak aukera ematen dizu kontuak gehitzeko, aldatzeko "
+"eta ezabatzeko."
+
+#: C/accounts-window.page:43(title)
+msgid "Account Details"
+msgstr "Kontuaren xehetasunak"
+
+#: C/accounts-window.page:44(p)
+msgid ""
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
+msgstr ""
+"Kontu gehienen kasuan, nahikoa da saioa hasteko IDa eta pasahitza sartzea. "
+"Kontu edo kontu mota gutxi batzuek, berriz, informazio gehigarria behar "
+"dezakete."
+
+#: C/account-jabber.page:7(desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Jabber eta Google Talk kontuen aukera aurreratuak."
+
+#: C/account-jabber.page:29(title)
+msgid "Jabber account details"
+msgstr "Jabber kontuen xehetasunak"
+
+#: C/account-jabber.page:31(p)
+msgid ""
+"Most Jabber accounts will require only a login ID and a password to connect. "
+"For some accounts or on certain types of networks, you may need to enter "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
+"adding an account, see <link xref=\"add-account\"/>."
+msgstr ""
+"Jabber kontu gehienek saioa hasteko ID bat eta pasahitz bat bakarrik behar "
+"dute konektatzeko. Beste sare mota batzuetako kontuen kasuan, informazio "
+"gehigarria sartu beharko duzu <gui>Aurreratua</gui> atalean. Normalean, ez "
+"dituzu erabili beharko beheko aukera aurreratuak. Kontu bat gehitzeko "
+"jarraibide orokorrak lortzeko, ikus <link xref=\"add-account\"/>."
+
+#: C/account-jabber.page:39(p)
+msgid ""
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr ""
+"Google Talk Jabber kontu mota bat da. Jarraibide hau Google Talk "
+"kontuetarako ere balio dute."
+
+#: C/account-jabber.page:45(gui)
+msgid "Encryption required (TLS/SSL)"
+msgstr "Enkriptatzea beharrezkoa da (TLS/SSL)"
+
+#: C/account-jabber.page:46(gui)
+msgid "Ignore SSL certificate errors"
+msgstr "Ez ikusi egin SSL ziurtagiri-erroreei"
+
+#: C/account-jabber.page:47(p)
+msgid ""
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
+"server is encrypted. If encrypted communication is not possible, messages "
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
+msgstr ""
+"Posible denean, <app>Empathy</app>ren eta Jabber zerbitzuaren komunikazioa "
+"enkriptatua da. Ezin bada enkriptatutako komunikaziorik erabili, mezuak "
+"enkriptatu gabe bidaliko dira. Hautatu <gui>Enkriptatzea beharrezkoa "
+"da</gui> <app>Empathy</app> Jabber zerbitzariarekin komunikatzea "
+"eragozteko, enkriptatu ezin denean."
+
+#: C/account-jabber.page:52(p)
+msgid ""
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
+msgstr ""
+"Jabber zerbitzari batzuek baliogabeko ziurtagiriekin edo autoritate "
+"ezezagunen ziurtagiriekin enkripta ditzakete datuak. Konektatzen ari zaren "
+"zerbitzaria fidagarria dela uste baduzu, <gui>Ez ikusi egin SSL ziurtagiri-"
+"erroreei</gui> baliogabeko ziurtagiriekiko komunikazioa onartzeko."
+
+#: C/account-jabber.page:59(gui)
+msgid "Resource"
+msgstr "Baliabidea"
+
+#: C/account-jabber.page:60(gui)
+msgid "Priority"
+msgstr "Lehentasuna"
+
+#: C/account-jabber.page:61(p)
+msgid ""
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
+msgstr ""
+"Kontuarekin aldi berean hainbat aplikazio badituzu instalatuta (hainbat "
+"ordenagailutan, esate baterako), iturburu bat ezar dezakezu bakoitza banan "
+"bana identifikatzeko. Modu lehenetsian, <app>Empathy</app>-k "
+"<input>Telepathy</input> erabiliko du iturburu gisa."
+
+#: C/account-jabber.page:65(p)
+msgid ""
+"You can set the priority to specify which application should receive "
+"incoming messages from your contacts. New messages will be sent to the "
+"application with the highest priority."
+msgstr ""
+"Lehentasuna ezar dezakezu zure kontaktuen sarrerako mezuak zein aplikaziok "
+"jaso beharko lituzkeen zehazteko. Mezu berriak lehentasunik altuenarekin "
+"bidaliko dira aplikaziora."
+
+#: C/account-jabber.page:70(gui)
+msgid "Override server settings"
+msgstr "Gainidatzi zerbitzariaren ezarpenak"
+
+#: C/account-jabber.page:71(p)
+msgid ""
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
+"based on your login ID. For some Jabber servers, you will need to enter "
+"custom server settings manually. These settings should be provided for you "
+"by your Jabber provider."
+msgstr ""
+"<app>Empathy</app>-k ezarpen lehenetsiak erabiliko ditu Jabber "
+"zerbitzariarekin konektatzeko, saioa hasteko zure IDan oinarrituta. Hainbat "
+"Jabber zerbitzaritan, berriz, eskuz sartu beharko dituzu zerbitzari-ezarpen "
+"pertsonalizatuak. Zure Jabber hornitzaileak hornitu beharko lizkizuke "
+"ezarpen horiek."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:106(None)
+msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:112(None)
+msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+
+#: C/account-irc.page:8(desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "IRC sareekin konektatzeko behar den informazio gehigarria."
+
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
+msgstr "IRC kontuen xehetasunak"
+
+#: C/account-irc.page:33(p)
+msgid ""
+"IRC accounts require different information than many other types of "
+"accounts. To create an IRC account, you must specify at least an IRC network "
+"and a nickname. This page details the information you can provide for an "
+"IRC account."
+msgstr ""
+"IRC kontuek beste kontu mota batzuek eskatzen ez duten informazioa eskatzen "
+"dute. IRC kontu bat sortzeko, IRC sare bat eta goitizen bat gutxienez "
+"zehaztu behar dituzu. Orri honetan IRC kontu baterako horni dezakezun "
+"informazioaren xehetasunak ematen dira."
+
+#: C/account-irc.page:45(gui)
+#: C/account-irc.page:120(gui)
+msgid "Network"
+msgstr "Sarea"
+
+#: C/account-irc.page:46(p)
+msgid ""
+"IRC is an open system that allows people to run separate IRC networks. Each "
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
+msgstr ""
+"IRC sareak bakoitza bere aldetik exekutatzeko aukera ematen duen sistema "
+"irekia da IRC. Sare bakoitza desberdina da, eta bere erabiltzaileak eta "
+"berriketa-gelak ditu. <app>Empathy</app>-n sarerik ezagunenak goitibeherako "
+"<gui>Sarea</gui> zerrendan azaltzen dira. Sare gehigarriak gehi ditzakezu. "
+"Ikus <link xref=\"#networks\"/> behean."
+
+#: C/account-irc.page:53(gui)
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: C/account-irc.page:54(p)
+msgid ""
+"Your nickname is your unique name on the IRC network. Only one person on a "
+"network may use a given nickname. If you get an error message that says "
+"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change your "
+"nickname."
+msgstr ""
+"Zure goitizena zure izen bakarra da IRC sarean. Sareko pertsona bakar batek "
+"erabil dezake goitizen bat. <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
+"dioen errore-mezua jasotzen baduzu, goitizena aldatu beharko duzu."
+
+#: C/account-irc.page:60(gui)
+msgid "Password"
+msgstr "Pasahitza"
+
+#: C/account-irc.page:61(p)
+msgid ""
+"Some servers, particularly those on private networks, require a password to "
+"connect. If you are authorized to use the network, the network "
+"administrators should provide you with a password."
+msgstr ""
+"Zerbitzari batzuek, sare pribatuetakoek batez ere, pasahitza eskatzen dute "
+"konektatzeko. Sarea erabiltzeko baimena baduzu, sare-administratzaileek "
+"pasahitz bat eman beharko lizukete."
+
+#: C/account-irc.page:65(title)
+msgid "NickServ Passwords"
+msgstr "NickServ pasahitzak"
+
+#: C/account-irc.page:66(p)
+msgid ""
+"On some networks, nicknames can be registered using a service known as "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
+"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
+"more details."
+msgstr ""
+"Sare batzuetan, goitizenak NickServ zerbitzuarekin erregistra daitezke. "
+"<app>Empathy</app>-k gaur egun ez du zuzenean onartzen goitizen-pasahitzik. "
+"Sare batzuetan, freenode sare ezagunean besteak beste, zerbitzari-pasahitzak "
+"automatikoki birbidaltzen dira NickServ-era, zuri aukera emateko eremu hau "
+"ezartzeko NickServ-ekin zure burua identifikatzeko. Xehetasun gehiago "
+"lortzeko, ikus <link xref=\"irc-nick-password\"/>."
+
+#: C/account-irc.page:76(gui)
+msgid "Real name"
+msgstr "Benetako izena"
+
+#: C/account-irc.page:77(p)
+msgid ""
+"You can provide your real name in addition to your nickname. Other users "
+"will be able to see this when they view your information."
+msgstr ""
+"Zure benetako izena eman dezakezu, goitizenaz gain. Beste erabiltzaileek "
+"ikusi ahal izango dute, zure informazioa ikustean."
+
+#: C/account-irc.page:81(gui)
+msgid "Quit message"
+msgstr "Irteteko mezua"
+
+#: C/account-irc.page:82(p)
+msgid ""
+"When you go offline, a quit message is sent to all the chat rooms you’re in "
+"and to all the users you’re having a private conversation with. Use this "
+"field to provide a custom quit message."
+msgstr ""
+"Lineatik kanpora zoazenean, irteteko mezu bat bidaltzen da zu zauden "
+"berriketa-gela guztietara, baita solasaldi pribatua izan duzun erabiltzaile "
+"guztiei ere. Erabili eremu hau irteteko mezu pertsonalizatua ezartzeko."
+
+#: C/account-irc.page:94(title)
+msgid "IRC Networks"
+msgstr "IRC sareak"
+
+#: C/account-irc.page:97(title)
+msgid "Networks"
+msgstr "Sareak"
+
+#: C/account-irc.page:99(p)
+msgid ""
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
+"another IRC network, you can add it to the list. You can also modify "
+"networks and remove them from the list."
+msgstr ""
+"<app>Empathy</app>-k IRC sare ezagunen zerrenda dauka. Beste IRC sare bat "
+"nahi baduzu, gehitu zerrendari. Era berean, sareak aldatu eta zerrendatik ken "
+"ditzakezu."
+
+#: C/account-irc.page:104(p)
+msgid ""
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+msgstr ""
+"Zerrendan sare bat gehitzeko, egin klik <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Gehitu</media> botoian."
+
+#: C/account-irc.page:107(p)
+msgid ""
+"To modify a network in the list, select the network and click <media "
+"type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
+msgstr ""
+"Sare bat zerrendan gehitzeko, egin klik <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Gehitu</media> botoian."
+
+#: C/account-irc.page:110(p)
+msgid ""
+"To remove a network from the list, select the network and click <media "
+"type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
+msgstr ""
+"Sare bat zerrendatik kentzeko, hautatu sarea, eta egin klik <media "
+"type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Kendu</media> botoian."
+
+#: C/account-irc.page:115(p)
+msgid "When adding or modifying a network, you can enter the following information:"
+msgstr "Sare bat gehitzean edo aldatzean, informazio hau sar dezakezu:"
+
+#: C/account-irc.page:121(p)
+msgid ""
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "Hau da sareak sareen zerrendan edukitzea nahi duzun izena."
+
+#: C/account-irc.page:125(gui)
+msgid "Charset"
+msgstr "Karaktere-jokoa"
+
+#: C/account-irc.page:126(p)
+msgid ""
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
+msgstr ""
+"Sare honetan normalean erabiltzen den karaktere-kodeketa zehazten du honek. "
+"Karaktere-kodeketa karaktereak ordenagailuaren barruan erregistratzeko modu "
+"zehatza da. Karaktere-kodeketa ugari daude, eta zuk beste erabiltzaileen "
+"karaktere-kodeketa bera erabili behar duzu mezuak ondo ikusi ahal izateko."
+
+#. Translators: Recommend character encodings that are common
+#. for your language.
+#: C/account-irc.page:135(p)
+msgid ""
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
+"can handle text from most of the world's languages. Another common encoding "
+"for English and some other Western languages is ISO-8859-1."
+msgstr ""
+"Modu lehenetsian, <app>Empathy</app>-k UTF-8 erabiltzen du, munduko "
+"hizkuntza gehienetako testua kudea dezakeen karaktere-kodeketa modernoa. "
+"Ingeleserako eta mendebaldeko beste hizkuntza batzuetarako asko erabiltzen "
+"den kodeketa ISO-8859-1 da."
+
+#: C/account-irc.page:141(gui)
+msgid "Servers"
+msgstr "Zerbitzariak"
+
+#: C/account-irc.page:142(p)
+msgid ""
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+msgstr ""
+"IRC sare batek zerbitzari ugari eduki ditzake zu konektatzeko moduan. Sare "
+"zehatz bateko zerbitzari batekin konektatuta zaudenean, sare horretako beste "
+"zerbitzari guztieen erabiltzaile guztiekin komunika zaitezke. Zerbitzariak "
+"gehitzeko eta kentzeko saretik, erabili <gui>Gehitu</gui> eta "
+"<gui>Kendu</gui> botoiak."
+
+#: C/account-irc.page:147(p)
+msgid ""
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
+msgstr ""
+"Zerbitzari bat hautatuta dagoenean, egin klik <gui>Zerbitzaria</gui> edo "
+"<gui>Ataka</gui> ataletan, editatzeko. Bestela, erabili ezker- eta eskuin-"
+"geziak eremua fokuratzeko, eta sakatu zuriune-barra editatzen hasteko."
+
+#: C/account-irc.page:151(p)
+msgid ""
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
+"communication with a server. Note that this does not prevent other users on "
+"the network from seeing what you write on public chat rooms."
+msgstr ""
+"Hautatu zutabeko <gui>SSL</gui> kontrol-laukia, zerbitzari batekiko "
+"komunikazio guztia enkriptatzeko. Kontuan hartu horrek ez diela sareko beste "
+"erabiltzaileei eragozten zuk berriketa-gela publikoetan idatzitakoa ikusi "
+"ahal izatea."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/index.page:0(None)
+msgid "translator-credits"
+msgstr "Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2008."
+
diff --git a/help/eu/figures/empathy-main-window.png b/help/eu/figures/empathy-main-window.png
new file mode 100644
index 000000000..d277e70c1
--- /dev/null
+++ b/help/eu/figures/empathy-main-window.png
Binary files differ
diff --git a/help/gl/gl.po b/help/gl/gl.po
index 193b428d3..769f694ef 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -1,3706 +1,1671 @@
-#
-# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
+# Galician translation for tomboy.
+# Copyright (C) 2011 tomboy's COPYRIGHT HOLDER
+# This file is distributed under the same license as the tomboy package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Fran Diéguez <frandieguez@gnome.org>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy.help.master\n"
-"POT-Creation-Date: 2010-11-15 10:00+0000\n"
-"PO-Revision-Date: 2010-11-15 12:52+0100\n"
-"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
+"Project-Id-Version: tomboy gnome-2-28\n"
+"POT-Creation-Date: 2010-03-24 15:06+0000\n"
+"PO-Revision-Date: 2011-08-18 02:00+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"Language-Team: Galician <gnome-l10n-gl@gnome.org>\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"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:38(None) C/audio-video.page:70(None)
-#: C/audio-call.page:36(None)
-msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
-msgstr ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
-
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Comezar unha conversa de vídeo con un dos seus contactos."
-
-#: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
-#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
-#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
-#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
-#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:19(name)
-#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
-#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
-#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
-#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
-#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
-#: C/disable-account.page:20(name) C/create-account.page:19(name)
-#: C/audio-video.page:17(name) C/audio-call.page:19(name)
-#: C/add-account.page:20(name)
-msgid "Milo Casagrande"
-msgstr "Milo Casagrande"
-
-#: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
-#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
-#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
-#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
-#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:20(email)
-#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
-#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
-#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
-#: C/geolocation-privacy.page:18(email)
-#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:20(email) C/audio-video.page:18(email)
-#: C/audio-call.page:20(email) C/add-account.page:21(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:21(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
-#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
-#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
-#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
-#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
-#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
-#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
-#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
-#: C/create-account.page:23(p) C/change-status.page:23(p)
-#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
-#: C/add-account.page:28(p) C/accounts-window.page:22(p)
-#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
-msgid "Creative Commons Share Alike 3.0"
-msgstr "Creative Commons Compartir Igual 3.0"
-
-#: C/video-call.page:28(title)
-msgid "Start a video conversation"
-msgstr "Comezar unha conversa de vídeo"
-
-#: C/video-call.page:30(p)
-msgid ""
-"If you have a webcam, you can call your contacts and have a video "
-"conversation with them. This features only works with certain types of "
-"accounts, and it requires the other person to have an application that "
-"supports video calls."
-msgstr ""
-"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha "
-"conversa con vídeo con eles. Estas funcionalidades só funcionarán con certos "
-"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
-"videochamadas."
-
-#: C/video-call.page:37(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>."
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videochamada</"
-"media> ao lado do nome do contacto ao que quere chamar e seleccione <gui "
-"style=\"menuitem\">Videochamada</gui>."
-
-#: C/video-call.page:43(p) C/audio-call.page:42(p)
-msgid ""
-"A new window will open. When the connection is established, you will see "
-"<gui>Connected</gui> at the bottom of the window, along with the total "
-"conversation time."
-msgstr ""
-"Abrirase unha nova xanela. Cando a conexión se estabeleza verá "
-"<placeholder-2/> na parte inferior da xanela, ao carón do tempo de conversa "
-"total."
-
-#: C/video-call.page:48(p) C/audio-call.page:48(p)
-msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
-msgstr "Para rematar a conversa, prema sobre <placeholder-1/>"
-
-#: C/video-call.page:54(p)
-msgid ""
-"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
-msgstr ""
-"Para trocar unha conversa de vídeo nunha conversa de son, seleccione "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Desactivar "
-"vídeo</gui></guiseq>."
-
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Comezar unha conversa de vídeo con un metacontacto."
-
-#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click on the meta-contact."
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema co botón dereito sobre "
-"un metacontacto."
-
-#: C/video-call.page:68(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
-msgstr ""
-"Seleccione o contacto co que desexe ter unha conversa e desde o menú "
-"seleccione <gui style=\"menuitem\">Vídeochamada</gui>."
-
-#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
-msgid ""
-"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a "
-"second: a small pop-up message will appear showing the number of the "
-"contacts that form the meta-contact."
-msgstr ""
-"Para recoñecer se un contacto é un <em>metacontacto</em>, mova o rato sobre "
-"o contacto na xanela <gui>Lista de contactos</gui> e deteñase sobre el un "
-"segundo: aparecerá unha pequena mensaxe emerxente que mostra o número de "
-"contactos que forman o metacontacto."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
-msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
-msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
-msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
-msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
-
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "Entendendo os diferentes estados e iconas de estado."
-
-#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
-#: C/import-account.page:27(name) C/disable-account.page:24(name)
-#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:24(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
-msgid "Shaun McCance"
-msgstr "Shaun McCance"
-
-#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
-#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:25(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
-msgid "shaunm@gnome.org"
-msgstr "shaunm@gnome.org"
-
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Tipos de estados e iconas"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Icona de dispoñíbel"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Dispoñíbel"
-
-#: C/status-icons.page:41(p)
-msgid ""
-"Use the <em>Available</em> status when you are at your computer and able to "
-"chat with your contacts. You can set a custom message for this status."
-msgstr ""
-"Use o estado <em>Dispoñíbel</em> cando está no seu computador e pode falar "
-"cos seus contactos. Vostede pode estabelecer unha mensaxe personalizada para "
-"este estado."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Icona de ocupado"
-
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Ocupado"
-
-#: C/status-icons.page:47(p)
+#: C/legal.xml:2(para)
msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
-"something urgent they need to discuss. By default, <app>Empathy</app> will "
-"not use notification bubbles and sounds when you are busy. You can set a "
-"custom message for this status."
-msgstr "Use o estado <em>Ocupado</em> para dicirlle aos seus contactos"
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Icona de ausente"
-
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Ausente"
-
-#: C/status-icons.page:55(p)
-msgid ""
-"Use the <em>Away</em> status when you are going away from your computer. "
-"<app>Empathy</app> automatically sets your status to Away if you do not use "
-"your computer for a while, or if your screensaver is on. By default, "
-"<app>Empathy</app> will not use notification bubbles and sounds when you are "
-"away. You can set a custom message for this status."
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
+"later version published by the Free Software Foundation with no Invariant "
+"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
+"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"in the file COPYING-DOCS distributed with this manual."
msgstr ""
-"Use o estado <em>Ausente</em> cando non está no seu computador. "
-"<app>Empathy</app> automaticamente estabelecer o seu estado a Ausente se non "
-"usa o seu computador por un anaco, ou se o seu protector de pantalla está "
-"activado. Por omisión, <app>Empathy</app> non usa as notificacións e sons "
-"cando está Ausente. Vostede pode estabelecer unha mensaxe personalizada para "
-"este estado."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Icona de desconectado"
-
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisíbel"
-#: C/status-icons.page:64(p)
+#: C/legal.xml:12(para)
msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
+"This manual is part of a collection of GNOME manuals distributed under the "
+"GFDL. If you want to distribute this manual separately from the collection, "
+"you can do so by adding a copy of the license to the manual, as described in "
+"section 6 of the license."
msgstr ""
-"Ao estabelecer o seu estado <em>Invisíbel</em>, aparecerá como desconectado "
-"para os seus contactos. Aínda así vostede estará conectado aos seus "
-"contactos e poderá ver os estados dos seus contactos e iniciar unha conversa "
-"con eles."
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Desconectado"
-
-#: C/status-icons.page:71(p)
+#: C/legal.xml:19(para)
msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
+"Many of the names used by companies to distinguish their products and "
+"services are claimed as trademarks. Where those names appear in any GNOME "
+"documentation, and the members of the GNOME Documentation Project are made "
+"aware of those trademarks, then the names are in capital letters or initial "
+"capital letters."
msgstr ""
-"Estabelecer o seu estado a <em>Desconectado</em> desconectaralle de todas as "
-"súas contas."
-
-#: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Compartir o escritorio cos seus contactos."
-#: C/share-desktop.page:28(title)
-msgid "Share your desktop"
-msgstr "Compartir o seu escritorio"
-
-#: C/share-desktop.page:30(p)
+#: C/legal.xml:35(para)
msgid ""
-"It is possible, with some of your contacts, to share your desktop with them, "
-"or to start using your contacts desktop. You can use this functionality to "
-"show your desktop to your contacts, to ask for help or to help your contacts "
-"resolve a problem."
+"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
+"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
+"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
+"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
+"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
+"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
+"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND "
+"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
+"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
+"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
+"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
+"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
+"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
+"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
+"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
+"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
+"POSSIBILITY OF SUCH DAMAGES."
msgstr ""
-"É posíbel, con algúns dos seus contactos, compartir o escritorio con eles, "
-"ou usar o escritorio dos seus contactos. Pode usar esta funcionalidade para "
-"mostrar o seu escritorio aos seus contactos, para pedirlle axuda ou axudar "
-"aos seus contactos a solucionar un problema."
-#: C/share-desktop.page:38(p)
+#: C/legal.xml:28(para)
msgid ""
-"In order to be able to share your desktop or to remotely use your contacts "
-"desktop, it is necessary to have a remote desktop viewer application "
-"installed in your system."
+"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
+"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
+"<placeholder-1/>"
msgstr ""
-"Para poder compartir o seu escritorio ou usar remotamente o escritorio dos "
-"seus contactos é necesario ter un aplicativo de visión remota de escritorios "
-"instalada no seu sistema."
-#: C/share-desktop.page:46(p) C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> leve a cabo unha das seguintes "
-"opcións:"
-
-#: C/share-desktop.page:51(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:257(None)
msgid ""
-"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
-"guiseq>."
+"@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
msgstr ""
-"Seleccione o contacto co que quere compartir o seu escritorio e prema "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir o meu escritorio</"
-"gui></guiseq>."
+"@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
-#: C/share-desktop.page:57(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:386(None)
msgid ""
-"Right-click on the name of the contact you want to share your desktop with, "
-"and select <gui>Share my desktop</gui>."
+"@@image: 'figures/tomboy-new-note.png'; md5=ba337ad3ae256f3fdf79afeef82d7883"
msgstr ""
-"Prema co botón dereito sobre o nome do contacto co que quere manter unha "
-"conversa e seleccione <gui>Compartir o meu escritorio</gui>."
+"@@image: 'figures/tomboy-new-note.png'; md5=ba337ad3ae256f3fdf79afeef82d7883"
-#: C/share-desktop.page:65(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:785(None)
msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"@@image: 'figures/tomboy-main-menu.png'; md5=420af676a38a074abd5431e7a07d1fec"
msgstr ""
-"Enviarase unha solicitude ao contacto co que quere compartir o seu "
-"escritorio. Se acepta, lanzarase o aplicativo de visión remota de "
-"escritorios para permitirlle desconectar ao usuario que está controlando o "
-"seu escritorio."
+"@@image: 'figures/tomboy-main-menu.png'; md5=420af676a38a074abd5431e7a07d1fec"
-#: C/share-desktop.page:70(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:941(None)
msgid ""
-"For more information about how to use the remote desktop viewer application, "
-"refer to its help."
+"@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
msgstr ""
-"Para obter máis información sobre como usar o aplicativo de visión de "
-"escritorios remotos consulte a axuda."
+"@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
-#: C/share-desktop.page:77(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:979(None)
msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"@@image: 'figures/add-notebook-search.png'; "
+"md5=8a98d72edc3c4351a632889c5edbb81f"
msgstr ""
-"Cando comparte o seu escritorio con outros, e posíbel que experimente unha "
-"ralentización de rendemento de sistema e unha baixa velocidade de Internet."
+"@@image: 'figures/add-notebook-search.png'; "
+"md5=8a98d72edc3c4351a632889c5edbb81f"
-#: C/share-desktop.page:83(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1016(None)
msgid ""
-"Not all your contacts might be able to support this functionality. It is "
-"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
-"and a remote desktop viewer application installed in their system."
+"@@image: 'figures/add-to-notebook.png'; md5=03469ddb5137f525ac4f8318caed5532"
msgstr ""
-"Para poder compartir o seu escritorio ou usar remotamente o escritorio dos "
-"seus contactos é necesario ter un aplicativo de visión remota de escritorios "
-"instalada no seu sistema."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Engadir, editar e borrar un mensaxe persoal para o seu estado."
-
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
-
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
-
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Estabelecer unha mensaxe personalizada"
+"@@image: 'figures/add-to-notebook.png'; md5=03469ddb5137f525ac4f8318caed5532"
-#: C/set-custom-status.page:36(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1056(None)
msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
+"@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
msgstr ""
-"En ocasións pode querer usar unha mensaxe persoal para o seu escritorio, por "
-"exemplo, para facer saber aos seus contactos que non estará dispoñíbel por "
-"un período de tempo."
+"@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
-#: C/set-custom-status.page:40(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1092(None)
msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
+"@@image: 'figures/delete-notebook.png'; md5=f1b41a9034715d6314ee36b66389c897"
msgstr ""
-"É posíbel estabelecer unha mensaxe personalizada baseada nos diferentes "
-"estados dispoñíbeis."
+"@@image: 'figures/delete-notebook.png'; md5=f1b41a9034715d6314ee36b66389c897"
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1139(None)
msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
+"@@image: 'figures/tomboy-preferences-synchronization.png'; "
+"md5=68e7a980720d8e9e1384cab9960a7adc"
msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema na lista despregábel na "
-"parte superior."
+"@@image: 'figures/tomboy-preferences-synchronization.png'; "
+"md5=68e7a980720d8e9e1384cab9960a7adc"
-#: C/set-custom-status.page:52(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1302(None)
msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"@@image: 'figures/tomboy-preferences-editing.png'; "
+"md5=288184a8d9645881eaf3173892583d73"
msgstr ""
-"Seleccione un estado ao que quere engadir a mensaxe personalizada. Ten que "
-"seleccionar o identificado coa etiqueta <gui>Mensaxe personalizada</gui>."
+"@@image: 'figures/tomboy-preferences-editing.png'; "
+"md5=288184a8d9645881eaf3173892583d73"
-#: C/set-custom-status.page:58(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1361(None)
msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
+"@@image: 'figures/tomboy-preferences-hotkeys.png'; "
+"md5=57510249057a144dbb81ae35e15c694c"
msgstr ""
-"Introduza a súa mensaxe personalizada na caixa de texto da parte superior da "
-"xanela e prema <key>Intro</key> para estabelecer a mensaxe."
+"@@image: 'figures/tomboy-preferences-hotkeys.png'; "
+"md5=57510249057a144dbb81ae35e15c694c"
-#: C/set-custom-status.page:64(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tomboy.xml:1394(None)
msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"@@image: 'figures/tomboy-preferences-add-ins.png'; "
+"md5=bb3114a219b8bfdf31549fced9618245"
msgstr ""
-"Se quere estabelecer a mensaxe personalizada como un favorito, gardándoo "
-"para usalo de novo, prema na pequena estrela á dereita da caixa de texto "
-"onde escribiu a súa mensaxe personalizada."
-
-#: C/set-custom-status.page:69(p)
+"@@image: 'figures/tomboy-preferences-add-ins.png'; "
+"md5=bb3114a219b8bfdf31549fced9618245"
+
+#: C/tomboy.xml:23(title)
+msgid "Tomboy Notes Manual"
+msgstr "Manual de Notas de Tomboy"
+
+#: C/tomboy.xml:26(para)
msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
+"Tomboy is a simple desktop note-taking application, with many features "
+"designed to help organize ideas, such as spell checking, highlighting, auto-"
+"linking URLs, lists, font stylizing, quick access with a table of contents "
+"for notes, and add-ins to extend Tomboy's capabilities. ."
msgstr ""
-"Se non o fai a mensaxe personalizada non estará dispoñíbel a próxima vez que "
-"use <app>Empathy</app>. Só se gardará durante a sesión actual."
+"Tomboy é un aplicativo de escritorio sinxelo de creación de notas, con "
+"algunhas funcionalidades deseñadas para axudarlle a organizar ideas, como a "
+"corrección ortográfica, realzado, autoligado de URL, listas, estilos de "
+"tipos de letra, acceso rápido con unha táboa de contidos para as notas e "
+"engadidos para extender as capacidades de Tomboy."
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Editar, quitar e engadir unha mensaxe personalizada"
+#: C/tomboy.xml:34(year) C/tomboy.xml:40(year) C/tomboy.xml:46(year)
+#: C/tomboy.xml:52(year) C/tomboy.xml:58(year) C/tomboy.xml:64(year)
+msgid "2009"
+msgstr "2009"
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Editar a mensaxe personalizada"
+#: C/tomboy.xml:36(holder)
+msgid "Alex Graveley"
+msgstr "Alex Graveley"
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Para editar unha mensaxe personalizada:"
+#: C/tomboy.xml:42(holder)
+msgid "Brent Smith"
+msgstr "Brent Smith"
-#: C/set-custom-status.page:100(p)
-msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
-msgstr ""
-"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
-"que quere editar e prema dúas veces sobre el."
+#: C/tomboy.xml:48(holder)
+msgid "Free Software Foundation"
+msgstr "Free Software Foundation"
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr ""
-"Escriba a mensaxe personalizada nova e prema <key>Intro</key> para "
-"modificalo."
+#: C/tomboy.xml:54(holder) C/tomboy.xml:214(para)
+msgid "Boyd Timothy"
+msgstr "Boyd Timothy"
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Para eliminar unha mensaxe personalizada:"
+#: C/tomboy.xml:60(holder) C/tomboy.xml:202(para)
+msgid "Sandy Armstrong"
+msgstr "Sandy Armstrong"
-#: C/set-custom-status.page:118(p)
-msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
-msgstr ""
-"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
-"que quere editar."
+#: C/tomboy.xml:66(holder) C/tomboy.xml:178(para) C/tomboy.xml:190(para)
+msgid "Paul Cutler"
+msgstr "Paul Cutler"
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Prema sobre o botón <placeholder-1/>"
-
-#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr ""
-"Para engadir unha mensaxe personalizada nova, desde a sección <gui>Engadir "
-"estado gardado</gui>."
+#: C/tomboy.xml:77(publishername) C/tomboy.xml:93(orgname)
+#: C/tomboy.xml:105(orgname) C/tomboy.xml:117(orgname)
+#: C/tomboy.xml:129(orgname) C/tomboy.xml:141(orgname) C/tomboy.xml:180(para)
+#: C/tomboy.xml:192(para) C/tomboy.xml:204(para) C/tomboy.xml:216(para)
+msgid "GNOME Documentation Project"
+msgstr "Proxecto de documentación de GNOME"
-#: C/set-custom-status.page:136(p)
-msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
-msgstr ""
-"Prema na lista despregábel para seleccionar o estado no que quere "
-"estabelecer unha mensaxe personalizada."
+#: C/tomboy.xml:88(firstname)
+msgid "Alex"
+msgstr "Alex"
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Prema sobre a caixa de texto e escriba a nova mensaxe personalizada."
+#: C/tomboy.xml:90(surname)
+msgid "Graveley"
+msgstr "Agraveley"
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "Prema <gui>Engadir</gui> para engadir unha mensaxe nova aos gardados."
+#: C/tomboy.xml:95(email)
+msgid "alex@beatniksoftware.com"
+msgstr "alex@beatniksoftware.com"
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Ao rematar, prema en <placeholder-/>"
+#: C/tomboy.xml:100(firstname)
+msgid "Brent"
+msgstr "Brent"
-#: C/set-custom-status.page:163(p)
-msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
-msgstr ""
-"Cando edita ou engade unha mensaxe personalizada nova non se estabelece como "
-"a mensaxe de estado actual. Ten que seleccionalo na xanela <gui>Lista de "
-"contactos</gui>."
+#: C/tomboy.xml:102(surname)
+msgid "Smith"
+msgstr "Smith"
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Enviar unha mensaxe a un dos seus contactos."
+#: C/tomboy.xml:107(email)
+msgid "gnome@nextreality.net"
+msgstr "gnome@nextreality.net"
-#: C/send-message.page:17(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
-#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
-#: C/change-status.page:19(name) C/add-contact.page:18(name)
-msgid "Phil Bull"
-msgstr "Phil Bull"
+#: C/tomboy.xml:112(firstname)
+msgid "Boyd"
+msgstr "Boyd"
-#: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
-#: C/change-status.page:20(email) C/add-contact.page:19(email)
-msgid "philbull@gmail.com"
-msgstr "philbull@gmail.com"
+#: C/tomboy.xml:114(surname)
+msgid "Timothy"
+msgstr "Timothy"
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Enviar unha mensaxe a alguén"
+#: C/tomboy.xml:119(email)
+msgid "btimothy@gmail.com"
+msgstr "btimothy@gmail.com"
-#: C/send-message.page:36(p)
-msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema dúas veces sobre o nome "
-"do contacto co que quere ter unha conversa."
+#: C/tomboy.xml:124(firstname)
+msgid "Sandy"
+msgstr "Sandy"
-#: C/send-message.page:42(p)
-msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
-msgstr ""
-"Abrirase unha nova xanela. Escriba a mensaxe na caixa na parte inferior da "
-"xanela e prema <placeholder-1/> para enviala."
+#: C/tomboy.xml:126(surname)
+msgid "Armstrong"
+msgstr "Armstrong"
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Enviar unha mensaxe a un metacontacto"
+#: C/tomboy.xml:131(email)
+msgid "sanfordarmstrong@gmail.com"
+msgstr "sanfordarmstrong@gmail.com"
+
+#: C/tomboy.xml:136(firstname)
+msgid "Paul"
+msgstr "Paul"
+
+#: C/tomboy.xml:138(surname)
+msgid "Cutler"
+msgstr "Cutler"
+
+#: C/tomboy.xml:143(email)
+msgid "pcutler@foresightlinux.org"
+msgstr "pcutler@foresightlinux.org"
+
+#: C/tomboy.xml:173(revnumber)
+msgid "Tomboy Manual 2.1"
+msgstr "Manual de Tomboy 2.1"
-#: C/send-message.page:58(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
-msgstr ""
-"Prema co botón dereito sobre o nome do contacto co que quere manter unha "
-"conversa e desde o menú seleccione <gui style=\"menuitem\">Conversa</gui>."
+#: C/tomboy.xml:175(date)
+msgid "2009-03-23"
+msgstr "23-03-2009"
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Enviar un ficheiro desde o seu computador a un dos seus contactos."
+#: C/tomboy.xml:185(revnumber)
+msgid "Tomboy Manual 4.0"
+msgstr "Manual de Tomboy 4.0"
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Enviar ficheiros"
+#: C/tomboy.xml:187(date)
+msgid "2008-03-07"
+msgstr "07-03-2008"
-#: C/send-file.page:45(p)
-msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
-msgstr ""
-"Prema co botón dereito sobre o nome do contacto co que quere manter unha "
-"conversa e seleccione <placeholder-1/>."
+#: C/tomboy.xml:197(revnumber)
+msgid "Tomboy Manual 3.0"
+msgstr "Manual de Tomboy 3.0"
-#: C/send-file.page:50(p)
-msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
-msgstr ""
-"Prema sobre o contacto ao que quere enviar un ficheiro e elixa "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar ficheiro</gui></"
-"guiseq>."
+#: C/tomboy.xml:199(date)
+msgid "2007-09-13"
+msgstr "13-09-2007"
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Seleccione o ficheiro para enviar e prema <gui>Enviar</gui>."
+#: C/tomboy.xml:209(revnumber)
+msgid "Tomboy Manual 2.0"
+msgstr "Manual de Tomboy 2.0"
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Aparecerá a xanela <gui>Transferencia de ficheiros</gui>."
+#: C/tomboy.xml:211(date)
+msgid "2007-02-28"
+msgstr "28-02-2007"
-#: C/send-file.page:66(p)
-msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
-msgstr ""
-"Agarde a que o seu contacto acepte a transferencia de ficheiro e prema "
-"<gui>Deter</gui> para deter a transferencia."
+#: C/tomboy.xml:221(releaseinfo)
+msgid "This manual describes version 0.14.0 of Tomboy"
+msgstr "Este manual describe a versión 0.14.0 de Tomboy"
-#: C/send-file.page:72(p)
-msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
-msgstr ""
-"Cano remate a transferencia é posíbel pechar a xanela <gui>Transferencia de "
-"ficheiro</gui>."
+#: C/tomboy.xml:224(title)
+msgid "Feedback"
+msgstr "Comentarios e suxestións"
-#: C/send-file.page:80(p)
+#: C/tomboy.xml:226(para)
msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
+"To report a bug or make a suggestion regarding the Tomboy application or "
+"this manual, follow the directions in the <ulink type=\"help\" url=\"ghelp:"
+"gnome-feedback\">GNOME Feedback Page</ulink>."
msgstr ""
-"Se ten múltiples transferencias finalizadas listas na xanela prema "
-"<gui>Limpar</gui> para baleirar a lista. Isto só quitará os ficheiros da "
-"lista e non os borrará do computador."
+"Para informar dun erro ou facer unha suxestión sobre o aplicativo "
+"<application>Brasero</application> ou este manual, siga os consellos da "
+"<ulink url=\"ghelp:gnome-feedback\" type=\"help\">Páxina de Feedback de "
+"GNOME</ulink>."
-#: C/send-file.page:87(p)
-msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
-msgstr ""
-"So é posíbel enviar ficheiros ao usar os seguintes servizos: <em>Jabber</"
-"em>, <em>Google Talk</em> e <em>Personas próximas</em>."
+#: C/tomboy.xml:236(primary)
+msgid "Tomboy Notes"
+msgstr "Notas de Tomboy"
-#: C/send-file.page:93(p)
-msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
-msgstr ""
-"Para enviarlle un ficheiro a unha persoa debe estar conectado a Internet ou "
-"á rede local."
+#: C/tomboy.xml:240(primary)
+msgid "Tomboy"
+msgstr "Tomboy"
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Entender a característica de Persoas próximas."
+#: C/tomboy.xml:244(primary)
+msgid "notes"
+msgstr "notas"
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Que é Persoas próximas"
+#: C/tomboy.xml:250(title)
+msgid "Introduction"
+msgstr "Introdución"
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "Gustaríame ver isto explicado un pouco máis."
+#: C/tomboy.xml:253(title)
+msgid "Notes Application"
+msgstr "Notas do aplicativo"
-#: C/salut-protocol.page:40(p)
+#: C/tomboy.xml:262(para)
msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
+"Tomboy is a desktop note-taking application for GNOME, Microsoft Windows, "
+"and Mac OS X. It is simple and easy to use, and allows you to organize the "
+"ideas and information you deal with every day. Tomboy has some very useful "
+"editing features to help you customize your notes, including:"
msgstr ""
-"O servizo de Xente próxima é un servizo de comunicación sen servidores: non "
-"precisa conectarse e autenticarse contra un servidor central para poder "
-"usalo."
+"Tomboy é un aplicativo de creación de notas para o escritorio GNOME, "
+"Microsoft Windows e Mac OS X. É moi sinxelo e doado de usar e permítelle "
+"organizar as súas ideas e información que xestiona cada día. Tomoby ten "
+"algunhas características de edición moi útiles para axudarlle a personalizar "
+"as súas notas, incluíndo:"
-#: C/salut-protocol.page:45(p)
-msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
-msgstr ""
-"Este tipo de sistemas de mensaxería sen servidores está restrinxido a redes "
-"de área local e non se necesita unha conexión activa con Internet."
+#: C/tomboy.xml:269(para)
+msgid "Highlighting Search Text"
+msgstr "Busca de texto con realce"
-#: C/salut-protocol.page:49(p)
-msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
-msgstr ""
-"A xente que usa o servizo dentro da mesma rede de área local autodestruirase "
-"e será posíbel enviarlles mensaxes e ficheiros ao igual que con outros "
-"servizos"
+#: C/tomboy.xml:273(para)
+msgid "Inline Spell Checking"
+msgstr "Comprobación ortográfica en liña"
-#: C/salut-protocol.page:54(p)
-msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
-msgstr ""
-"Todas as redes modernas de área local deberían poder admitir este tipo de "
-"servizos."
+#: C/tomboy.xml:277(para)
+msgid "Auto-linking Web &amp; Email Addresses"
+msgstr "Autoligado de enderezos web e correo electrónico"
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Quitar completamente unha conta en <app>Empathy</app>."
+#: C/tomboy.xml:281(para)
+msgid "Undo/Redo Support"
+msgstr "Compatibilidade para desfacer/refacer"
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "Eliminar unha conta"
+#: C/tomboy.xml:285(para)
+msgid "Font Styling &amp; Sizing"
+msgstr "Estilos de tipo de letra e tamaño"
-#: C/remove-account.page:35(p)
-msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
+#: C/tomboy.xml:289(para) C/tomboy.xml:795(title)
+msgid "Bulleted Lists"
msgstr ""
-"Pode quitar completamente unha conta de <app>Empathy</app> se non quere "
-"seguir usándoa. Se quere usar de novo a conta en <app>Empathy</app> no "
-"futuro, deberá engadir os detalles da conta de novo."
-#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:48(p)
+#: C/tomboy.xml:293(para)
msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"Tomboy is accessed through the GNOME panel, the taskbar in Microsoft "
+"Windows, or the dock in Mac OS X. To startup Tomboy automatically when you "
+"log into GNOME, see <xref linkend=\"add-to-panel\"/>."
msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Editar</"
-"gui><gui>Contas</gui></guiseq> ou prema <key>F4</key>."
+"Pode acceder a Tomboy dese o panel de GNOME, a barra de tarefas de Microsoft "
+"Windows ou o Dock en Mac OS X. Para iniciar automaticamente Tomboy ao "
+"iniciar sesión en GNOME vexa <xref linkend=\"add-to-panel\"/>."
-#: C/remove-account.page:46(p)
-msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
-msgstr ""
-"Seleccione a conta que desexa eliminar desde a lista de contas na parte "
-"esquerda da xanela."
+#: C/tomboy.xml:301(title)
+msgid "Getting Started"
+msgstr "Comezando"
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Prema <gui style=\"button\">Quitar</gui>."
+#: C/tomboy.xml:304(title)
+msgid "Adding Tomboy to the GNOME Panel"
+msgstr "Engadir Tomboy ao panel de GNOME"
-#: C/remove-account.page:53(p)
+#: C/tomboy.xml:306(para)
msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"To add Tomboy to a panel in GNOME, right-click on the panel, then choose "
+"<menuchoice><guimenuitem>Add to Panel</guimenuitem></menuchoice>. Select "
+"Tomboy Notes in the Add to the panel dialog, then click "
+"<menuchoice><guibutton>Add</guibutton></menuchoice>. You should see a yellow "
+"note icon appear in the panel, representing Tomboy. The panel icon is "
+"illustrated in <xref linkend=\"tomboy-panel\"/>."
msgstr ""
-"Mostrarase un diálogo preguntando por unha confirmación. Prema no botón "
-"<gui>Eliminar</gui> para quitar a conta permanentemente."
-#: C/remove-account.page:59(p)
+#: C/tomboy.xml:315(para)
msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
-msgstr ""
-"Incluso despois de eliminar unha conta <app>Empathy</app> non borra o seu "
-"historial de conversas para esa conta."
-
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+"Tomboy is automatically added to the taskbar when run on Microsoft Windows, "
+"or the dock when run on Mac OS X."
msgstr ""
-"Diagnosticar problemas comúns ao conectarse a un servizo de mensaxaría "
-"instantánea."
-
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problemas ao conectarse a un servizo de mensaxaría instantánea"
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+#: C/tomboy.xml:319(title)
+msgid "Creating Notes"
+msgstr "Crear notas"
-#: C/prob-conn-neterror.page:7(desc)
+#: C/tomboy.xml:321(para)
msgid ""
-"An error message which says “<gui>Network error</gui>” appears in the main "
-"window."
+"Once you have successfully added Tomboy to the panel, you can create new "
+"notes using one of the following methods."
msgstr ""
-"Aparecerá a mensaxe de erro «<gui>Erro de rede</gui>» na xanela principal."
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error”"
-msgstr "Obteño unha mensaxe que mostra «Erro de rede»"
+#: C/tomboy.xml:324(para)
+msgid "To create a new note using the mouse:"
+msgstr "Para crear unha nova usando o rato:"
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
-
-#: C/prob-conn-neterror.page:37(p)
+#: C/tomboy.xml:328(para)
msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
+"Click on the Tomboy note icon present in the GNOME Panel or Windows taskbar. "
+"A menu will appear."
msgstr ""
-"Empathy xa non lle permite crear unha conta de IRC sen un alcume válido. "
-"Quitouse a ligazón da guía. Quitar o texto."
+"Prema na icona de nota de Tomboy presente no panel de GNOME ou na barra de "
+"tarefas de Windows e aparecerá un menú."
-#: C/prob-conn-neterror.page:41(p)
+#: C/tomboy.xml:333(para)
msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"Select the <menuchoice><guimenuitem>Create New Note</guimenuitem></"
+"menuchoice> option in the menu."
msgstr ""
-"Este tipo de mensaxe sucede cando <app>Empathy</app> non se pode comunicar "
-"co servizo de mensaxaría instantánea por algunha razón."
+"Seleccione a opción <menuchoice><guimenuitem>Crear nova nota</guimenuitem></"
+"menuchoice> desde o menú."
-#: C/prob-conn-neterror.page:45(p)
-msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
-msgstr ""
-"Este tipo de erro tamén sucede cando intenta usar unha conta de IRC sen ter "
-"configurado o alcume"
+#: C/tomboy.xml:339(para)
+msgid "To create a new note using the keyboard:"
+msgstr "Para crear unha nota usando o teclado:"
-#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
+#: C/tomboy.xml:343(para)
msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
+"Open the Tomboy menu using the key combination <keycombo><keycap>Alt</"
+"keycap><keycap>F12</keycap></keycombo>."
msgstr ""
-"Asegúrese de que está conectado a Internet ou a unha rede de área local."
+"Abra o menú de Tomboy usando a combinación de teclas <keycombo><keycap>Alt</"
+"keycap><keycap>F12</keycap></keycombo>."
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
+#: C/tomboy.xml:351(para)
msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
+"Use the <keycap>N</keycap> key to select the menu option "
+"<menuchoice><guimenuitem>Create New Note</guimenuitem></menuchoice>."
msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logotipo da mensaxaría instantánea Empathy</media>Mensaxaría instantánea "
-"Empathy"
+"Use a tecla <keycap>N</keycap> para seleccionar a opción de menú "
+"<menuchoice><guimenuitem>Crear nova nota</guimenuitem></menuchoice>."
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
-msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
-msgstr ""
-"Comprobe na sección <placeholder-1/> que todos os detalles son correctos. "
-"Vostede poderá encontrar estes detalles no sitio web do seu servizo de "
-"mensaxería."
+#: C/tomboy.xml:360(title)
+msgid "Editing Notes"
+msgstr "Editar notas"
-#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
+#: C/tomboy.xml:362(para)
msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
+"After creating a new note, a new window will appear with the title "
+"<literal>New Note <replaceable>N</replaceable></literal>. At the top of the "
+"note is a toolbar with several buttons and text. Directly below this toolbar "
+"is the content area of the note. This is illustrated in <xref linkend=\"new-"
+"note\"/>."
msgstr ""
-"Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
-"reconectarse ao servizo."
+"Logo de crear unha nova nota, aparecerá unha nova xanela co título "
+"<literal>Nova nota <replaceable>N</replaceable></literal>. Na parte superior "
+"da nota está a barra de ferramentas con varios botóns e texto. Xusto embaixo "
+"da barra de ferramentas está a área de contido da nota. Isto está ilustrado "
+"en <xref linkend=\"new-note\"/>."
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "Compatibilidade de proxy"
-
-#: C/prob-conn-neterror.page:91(p)
+#: C/tomboy.xml:368(para)
msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+"The note can be edited by clicking in the content area and using the "
+"keyboard to add and remove content. The first line is considered the title "
+"of the note. By default this is populated with the text <quote><literal>New "
+"Note <replaceable>N</replaceable></literal></quote>. The title is changed by "
+"clicking in the content area on the first line and using the keyboard to "
+"change the title. By default, focus is given to the content area upon "
+"creation of a new note, so you can immediately start editing the note "
+"without the need to click on the content area with the mouse."
msgstr ""
-"Polo momento <app>Empathy</app> non se pode configurar para que funcione cun "
-"proxy."
-
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use”"
-msgstr "\"Nome en uso\""
-#: C/prob-conn-name.page:10(desc)
+#: C/tomboy.xml:378(para)
msgid ""
-"An error message which says “<gui>Name in use</gui>” appears in the main "
-"window."
+"Using the toolbar available on each note is discussed in <xref linkend="
+"\"working-with-notes\"/>."
msgstr ""
-"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
-"uso</gui>»"
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use”"
-msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»"
+#: C/tomboy.xml:382(title)
+msgid "The default window for a New Note"
+msgstr "A xanela predeterminada para a Nova nota"
-#: C/prob-conn-name.page:34(p)
-msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
-msgstr ""
-"Este tipo de erro sucede cando tenta conectarse á súa conta de IRC e está "
-"usando un alcume que xa está usando outra persoa nesa rede en particular."
+#: C/tomboy.xml:393(title)
+msgid "Table of Contents"
+msgstr "Táboa de contidos"
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "Na caixa de texto <gui>Alcume</gui> escriba un alcume novo."
-
-#: C/prob-conn-name.page:55(p)
+#: C/tomboy.xml:395(para)
msgid ""
-"If you have registered that nickname within the network you are using, set "
-"the password for that nickname. For more information, see <link xref=\"irc-"
-"nick-password\"/>."
+"To get an overview of all the notes managed by Tomboy, select the "
+"<menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> menu "
+"item from the panel menu. By default, the <interface>Search All Notes</"
+"interface> dialog will display the notes in the order that they were last "
+"modified. Click the <guilabel>Note</guilabel> or <guilabel>Last Changed</"
+"guilabel> column headings to change the sort order. Click the column heading "
+"a second time to toggle between ascending and descending order."
msgstr ""
-"Se rexistrou ese alcume na rede que está usando, estabeleza o contrasinal "
-"para ese alcume. Para obter máis información consulte a <link xref=\"irc-"
-"nick-password\"/>."
-#: C/prob-conn-name.page:64(p)
+#: C/tomboy.xml:405(para)
msgid ""
-"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
-"and then select it again to try to reconnect to the service."
+"You can find specific notes by entering text into the search field in the "
+"<interface>Search All Notes</interface> dialog. The list of notes will "
+"automatically update to list only the notes which have matching text."
msgstr ""
-"Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
-"reconectarse ao servizo."
-#: C/prob-conn-auth.page:8(desc)
+#: C/tomboy.xml:410(para)
msgid ""
-"An error message which says “<gui>Authentication failed</gui>” appears in "
-"the main window."
+"To open a note in the <interface>Search All Notes</interface> dialog, do one "
+"of the following:"
msgstr ""
-"Aparece unha mensaxe de erro na xanela principal que mostra «<gui>Fallo de "
-"autenticación</gui>»."
-
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed”"
-msgstr "Obteño unha mensaxe que di «Produciuse un fallo na autenticación»"
-#: C/prob-conn-auth.page:38(p)
-msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
-msgstr ""
-"Este tipo de erro prodúcese cando o seu servizo de mensaxaría intantánea non "
-"lle está permitindo conectar porque por algunha razón non recoñece o seu "
-"nome de usuario ou contrasinal."
+#: C/tomboy.xml:415(para)
+msgid "Double-click on a note."
+msgstr "Prema dúas veces sobre unha nota."
-#: C/prob-conn-auth.page:50(p)
+#: C/tomboy.xml:419(para)
msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
+"Highlight a note by selecting it and then select "
+"<menuchoice><guimenuitem>Open</guimenuitem></menuchoice> from the "
+"<guimenuitem>File</guimenuitem> menu."
msgstr ""
-"Asegúrese de que rexistrou unha conta co servizo ao que está tentando "
-"conectarse. Se non ten unha conta a maioría dos servizos non lle permitirán "
-"que se conecte."
-#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
+#: C/tomboy.xml:425(para)
msgid ""
-"Type your username and password again to make sure that they are correct."
+"Right-click on a note and select <menuchoice><guimenuitem>Open</"
+"guimenuitem></menuchoice> from the context menu that appears."
msgstr ""
-"Escriba o seu nome de usuario e contrasinal de novo e asegúrese de que son "
-"correctos."
-#: C/prob-conn-acctdisabled.page:7(desc)
+#: C/tomboy.xml:431(para)
msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
+"Highlight a note by selecting it and then press the key combination "
+"<keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo>."
msgstr ""
-"A conta de mensaxaría instantánea que quere usar non está activada na lista "
-"de contas."
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "A miña conta non está activada"
+#: C/tomboy.xml:445(title)
+msgid "Working With Notes"
+msgstr "Traballar con notas"
-#: C/prob-conn-acctdisabled.page:35(p)
+#: C/tomboy.xml:447(para)
msgid ""
-"If the instant messaging account that you want to use is not enabled in the "
-"drop-down account list when you try to start a new conversation or join a "
-"room, your account details may not be correct."
+"Notes are modified and edited through the main window for each note. The "
+"toolbar at the top of each note allows you to stylize the note and perform "
+"other note-related functions. We discuss the functions of each item on the "
+"toolbar in the following sections."
msgstr ""
-"Se a conta de mensaxaría instantánea que quere usar non está activada na "
-"lista despregábel de contas, cando tenta iniciar unha conversa nova ou "
-"unirse a unha charla, pode que os detalles da súa conta non sexa correctos."
-#: C/prob-conn-acctdisabled.page:48(p)
-msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
-msgstr ""
-"Elixa <guiseq><gui>Editar</gui><gui>Contas</gui></guiseq> e seleccione a "
-"conta que non está funcionando."
+#: C/tomboy.xml:453(title)
+msgid "Search"
+msgstr "Buscar"
-#: C/prob-conn-acctdisabled.page:65(p)
+#: C/tomboy.xml:455(para)
msgid ""
-"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
-"If it is not, select the check-box to enable the account."
+"Clicking the <guibutton>Search</guibutton> button will open the "
+"<interface>Search All Notes</interface> dialog described earlier (<xref "
+"linkend=\"search-all-notes\"/>.)"
msgstr ""
-"Comprobe que a casilla de verificación <gui style=\"checkbox\">Activada</"
-"gui> está seleccionada. Se non o está marque a casilla de verificación para "
-"activar a conta."
-
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Explorar ou buscar nas súas mensaxes anteriores."
-
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "Ver as conversas anteriores"
-#: C/prev-conv.page:39(p)
-msgid ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
-msgstr ""
-"Resaltar texto é estraño <link href=\"http://bugzilla.gnome.org/show_bug.cgi?"
-"id=593733\">#59733</link>. Se existe un resaltado actualmente, independente "
-"da selección (en amarelo, por exemplo), pódese usar o termo «resaltar». De "
-"outra forma débese usar o termo «seleccionado». Siga o proceso do erro."
+#: C/tomboy.xml:461(title)
+msgid "Link"
+msgstr "Ligazón"
-#: C/prev-conv.page:46(p)
+#: C/tomboy.xml:463(para)
msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
+"The <guibutton>Link</guibutton> button allows you to create a link to a new "
+"note from within the current note. For example, if your note contains the "
+"phrase <quote>FinalExam</quote>, you can select this text with the mouse and "
+"click the <guibutton>Link</guibutton> button to create a new note with the "
+"title <quote>FinalExam</quote>. A link will also be created in the current "
+"note that can be clicked to open the new <quote>FinalExam</quote> note."
msgstr ""
-"<app>Empathy</app> garda automaticamente todas as conversas de texto que ten "
-"cos seus contactos. Pode <link xref=\"#search\">buscar a través de todas as "
-"súas conversas anteriores</link> ou <link xref=\"#browse\">buscar conversas "
-"anteriores</link> por contacto e data."
-#: C/prev-conv.page:54(p)
+#: C/tomboy.xml:472(para)
msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
+"Changing the title of a note will update links present in other notes. This "
+"prevents broken links from occurring when a note is renamed."
msgstr ""
-"Non necesita estar conectado a Internet para ver e buscar nas súas conversas "
-"anteriores."
-
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "Buscar conversas anteriores"
-#: C/prev-conv.page:63(p)
-msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr ""
-"Pode realizar unha busca de texto completo sobre todas as súas conversas "
-"anteriores."
+#: C/tomboy.xml:479(title)
+msgid "Text"
+msgstr "Texto"
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
+#: C/tomboy.xml:481(para)
msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"Formatting text within your notes can be done using the <guibutton>Text</"
+"guibutton> button. The <guibutton>Text</guibutton> button will display a "
+"menu with several options from which you can choose. Each menu item is "
+"explained next."
msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Ver</"
-"gui><gui>Conversas previas</gui></guiseq>. De forma alternativa prema "
-"<key>F3</key>."
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Seleccione o separador <gui>Buscar</gui>."
+#: C/tomboy.xml:488(term)
+msgid "Undo"
+msgstr "Desfacer"
-#: C/prev-conv.page:74(p)
+#: C/tomboy.xml:491(para)
msgid ""
-"In the <gui>For</gui> field, type the text you want to search for. Click "
-"<gui>Find</gui> or press <key>Enter</key>."
+"Support for <quote>Undo</quote> is available in Tomboy through this menu "
+"item. The Undo function allows you to revert previous changes made to your "
+"note during the current session. To undo your last change using the "
+"keyboard, use the standard keybinding, <keycombo><keycap>Ctrl</"
+"keycap><keycap>Z</keycap></keycombo>."
msgstr ""
-"No campo <gui>Para</gui> escriba o texto que quere buscar. Prema "
-"<gui>Buscar</gui> ou prema <key>Intro</key>."
-#: C/prev-conv.page:78(p)
-msgid ""
-"Any conversations that matched your search terms will be shown in the list "
-"below the search field. By default, conversations are ordered by date."
-msgstr ""
-"Mostrarase na lista baixo o campo de busca calquera conversa que coincida "
-"cos seus termos de busca. As conversas ordénanse por data de forma "
-"predefinida."
+#: C/tomboy.xml:504(term)
+msgid "Redo"
+msgstr "Refacer"
-#: C/prev-conv.page:82(p)
+#: C/tomboy.xml:507(para)
msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"The <quote>Redo</quote> function is used to put back changes that were "
+"removed using the <quote>Undo</quote> feature. To redo your last change "
+"using the keyboard, use the standard keybinding, <keycombo><keycap>Shift</"
+"keycap><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>."
msgstr ""
-"Prema sobre unha conversa para vela. <app>Empathy</app> seleccionará o texto "
-"na conversa que coincida cos seus termos de busca."
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "Explorar as conversas anteriores"
+#: C/tomboy.xml:521(term)
+msgid "Bold"
+msgstr "Negra"
-#: C/prev-conv.page:91(p)
+#: C/tomboy.xml:524(para)
msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
+"To make text within your note bold, first select the text you want to "
+"modify. Then select the <menuchoice><guimenuitem>Bold</guimenuitem></"
+"menuchoice> option from the <guibutton>Text</guibutton> menu. You may also "
+"use the keybinding <keycombo><keycap>Ctrl</keycap><keycap>B</keycap></"
+"keycombo> after selecting the text."
msgstr ""
-"Pode examinar por data as conversas previas cos seus contactos ou en salas "
-"de conversa."
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Seleccione o separador <gui>Conversas</gui>."
+#: C/tomboy.xml:537(term)
+msgid "Italic"
+msgstr "Cursiva"
-#: C/prev-conv.page:103(p)
+#: C/tomboy.xml:540(para)
msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
+"To make text within your note italic, first select the text you want to "
+"modify. Then select the <menuchoice><guimenuitem>Italic</guimenuitem></"
+"menuchoice> option from the <guibutton>Text</guibutton> menu. You may also "
+"use the keybinding <keycombo><keycap>Ctrl</keycap><keycap>I</keycap></"
+"keycombo> after selecting the text."
msgstr ""
-"Seleccione unha conta desde a lista despregábel na parte superior esquerda. "
-"Mostrarase unha lista de contactos e salas de conversa para dita conta."
-#: C/prev-conv.page:107(p)
-msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
-msgstr ""
-"Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
-"conversas. Por omisión mostrarase a conversa máis recente."
+#: C/tomboy.xml:553(term)
+msgid "Strikeout"
+msgstr "Riscado"
-#: C/prev-conv.page:111(p)
+#: C/tomboy.xml:556(para)
msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
+"The strikeout style will put a line through the selected text. To add a "
+"strikeout, select the text and then select the "
+"<menuchoice><guimenuitem>Strikeout</guimenuitem></menuchoice> option from "
+"the <guibutton>Text</guibutton> menu. You may also use the keybinding "
+"<keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo> after selecting "
+"the text."
msgstr ""
-"Pode explorar as súas conversas por data. Mostraranse os días nos que tipo "
-"unha conversa co contacto seleccionado en texto en negriña. Prema na data "
-"para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
-"datas máis cercanas."
-#: C/prev-conv.page:117(p)
-msgid ""
-"You can search for text in the displayed conversation by typing into the "
-"search field at the top. The matching text will be highlighted."
-msgstr ""
-"Pode buscar dentro do texto das conversas mostradas escribindo na caixa de "
-"busca na parte superior. O texto coincidente resaltarase."
+#: C/tomboy.xml:570(term)
+msgid "Highlight"
+msgstr "Realzar"
-#: C/prev-conv.page:121(p)
+#: C/tomboy.xml:573(para)
msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
+"The highlight style will put a yellow background around the selected text. "
+"To add a highlight, select the text and then select the "
+"<menuchoice><guimenuitem>Highlight</guimenuitem></menuchoice> option from "
+"the <guibutton>Text</guibutton> menu. You may also use the keybinding "
+"<keycombo><keycap>Ctrl</keycap><keycap>H</keycap></keycombo> after selecting "
+"the text."
msgstr ""
-"Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
-"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
-"do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
-"Abrirase a xanela <gui>Ver conversas previas</gui> co contacto seleccionado."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Unir e separar diferentes contactos nun só."
-
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Combinar e separar contactos"
-#: C/link-contacts.page:26(p)
-msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
-msgstr ""
-"Se un, ou máis, dos seus contactos ten múltiples contas con diferentes "
-"servizos de mensaxaría, pode combinar estes contactos nun único."
+#: C/tomboy.xml:587(term) C/tomboy.xml:1414(member) C/tomboy.xml:1499(term)
+msgid "Fixed Width"
+msgstr "Largura fixa"
-#: C/link-contacts.page:30(p)
+#: C/tomboy.xml:590(para)
msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
+"The fixed width style allows text to use a fixed width font. To change "
+"existing text, first select the text you want to modify. Then select the "
+"<menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option from "
+"the <guibutton>Text</guibutton> menu. You can also select the "
+"<menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option from "
+"the <guibutton>Text</guibutton> before you start typing to have the text you "
+"type be in a fixed width style."
msgstr ""
-"O contacto resultante chámase un <em>meta-contacto</em>: un contacto "
-"composto por diferentes contactos sinxelos."
-#: C/link-contacts.page:34(p)
+#: C/tomboy.xml:601(para)
msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"The <menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option "
+"is a feature provided by the Fixed Width Add-in. For more information on add-"
+"ins, see <xref linkend=\"plugins\"/>."
msgstr ""
-"Se ten un contacto Xoán Souto que está usando tres servizos de mensaxaría "
-"como:"
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "xoan@facebook"
+#: C/tomboy.xml:610(term)
+msgid "Font size"
+msgstr "Tamaño do tipo de letra"
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "xoan.souto@gmail"
+#: C/tomboy.xml:615(guilabel) C/tomboy.xml:625(guilabel)
+msgid "Small"
+msgstr "Pequeno"
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "xoan_souto@hotmail"
+#: C/tomboy.xml:617(guilabel) C/tomboy.xml:627(guilabel)
+msgid "Normal"
+msgstr "Normal"
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "Pode combinar estes contactos nun só Xoán Souto"
+#: C/tomboy.xml:619(guilabel) C/tomboy.xml:629(guilabel)
+msgid "Large"
+msgstr "Grande"
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Combinar contactos"
+#: C/tomboy.xml:621(guilabel) C/tomboy.xml:631(guilabel)
+msgid "Huge"
+msgstr "Enorme"
-#: C/link-contacts.page:63(p)
+#: C/tomboy.xml:613(para)
msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
-"gui>."
+"There are actually four options in this part of the menu: <placeholder-1/>. "
+"Each one of these options represents a font size to use for the selected "
+"text in the note. To modify the font size, select the text and then select "
+"one of <placeholder-2/> options from the <guibutton>Text</guibutton> menu."
msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema co botón dereito un dos "
-"contactos que ten diferentes contas, e seleccione <gui style=\"menuitem"
-"\">Ligar contactos...</gui>."
-#: C/link-contacts.page:70(p)
-msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
-msgstr ""
-"Desde o panel lateral na xanela <gui>Contactos ligados</gui> seleccione os "
-"contactos que quere combinar."
+#: C/tomboy.xml:638(term)
+msgid "Bullets"
+msgstr "Viñetas"
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Prema <gui style=\"button\">Ligar</gui>."
+#: C/tomboy.xml:646(guilabel)
+msgid "Increase Indent"
+msgstr "Aumentar sangría"
-#: C/link-contacts.page:82(p)
-msgid ""
-"When a meta-contact has been created, the default contact that will be used "
-"to have a conversation with when you double-click on it, is the contact with "
-"the highest presence on-line."
-msgstr ""
-"Cando se cree un meta-contacto, o contacto predeterminado usarase para ter "
-"unha conversa con el ao premer dúas veces sobre el, este contacto terá a "
-"presencia en liña máis alta."
-
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+#: C/tomboy.xml:648(guilabel)
+msgid "Decrease Indent"
+msgstr "Diminuír sangría"
-#: C/link-contacts.page:94(p)
+#: C/tomboy.xml:641(para)
msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Select the <menuchoice><guimenuitem>Bullets</guimenuitem></menuchoice> "
+"option from the <guibutton>Text</guibutton> menu to begin or end a bulleted "
+"list. If the cursor is inside a bulleted list, the <placeholder-1/> options "
+"will be enabled."
msgstr ""
-"Desde a <gui>Lista de contactos</gui>, prema co botón dereito para contactar "
-"con el de forma separada, e seleccione <gui style=\"menuitem\">Ligar "
-"contactos...</gui>."
-
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Prema <gui style=\"button\">Desligar</gui>."
-
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Información legal."
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Licenza"
-
-#: C/license.page:12(p)
+#: C/tomboy.xml:651(para)
msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"With the cursor on a bulleted list line, select the "
+"<menuchoice><guimenuitem>Increase Indent</guimenuitem></menuchoice> option "
+"to shift the current line to the right or the "
+"<menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> option "
+"to shift the current line to the left."
msgstr ""
-"Este traballo está licenciado baixo una Licenza Creative Commons Atribución "
-"- Compartir igual 3.0 sen asistencia."
-
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "É libre de:"
-
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Compartir"
-
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Copiar, distribuír e comunicar publicamente a obra"
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Facer obras derivadas"
-
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Adaptar o traballo."
-
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "Baixo as seguintes condicións:"
-
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Atribución"
-
-#: C/license.page:39(p)
-msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+#: C/tomboy.xml:660(para)
+msgid "For more information on bullets, see <xref linkend=\"bullets\"/>."
msgstr ""
-"Debe recoñecer os créditos da obra da maneira especificada polo autor ou o "
-"licenciatario (pero non dunha maneira que suxira que ten o seu apoio ou "
-"apoian o uso que fai da súa obra)."
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Compartir igual"
+#: C/tomboy.xml:666(term)
+msgid "Find in This Note"
+msgstr "Buscar nesta nota"
-#: C/license.page:47(p)
+#: C/tomboy.xml:669(para)
msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"Use this to search for text within the current note. A small find bar will "
+"open up at the bottom of the note. To open the find bar using the keyboard, "
+"use the standard keybinding, <keycombo><keycap>Ctrl</keycap><keycap>F</"
+"keycap></keycombo>."
msgstr ""
-"Se modifica, transforma ou constrúe sobre este traballo debe distribuír o "
-"traballo resultando baixo unha licenza igual, similar ou compatíbel."
-#: C/license.page:53(p)
+#: C/tomboy.xml:677(para)
msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"Enter text to find. After entering text, the matches will be highlighted. "
+"Click <guibutton>Find Next</guibutton> to highlight the next match and place "
+"the cursor there. Click <guibutton>Previous</guibutton> to move to the "
+"previous match."
msgstr ""
-"Pode encontrar o texto completo da licenza vexa o <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">sitio web de "
-"CreativeCommons</link>, ou lea o <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">Escrito de Commons</link> completo."
-#: C/irc-start-conversation.page:8(desc)
-#| msgid "Start a conversation witn an IRC contact."
-msgid "Start a conversation with an IRC contact."
-msgstr "Iniciar unha conversa con un contacto do IRC."
-
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Conversar con alguén no IRC"
-
-#: C/irc-start-conversation.page:32(p)
+#: C/tomboy.xml:683(para)
msgid ""
-"You can hold private conversations with other IRC users, outside of the "
-"public IRC chat rooms. To start a conversation with another IRC user:"
+"To close the find bar, click <guibutton>X</guibutton> (Close Button) on the "
+"far left or press the <keycap>Escape</keycap> key."
msgstr ""
-"Pode manter conversas privadas con outros usuarios do IRC, fora das salas "
-"públicas do IRC. Para iniciar unha conversa con outro usuario do IRC:"
+"Para pechar a barra de busca, prema <guibutton>X</guibutton> (botón de "
+"pechar) na parte esquerda ou prema a tecla <keycap>Escape</keycap>."
-#: C/irc-start-conversation.page:37(p)
-msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
+#: C/tomboy.xml:692(title)
+msgid "Tools (gear icon)"
msgstr ""
-"Na lista de contactos para a sala de chat do IRC, prema dúas veces no nome "
-"do usuario co que quere falar. De forma alternativa, prema co botón dereito "
-"sobre o nome de usuario e elixa <gui>Conversa</gui>."
-#: C/irc-start-conversation.page:45(p)
+#: C/tomboy.xml:694(para)
msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
+"The <guibutton>Tools</guibutton> button is represented by the <inlinegraphic "
+"fileref=\"figures/tomboy-tools.png\"/> icon. When you click the "
+"<guiicon>Tools</guiicon> icon on the toolbar present on your note, a menu "
+"will appear with the following items:"
msgstr ""
-"A lista de contactos da sala IRC non é igual que a lista de contactos de "
-"<app>Empathy</app>. Contén unha lista de usuarios na sala de chat do IRC á "
-"que se uniu. Salas diferentes poden ter diferentes listados de contactos."
-#: C/irc-start-conversation.page:52(p)
-msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
-msgstr ""
-"A lista de contactos dunha sala de IRC xeralmente está na parte dereita da "
-"xanela da sala de IRC. Se non a ve elixa <guiseq><gui>Conversa</"
-"gui><gui>Mostrar a lista de contactos</gui></guiseq>."
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "Actualmente non é posíbel enviar ficheiros mediante o IRC."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Enviar ficheiros mediante o IRC"
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Actualmente non é posíbel enviar ficheiros mediante o IRC."
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Protexa o seu alcume para previr que outros usuarios do IRC o usen."
-
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Usar un contrasinal para un alcume no IRC"
-
-#: C/irc-nick-password.page:35(p)
-msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
-msgstr ""
-"Nalgunhas redes IRC pode rexistrar o seu alcume con un servizo chamado "
-"NickServ. Enviando mensaxes especiais a NickServ pode configurar o seu "
-"contrasinal e identificarse. Pode que algunhas salas de conversa IRC non lle "
-"permitan unirse sen un nome rexistrado."
+#: C/tomboy.xml:701(term)
+msgid "Synchronize Notes"
+msgstr "Sincronizar notas"
-#: C/irc-nick-password.page:40(p)
+#: C/tomboy.xml:704(para)
msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
+"Select this option to synchronize your notes with a central server. For more "
+"information on note synchronization, see <xref linkend=\"synchronization\"/>."
msgstr ""
-"Actualmente <app>Empathy</app> non é compatíbel co rexistro de alcumes. "
-"Porén algúns servidores de IRC reenviarán automaticamente un <em>contrasinal "
-"de servidor</em> a NickServ. Nesas redes poderá usar contrasinais de IRC en "
-"<app>Empathy</app> para identificarse contra NickServ. É coñecido que a "
-"popular rede freenode dispón desta característica."
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Para estabelecer un contrasinal de servidor de IRC:"
+#: C/tomboy.xml:710(term)
+msgid "What links here?"
+msgstr "Que liga aquí?"
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "Seleccione a conta de IRC da lista na parte esquerda do diálogo."
-
-#: C/irc-nick-password.page:57(p)
+#: C/tomboy.xml:713(para)
msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"This option allows you to quickly see what other notes link to the current "
+"note. This feature is provided by the Backlinks Add-in. For more information "
+"on add-ins, see <xref linkend=\"plugins\"/>."
msgstr ""
-"Na caixa de texto <gui>Contrasinal</gui> escriba o contrasinal que quere "
-"usar para rexistrar o seu alcume."
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Prema <gui style=\"button\">Aplicar</gui>."
+#: C/tomboy.xml:721(term) C/tomboy.xml:1412(member) C/tomboy.xml:1479(term)
+msgid "Export to HTML"
+msgstr "Exportar a HTML"
-#: C/irc-nick-password.page:69(p)
+#: C/tomboy.xml:724(para)
msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
+"You can create an <acronym>HTML</acronym> (Hypertext Markup Language) "
+"document from one or more notes by selecting this option. For more "
+"information, please see <xref linkend=\"plugins\"/>."
msgstr ""
-"Estas instrucións só lle permiten usar un alcume protexido por contrasinal "
-"en certas redes IRC. Actualmente non é posíbel rexistrar un alcume IRC ou "
-"cambiar o seu contrasinal de alcume usando <placeholder-1/>."
-
-#: C/irc-manage.page:9(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Como usar IRC con <placeholder-1/>."
-#: C/irc-manage.page:34(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+#: C/tomboy.xml:732(term)
+msgid "Print"
+msgstr "Imprimir"
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/tomboy.xml:735(para) C/tomboy.xml:1538(para)
msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
+"Select this option to print the current note. You will be presented with the "
+"standard GNOME print dialog."
msgstr ""
-"Vostede debe ter instalado o paquete <placeholder-1/> para usar o IRC en "
-"<placeholder-2/>."
-
-#: C/irc-manage.page:43(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Salas de chat e conversa no IRC."
-
-#: C/irc-manage.page:45(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Salas de char e conversas"
-
-#: C/irc-manage.page:50(title)
-msgid "Common IRC Problems"
-msgstr "Problemas comúns no IRC"
-
-#: C/irc-manage.page:52(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problemas comúns"
-
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Entrar nunha canle IRC."
-
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Unirse a unha sala de conversa IRC"
+"Seleccione esta opción para imprimir a nota actual. Mostraráselle o diálogo "
+"estándar de impresión de GNOME."
-#: C/irc-join-room.page:33(p)
+#: C/tomboy.xml:742(para)
msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
+"Depending on the add-ins that you have installed for Tomboy, you may have "
+"more or less items available in the <guimenu>Tools</guimenu> menu."
msgstr ""
-"Pode unirse a salas de chat IRC (tamén coñecidas como canles de IRC) en "
-"calquera rede de IRC á que estea conectado. Para conectarse a unha rede de "
-"IRC consulte a <link xref=\"add-account\"/> e a <link xref=\"account-irc\"/>."
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
-"gui><gui>Unirse</gui></guiseq>."
-
-#: C/irc-join-room.page:45(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
-msgstr ""
-"Desde a lista despregábel <gui>Conta</gui> elixa a conta IRC que corresponda "
-"coa rede que quere usar."
+#: C/tomboy.xml:749(title)
+msgid "Delete"
+msgstr "Borrar"
-#: C/irc-join-room.page:51(p)
+#: C/tomboy.xml:751(para)
msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"The <guibutton>Delete</guibutton> button will pop up a dialog box asking if "
+"you want to permanently delete the note and its contents. Click the "
+"<guibutton>Delete</guibutton> button to discard the note permanently, or "
+"<guibutton>Cancel</guibutton> to abort the process. Links to this note from "
+"other notes will still exist, but will re-create the note upon activation."
msgstr ""
-"Na caixa de texto <gui>Sala</gui>, escriba o nome da canle de IRC á que "
-"quere unirse. Preceda o nome co carácter almohadilla (<sys>#</sys>)."
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Prema <gui>Unirse</gui> para entrar na sala."
+#: C/tomboy.xml:763(title)
+msgid "Panel Menu"
+msgstr "Panel de menú"
-#: C/irc-join-room.page:64(p)
+#: C/tomboy.xml:765(para)
msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
+"Tomboy keeps the most recently used notes quickly available to you in a menu "
+"that appears when you click on the Tomboy Icon in the GNOME Panel, the "
+"taskbar in Microsoft Windows, or the dock in Mac OS X."
msgstr ""
-"Para entrar en varias salas, debe repetir os pasos anteriores para cada sala."
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Introduza o contrasinal para as salas de char IRC protexidas."
-
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Unirse a unha sala de chat IRC protexida"
-
-#: C/irc-join-pwd.page:27(p)
-msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
+#: C/tomboy.xml:770(title)
+msgid "Note Pinning"
msgstr ""
-"Nalgunhas redes IRC as salas privadas de IRC poden estar protexidas por "
-"contrasinal. Se sabe o contrasinal, realice os seguintes pasos para unirse:"
-
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr "<link xref=\"irc-join-room\">Unirse á sala</link> de forma normal."
-#: C/irc-join-pwd.page:38(p)
+#: C/tomboy.xml:772(para)
msgid ""
-"Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <gui style=\"button\">Join</gui>."
+"To force a note to always be in the panel menu regardless of when you last "
+"accessed it, click the thumbtack icon to \"pin\" it to the menu. Notes that "
+"are pinned to the panel menu will have a thumbtack icons that look like "
+"this: <inlinegraphic fileref=\"figures/tomboy-pindown.png\"/>. Notes that "
+"are not pinned to the panel menu will have thumbtack icons that look like "
+"this: <inlinegraphic fileref=\"figures/tomboy-pinup.png\"/>."
msgstr ""
-"Empathy preguntaralle o contrasinal. Introduza o contrasinal para a sala de "
-"conversa IRC e prema <gui style=\"button\">Unirse</gui>."
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "As ordes de IRC admitidas."
+#: C/tomboy.xml:781(title)
+msgid "Tomboy Panel Menu"
+msgstr "Menú do panel de Tomboy"
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Ordes IRC admitidas"
+#: C/tomboy.xml:798(title)
+msgid "Begin a bulleted list"
+msgstr "Iniciar unha lista con viñetas"
-#: C/irc-commands.page:19(p)
-msgid ""
-"To see the list of the supported IRC commands, in a chat room type <input>/"
-"help</input> and press <key>Enter</key>."
-msgstr ""
-"Para ver unha lista de ordes de IRC admitidos, nunha sala de conversa "
-"escriba <input>/help</input> e prema <key>Intro</key>."
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
+#: C/tomboy.xml:800(para)
+msgid "You may begin a bulleted list by using one of the following methods:"
msgstr ""
-"Todos as ordes dispoñíbeis teñen unha pequena descrición sobre o se uso."
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:41(None)
+#: C/tomboy.xml:805(para) C/tomboy.xml:826(para)
msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=489ba00b0fc377aba4c691210b6e0650"
+"Select <menuchoice><guimenuitem>Bullets</guimenuitem></menuchoice> from the "
+"<guibutton>Text</guibutton> menu."
msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=489ba00b0fc377aba4c691210b6e0650"
-
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Introdución ao programa de mensaxaría instantánea <app>Empathy</app>."
-
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Introdución"
-#: C/introduction.page:23(p)
+#: C/tomboy.xml:812(para)
msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video calls, file "
-"transfers, and all the most used messaging systems such as MSN and Google "
-"Talk."
+"Begin a line with a single dash character (-), type some text immediately "
+"following the dash, and press <keycap>Enter</keycap>."
msgstr ""
-"<app>Empathy</app> é un aplicativo de mensaxaría instantánea para o "
-"Escritorio GNOME. É compatíbel con mensaxes de texto, chamas de voz e "
-"vídeochamadas, transferencia de ficheiro e os sistemas de mensaxaría máis "
-"populares como MSN e Google Talk."
-#: C/introduction.page:28(p)
-msgid ""
-"<app>Empathy</app> includes features that help you better collaborate while "
-"at work, and that let you easily keep in touch with your friends."
-msgstr ""
-"<app>Empathy</app> inclúe características que lle axudarán a colaborar "
-"mellor no traballo e permitiranlle manterse en contacto cos seus amigos de "
-"forma sinxela."
+#: C/tomboy.xml:820(title)
+msgid "End a bulleted list"
+msgstr "Rematar unha lista con viñetas"
-#: C/introduction.page:32(p)
-msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
+#: C/tomboy.xml:822(para)
+msgid "End a bulleted list by doing one of the following:"
msgstr ""
-"Usando <app>Empathy</app> pode agrupar as conversas nunha única xanela ou "
-"ter múltiples xanelas para os diferentes tipos de conversas; busca sinxela "
-"das súas conversas anteriores e compartición do seu escritorio con un só un "
-"par de clics de rato."
-
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Xanela de <gui>Lista de contactos</gui>"
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Xanela principal de <placeholder-1/>"
-
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Xanela principal de <placeholder-1/>."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:28(None)
-msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+#: C/tomboy.xml:833(para)
+msgid "Press <keycap>Enter</keycap> on a blank bulleted line."
msgstr ""
-"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
-
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Mensaxeiro da Internet Empathy"
-#: C/index.page:27(title)
+#: C/tomboy.xml:837(para)
msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Select <menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> "
+"from the <guibutton>Text</guibutton> menu in succession until the current "
+"line is no longer part of the bulleted list."
msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logotipo da mensaxaría instantánea Empathy</media>Mensaxeiro da Internet "
-"Empathy"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Xestión de contas"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Xestión de contactos"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Conversas de texto"
-
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Conversas de son e vídeo"
-
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Accións avanzadas"
-
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Importar unha conta de outro aplicativo de mensaxaría instantánea."
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
-
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
-
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Importar unha conta existente"
-
-#: C/import-account.page:44(p)
+#: C/tomboy.xml:845(para)
msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
+"Using the key combination <keycombo><keycap>Shift</keycap><keycap>Tab</"
+"keycap></keycombo> in succession until the current line is no longer part of "
+"the bulleted list."
msgstr ""
-"A primeira vez que executa <app>Empathy</app> ofreceráselle importar as súas "
-"contas de outros aplicativos de mensaxaría instantánea. Actualmente a única "
-"aplicación compatíbel é <app>Pidgin</app>."
-#: C/import-account.page:50(p)
-msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
-msgstr ""
-"Execute <app>Empathy</app> por primeira vez. Aparecerá un asistente que lle "
-"permitirá crear novas contas de distintos servizos."
+#: C/tomboy.xml:856(title)
+msgid "Increase Indentation"
+msgstr "Aumentar a sangría"
-#: C/import-account.page:54(p)
-msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
-msgstr ""
-"Seleccione <gui>Si, importar os detalles da miña conta desde </gui>e prema "
-"en <gui>Seguinte</gui>."
+#: C/tomboy.xml:858(para)
+msgid "To increase the line indentation in a bulleted list with the mouse:"
+msgstr "Para incrementar a sangría da liña nunha lista de viñetas co rato:"
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "Marque a caixa de verificación xunto a cada conta que queira importar"
-
-#: C/import-account.page:66(p)
+#: C/tomboy.xml:863(para)
msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
+"Select <menuchoice><guimenuitem>Increase Indent</guimenuitem></menuchoice> "
+"from the <guibutton>Text</guibutton> menu."
msgstr ""
-"Actualmente non é posíbel importar contas despois de ter completado o "
-"asistente de primeira execución."
+"Seleccione <menuchoice><guimenuitem>Incrementar sangría</guimenuitem></"
+"menuchoice> desde o menú <guibutton>Texto</guibutton>."
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr ""
-"Ocultar os contactos desconectados da súa <gui>Lista de contactos</gui>."
+#: C/tomboy.xml:870(para)
+msgid "To increase the line indentation in a bulleted list with the keyboard:"
+msgstr "Para incrementar a sangría da liña nunha lista de viñetas co rato:"
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Ocultar os contactos desconectados"
+#: C/tomboy.xml:875(para)
+msgid "Press the <keycap>Tab</keycap> key."
+msgstr "Prema a tecla <keycap>Tab</keycap>."
-#: C/hide-contacts.page:21(p)
-msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
-msgstr ""
-"Normalmente <app>Empathy</app> mostra todos os contactos: os que están "
-"conectados, cos que pode estabelecer unha conversa, e tamén os que están "
-"desconectados."
+#: C/tomboy.xml:881(title)
+msgid "Decrease Indentation"
+msgstr "Diminuír a sangría"
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Para agochar os contactos desconectados."
+#: C/tomboy.xml:883(para)
+msgid "To decrease the line indentation in a bulleted list with the mouse:"
+msgstr "Para reducir a sangría da liña nunha lista de viñetas co rato:"
-#: C/hide-contacts.page:31(p)
+#: C/tomboy.xml:888(para)
msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
+"Select <menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> "
+"from the <guibutton>Text</guibutton> menu."
msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Ver</"
-"gui><gui>Contactos desconectados</gui></guiseq> ou prema <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
+#: C/tomboy.xml:895(para)
+msgid "To decrease the line indentation in a bulleted list with the keyboard:"
msgstr ""
-"Para mostrar os contactos desconectados de novo, repita o mesmo proceso."
-
-#: C/group-conversations.page:8(desc)
-msgid "Start or join a group conversation with your contacts."
-msgstr "Iniciar ou unirse a un grupo de conversa cos seus contactos."
-
-#: C/group-conversations.page:34(title)
-msgid "Group conversations"
-msgstr "Conversas en grupo"
-#: C/group-conversations.page:36(p)
+#: C/tomboy.xml:900(para)
msgid ""
-"Group conversations permits you to have text conversations with more than "
-"one contact at the same time."
+"Press the key combination <keycombo><keycap>Shift</keycap><keycap>Tab</"
+"keycap></keycombo>."
msgstr ""
-"As conversas en grupo permítenlle manter conversas de texto con máis dun "
-"contacto ao mesmo tempo."
-#: C/group-conversations.page:40(p)
-msgid ""
-"To have a group conversation you need to have a registered account with "
-"either Jabber or Google Talk, or a People Nearby account."
-msgstr ""
-"Para ter unha conversa en grupo debe ter rexistrado unha conta en Jabber ou "
-"Google Talk, ou en Persoas próximas."
+#: C/tomboy.xml:913(title)
+msgid "Working with Notebooks"
+msgstr "Traballar con cadernos"
-#: C/group-conversations.page:46(p)
+#: C/tomboy.xml:915(para)
msgid ""
-"You can have a group conversation only with the contacts that are using the "
-"same service as yours."
+"Notebooks allow you to group related notes together. You can add a note to a "
+"notebook in the Search All Notes window or directly inside of a Note."
msgstr ""
-"Pode ter conversas en grupo só cos contactos que usan o mesmo servizo que o "
-"seu."
+"Os cadernos de notas permítenlle agrupar notas relacionadas. Pode engadir "
+"unha nota a un caderno de notas na xanela Buscar en todas as notas ou "
+"directamente dentro dunha nota."
-#: C/group-conversations.page:54(title)
-msgid "Start a group conversation"
-msgstr "Iniciar unha conversa en grupo"
+#: C/tomboy.xml:919(title)
+msgid "Creating Notebooks"
+msgstr "Crear cadernos"
-#: C/group-conversations.page:63(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"use for the group conversation."
-msgstr ""
-"Desde a lista despregábel <gui>Conta</gui> seleccione a conta que queira "
-"usar para a conversa en grupo."
+#: C/tomboy.xml:921(para)
+msgid "You can create new notebooks using one of the following methods:"
+msgstr "Pode crear novos cadernos usando un dos seguintes métodos:"
-#: C/group-conversations.page:69(p)
+#: C/tomboy.xml:925(para)
msgid ""
-"In the <gui>Server</gui> text box, type the name of server in which the "
-"conversation will be hosted."
+"Click on the Tomboy note icon present in the GNOME Panel, the taskbar in "
+"Microsoft Windows, or the dock in Mac OS X. A menu will appear"
msgstr ""
-"Na caixa de texto <gui>Servidor</gui> escriba o nome do servidor no que se "
-"hospedará a conversa."
-#: C/group-conversations.page:73(p)
-msgid "Leave it empty if it will be on the current server."
-msgstr "Déixeo baleiro se será no servidor actual."
-
-#: C/group-conversations.page:78(p)
+#: C/tomboy.xml:929(para)
msgid ""
-"In the <gui>Room</gui> text box, type the name you want to give to the "
-"conversation."
+"Select <menuchoice><guimenuitem>Notebooks</guimenuitem><guimenuitem>New "
+"Notebook</guimenuitem></menuchoice>."
msgstr ""
-"Na caixa de texto <gui>Sala</gui> escriba o nome que quere darlle á conversa."
-#: C/group-conversations.page:82(p)
-msgid ""
-"This will be the name of the room you are going to have a conversation. This "
-"name will be publicly available for other people to join. It is not possible "
-"to create a private room."
-msgstr ""
-"Este será o nome da sala na que vai ter unha conversa. Este nome estará "
-"publicamente dispoñíbel para que outras persoas poidan unirse. Non é posíbel "
-"crear unha sala privada."
+#: C/tomboy.xml:932(para) C/tomboy.xml:961(para) C/tomboy.xml:969(para)
+msgid "Enter a name for the new notebook."
+msgstr "Escriba un nome para o novo caderno."
-#: C/group-conversations.page:90(p)
+#: C/tomboy.xml:937(title)
msgid ""
-"To invite other contacts to join the group conversation, from the "
-"<gui>Contact List</gui> window, select the contact you want to invite, and "
-"perform one of the following:"
+"Create a new notebook from the Tomboy note icon on the GNOME Panel, the "
+"taskbar in Microsoft Windows, or the dock in Mac OS X"
msgstr ""
-"Para invitar a outros contactos a unirse á conversa en grupo, desde a xanela "
-"<gui>Lista de contactos</gui> seleccione o contacto que quere invitar e "
-"realice unha das seguintes accións:"
-#: C/group-conversations.page:97(p)
-msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
-msgstr ""
-"Prema co botón dereito do rato sobre o contacto e elixa <gui>Invitar á sala "
-"de conversa</gui>."
+#: C/tomboy.xml:946(para)
+msgid "To create a new notebook from the Search All Notes dialog:"
+msgstr "Para crear un novo caderno desde o diálogo Buscar en tódalas notas:"
-#: C/group-conversations.page:102(p)
+#: C/tomboy.xml:950(para) C/tomboy.xml:996(para) C/tomboy.xml:1033(para)
+#: C/tomboy.xml:1077(para)
msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
-"gui></guiseq>."
+"Open <menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> by "
+"choosing it from the Tomboy icon on the GNOME Panel, the taskbar in "
+"Microsoft Windows, or the dock in Mac OS X, or click on Search from an open "
+"note."
msgstr ""
-"Seleccione <guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Invitar á sala "
-"de conversa</gui></guiseq>."
-#: C/group-conversations.page:107(p)
+#: C/tomboy.xml:956(para)
msgid ""
-"If you have more than one group conversation open, select the one you want "
-"to invite your contacts."
+"Using your mouse, right click in the left hand box and choose "
+"<menuchoice><guimenuitem>New Notebook</guimenuitem></menuchoice>."
msgstr ""
-"Se ten máis dunha conversa en grupo aberta seleccione na que quere invitar "
-"aos seus contactos."
-
-#: C/group-conversations.page:118(title)
-msgid "Join a group conversation"
-msgstr "Unirse a unha conversa en grupo"
-#: C/group-conversations.page:128(p)
-msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
-msgstr ""
-"Expanda a sección <gui>Lista de salas</gui> para ver todas as salas "
-"existentes."
-
-#: C/group-conversations.page:133(p)
-msgid "Double-click on the name of a room to join it."
-msgstr "Prema dúas veces sobre o nome dunha sala á que queira unirse."
-
-#: C/group-conversations.page:139(p)
+#: C/tomboy.xml:964(para)
msgid ""
-"It is not possible to join all existing rooms. Some of the rooms might "
-"require a password, or might be invitation only. <app>Empathy</app> does not "
-"support these kind of rooms."
+"With <guilabel>Search All Notes</guilabel> open, choose "
+"<menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Notebooks</"
+"guimenuitem><guimenuitem>New Notebook</guimenuitem></menuchoice>."
msgstr ""
-"Non é posíbel unirse a todas as salas existentes. Algunhas salas poden "
-"requirir un contrasinal ou poden ser de só invitación. <app>Empathy</app> "
-"non é compatíbel este tipo de salas."
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Entender a xeolocalización."
+#: C/tomboy.xml:975(title)
+msgid "Create a new notebook from Search All Notes"
+msgstr "Crear un novo caderno desde Buscar en tódalas notas"
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Que é a xeolocalización"
+#: C/tomboy.xml:987(title)
+msgid "Adding Notes to a Notebook"
+msgstr "Engadir notas a un caderno"
-#: C/geolocation-what-is.page:35(p)
+#: C/tomboy.xml:989(para)
msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
+"To add notes to a notebook, you can add a note from the <guilabel>Search All "
+"Notes</guilabel> dialog or directly within a note."
msgstr ""
-"A xeolocalización permítelle identificar a localización xeográfica real dun "
-"equipo ou un dispositivo conectado a Internet."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Coa xeolocalización en <app>Empathy</app> vostede pode:"
+"Para engadir notas a un caderno, pode engadir unha nota desde o diálogo "
+"<guilabel>Buscar en tódalas notas</guilabel> ou directamente na mesma nota."
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Publicar a súa información xeográfica aos seus contactos."
-
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
+#: C/tomboy.xml:992(para)
+msgid "To move an existing note from the Search All Notes dialog:"
msgstr ""
-"Vexa a localización xeográfica dos seus contactos e contacte con eles "
-"rapidamente."
+"Para mover unha nova existente desde o diálogo Buscar en tódalas notas:"
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
-msgstr ""
-"Estabeleza a precisión da súa localización e o dispositivo que usar para "
-"descubrir a súa localización."
+#: C/tomboy.xml:1001(para)
+msgid "Using your mouse, drag the note(s) onto a notebook on the left."
+msgstr "Usando o seu rato, arrastre a(s) nota(s) sobre o caderno na esquerda."
-#: C/geolocation-what-is.page:60(p)
+#: C/tomboy.xml:1006(para)
msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
+"As you type a note, you can add the note directly to an existing notebook "
+"using the <guimenu>Notebook</guimenu> button. The <guimenu>Notebook</"
+"guimenu> button is represented by the <inlinegraphic fileref=\"figures/"
+"notebook-icon.png\"/> icon."
msgstr ""
-"Para poder ver as localizacións xeográficas dos seus contactos, estes deben "
-"usan un servizo e un aplicativo que admita a xeolocalización."
-
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Como activar e desactivar a xeolocalización en <placeholder-1/>."
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activar e desactivar a xeolocalización"
+#: C/tomboy.xml:1012(title)
+msgid "Adding a note to a notebook"
+msgstr "Engadir unha nota a un caderno"
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "Elixa <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
+#: C/tomboy.xml:1025(title)
+msgid "Creating Notebook Templates"
+msgstr "Crear plantillas de caderno"
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Seleccione o separador <gui>Localización</gui>."
-
-#: C/geolocation-turn.page:47(p)
+#: C/tomboy.xml:1027(para)
msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+"After you create a notebook, you can create a template for each new note "
+"that you create in a specific notebook."
msgstr ""
-"Seleccione <gui>Publicar a miña localización aos meus contactos</gui> para "
-"activar a xeolocalización."
-
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Para desactivar a xeolocalización, deselecciónea."
-#: C/geolocation-turn.page:55(p)
+#: C/tomboy.xml:1038(para)
msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
+"Using your mouse, right click on a Notebook that you have created and choose "
+"<menuchoice><guimenuitem>Open Template Note</guimenuitem></menuchoice>."
msgstr ""
-"Para aumentar a precisión da súa posición, deseleccione <gui>Reducir a "
-"precisión da localización</gui>."
-#: C/geolocation-turn.page:61(p)
-#| msgid ""
-#| "If you have an external device like a GPS or want to send a more accurate "
-#| "position, select the appropriate option in the <gui>Geoclue Settings</"
-#| "gui> section."
+#: C/tomboy.xml:1043(para)
msgid ""
-"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Location sources</gui> "
-"section."
+"This will open a new note that will be used as the template. Any text typed "
+"in this note will appear in all notes created in this Notebook. Create a new "
+"note in the notebook by using your mouse, right click on a notebook and "
+"select <menuchoice><guimenuitem>New Note</guimenuitem></menuchoice>."
msgstr ""
-"Se ten un dispositivo externo como un GPS e quere enviar unha posición máis "
-"exacta, seleccione a opción axeitada na sección <gui>Orixes das "
-"localizacións</gui>."
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Servizos que admiten xeolocalización e compatibilidade."
+#: C/tomboy.xml:1052(title)
+msgid "Creating a Notebook Template"
+msgstr "Crear unha plantilla de caderno"
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Servizos admitidos"
-
-#: C/geolocation-supported.page:33(p)
-msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
-msgstr ""
-"Polo momento a opción de xeolocalización só'é compatíbel co servizo Jabber. "
-"Para poder usala, vostede e os seus contactos deben ter unha conta de Jabber."
+#: C/tomboy.xml:1065(title) C/tomboy.xml:1088(title)
+msgid "Deleting a Notebook"
+msgstr "Eliminar un caderno"
-#: C/geolocation-supported.page:39(p)
+#: C/tomboy.xml:1066(para)
msgid ""
-"It is necessary that also the server you are using supports the geolocation "
-"feature. Most of the Jabber servers support it. See your service website "
-"documentation for more information."
+"Deleting a notebook will not delete any of the notes which are currently "
+"inside the notebook. After deleting a notebook, the notes will not be "
+"associated with any notebook and can be seen by highlighting "
+"<menuchoice><guimenuitem>Unfiled Notes</guimenuitem></menuchoice> in the "
+"<menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> window."
msgstr ""
-"Tamén é necesario que o servidor que está usando sexa compatíbel coa opción "
-"de xeolocalización. A maioría dos servidores teñen compatibilidade. Vexa a "
-"páxina web de documentación do seu servizo para obter máis información."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilidade"
-#: C/geolocation-supported.page:49(p)
-msgid ""
-"<app>Empathy</app> geolocation feature is not compatible with other "
-"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
-"Fire Eagle</em> or <em>Brightkite</em>."
+#: C/tomboy.xml:1072(para)
+msgid "You can delete a notebook you have created by one of two methods:"
msgstr ""
-"A característica de xeolocalización de <app>Empathy</app> non é compatíbel "
-"con outros servizos de posición xeográfica tales como <em>Google Latitude</"
-"em>, <em>Yahoo Fire Eagle</em> ou <em>Brightkite</em>."
-
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Que información se envía e a quén."
-
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Privacidade na xeolocalización"
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Que información se envía"
+#: C/tomboy.xml:1074(para)
+msgid "To delete a notebook using your mouse:"
+msgstr "Para eliminar un caderno usando o seu rato:"
-#: C/geolocation-privacy.page:36(p)
+#: C/tomboy.xml:1082(para)
msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
+"Using your mouse, right click on a Notebook that you have created and choose "
+"<menuchoice><guimenuitem>Delete Notebook</guimenuitem></menuchoice>."
msgstr ""
-"É posíbel enviar: o seu país, rexión, localidade, área, calle, edificio, "
-"planta, habitación, código postal, lonxitude e latitude, velocidade e "
-"orientación."
+"Usando o seu rato, prema co botón dereito sobre un caderno que teña creado e "
+"seleccione <menuchoice><guimenuitem>Eliminar caderno</guimenuitem></"
+"menuchoice>."
-#: C/geolocation-privacy.page:40(p)
+#: C/tomboy.xml:1097(para)
msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
+"To delete a Notebook from the <menuchoice><guimenuitem>Search All Notes</"
+"guimenuitem></menuchoice> menu, open <menuchoice><guimenuitem>Search All "
+"Notes</guimenuitem></menuchoice> by choosing it from the Tomboy icon on the "
+"GNOME Panel, the taskbar in Microsoft Windows, or the dock in Mac OS X."
msgstr ""
-"A precisión e cantidade de información sobre a súa posición xeográfica "
-"basease no software ou na infraestrutura usada para descubrir a súa posición."
-#: C/geolocation-privacy.page:44(p)
-msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+#: C/tomboy.xml:1103(para)
+msgid "Using your mouse, left click on the Notebook you want to delete."
msgstr ""
-"Diferentes tipos de redes poden ter diferentes axustes de precisión e poden "
-"enviar información diferente. O uso de dispositivos externos tales como un "
-"GPS ou teléfono móbil pode incrementar a precisión da información enviada."
+"Usando o rato, prema co botón esquerdo sobre o caderno que quere eliminar."
-#: C/geolocation-privacy.page:49(p)
+#: C/tomboy.xml:1107(para)
msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
+"From the menu, choose <menuchoice><guimenuitem>Edit</"
+"guimenuitem><guimenuitem>Delete Notebook</guimenuitem></menuchoice>"
msgstr ""
-"Cando o modo de privacidade está activo non se enviará nada máis preciso que "
-"a súa cidade, incluso se está usando un dispositivo externo."
-
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Quen pode ver a información enviada"
+"Desde o menú, seleccione <menuchoice><guimenuitem>Editar</"
+"guimenuitem><guimenuitem>Eliminar caderno</guimenuitem></menuchoice>"
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Só os seus contactos poden ver a súa posición xeográfica."
+#: C/tomboy.xml:1121(title)
+msgid "Note Synchronization"
+msgstr "Sincronización de notas"
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Que é o modo de privacidade"
-
-#: C/geolocation-privacy.page:64(p)
+#: C/tomboy.xml:1123(para)
msgid ""
-"The privacy mode, enabled by default, is a reduced accuracy mode that will "
-"decrease the accuracy of the geographical position sent to your contacts."
+"Tomboy can now keep your notes synchronized between multiple computers by "
+"relying on a central server."
msgstr ""
-"O modo de privacidade, activado por omisión, é un modo de precisión reducida "
-"da información de posición xeográfica enviada aos seus contactos."
+"Tomboy pode manter as súas notas sincronizadas entre varios computadores "
+"mediante un servidor central."
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Vista previa da privacidade"
+#: C/tomboy.xml:1127(title)
+msgid "Configure note synchronization"
+msgstr "Configurar a sincronización de notas"
-#: C/geolocation-privacy.page:72(p)
+#: C/tomboy.xml:1129(para)
msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+"You can configure your note synchronization preferences in the "
+"<guilabel>Synchronization</guilabel> tab of the <interface>Tomboy "
+"Preferences</interface> dialog. Default conflict handling behavior can be "
+"configured by selecting the <guibutton>Advanced...</guibutton> button."
msgstr ""
-"Visión xeral dos axustes de privacidade na xeolocalización de <app>Empathy</"
-"app>."
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "De forma predefinida a xeolocalización non está activada."
+#: C/tomboy.xml:1135(title)
+msgid "Tomboy Synchronization Preferences"
+msgstr "Preferencias de sincronización de Tomboy"
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "De forma predefinida o modo de privacidade está activado."
+#: C/tomboy.xml:1145(title)
+msgid "Configure note synchronization service (WebDAV)"
+msgstr "Configurar o servizo de sincronización de notas (WebDAV)"
-#: C/geolocation-privacy.page:87(p)
+#: C/tomboy.xml:1147(para)
msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+"In order to synchronize your notes with a WebDAV server, you will need the "
+"wdfs FUSE file system installed. Follow the documentation for your operating "
+"system to set up FUSE for your user. You will also need the GNOME Keyring "
+"installed."
msgstr ""
-"O modo de privacidade prevalece incluso cando se está usando dispositivos "
-"externos máis precisos."
-
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Só os seus contactos poden ver a súa posición."
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> non publica a miña posición xeográfica."
-
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Posición xeográfica non publicada"
-
-#: C/geolocation-not-showing.page:34(p)
-msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
-msgstr ""
-"Se os contactos non poden ver a súa posición, <app>Empathy</app> pode non "
-"ser capaz de descubrir a súa posición xeográfica con unha boa marxe de "
-"precisión."
-
-#: C/geolocation-not-showing.page:38(p)
+#: C/tomboy.xml:1151(para)
msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"Choose <guimenuitem>WebDAV</guimenuitem> from the <guilabel>Service</"
+"guilabel> drop-down list. Fill in the connection information for your "
+"server, and then select the <guibutton>Save</guibutton> button. You are now "
+"ready to synchronize your notes."
msgstr ""
-"Neste caso non se publicará a súa posición pero aínda así poderá ver a "
-"posición dos seus contactos."
-#: C/geolocation-not-showing.page:42(p)
-msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
-msgstr ""
-"Se quere publicar a súa posición xeográfica pode intentar usar un "
-"dispositivo externo tal como un GPS."
+#: C/tomboy.xml:1157(title)
+msgid "Configure note synchronization service (SSH)"
+msgstr "Configurar o servizo de sincronización de notas (SSH)"
-#: C/geolocation-not-showing.page:48(p)
+#: C/tomboy.xml:1159(para)
msgid ""
-"In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
+"In order to synchronize your notes with an SSH server, you will need the "
+"sshfs FUSE file system installed. Follow the documentation for your "
+"operating system to set up FUSE for your user. You will also need an SSH key "
+"for your SSH server account, which should be added to a running SSH daemon. "
+"This can be done using the GNOME <application>Seahorse</application> "
+"application, which is also known as <application>Passwords and Encryption "
+"Keys</application>."
msgstr ""
-"Para publicar a súa localización xeográfica o seu servidor Jabber debe ser "
-"compatíbel co protocolo de eventos persoais (PEP). Mantense en liña unha "
-"lista dos <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep."
-"html\">servidores que admiten PEP</link>. Polo momento Google Talk non é "
-"compatíbel con esta característica."
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Usar e entender a xeolocalizacón en <app>Empathy</app>."
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Posición xeográfica"
-
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Xeolocalización"
-
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Solucionar problemas comúns"
-
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Configurar, unirse e xestionar salas favoritas."
-
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Salas favoritas"
-
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Estabelecer unha sala como favorita"
-
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Unirse a unha sala."
-
-#: C/favorite-rooms.page:40(p)
+#: C/tomboy.xml:1166(para)
msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"It is recommended to use a third computer or server as the remote computer "
+"to store the syncronized notes that are to be synced between multiple "
+"computers."
msgstr ""
-"Para obter máis información sobre como unirse a unha sala de chat IRC, "
-"consulte a <link xref=\"irc-join-room\"/>."
-#: C/favorite-rooms.page:46(p)
+#: C/tomboy.xml:1169(para)
msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"Open <application>Passwords and Encryption Keys</application> by choosing "
+"<menuchoice><guimenu>Applications</guimenu><guimenu>Accessories</"
+"guimenu><guimenu>Passwords and Encryption Keys</guimenu></menuchoice>. Click "
+"on your key, and from the menu choose <menuchoice><guimenu>Remote</"
+"guimenu><guimenu>Configure Key for Secure Shell...</guimenu></menuchoice> "
+"and enter the domain name or IP address of the computer you want to sync to "
+"in <guimenu>Computer Name</guimenu>. Enter the username of the remote "
+"computer in <guimenu>Computer Name:</guimenu> and click <guimenu>Set Up</"
+"guimenu>. When prompted, enter the password, and setting up your key will be "
+"completed."
msgstr ""
-"Para obter máis información sobre como unirse a unha conversa en grupo, "
-"consulte a <link xref=\"group-conversations\"/>."
-#: C/favorite-rooms.page:54(p)
+#: C/tomboy.xml:1178(para)
msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"In <application>Tomboy</application>, choose <guimenuitem>SSH</guimenuitem> "
+"from the <guilabel>Service</guilabel> drop-down list. Fill in the connection "
+"information for your server, and then select the <guibutton>Save</guibutton> "
+"button. The <guimenuitem>Folder Path</guimenuitem>, while optional, should "
+"point at an empty folder. You are now ready to synchronize your notes."
msgstr ""
-"Desde a xanela de conversa, elixa <guiseq><gui>Conversa</gui><gui>Sala de "
-"chat favorita</gui></guiseq>."
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Unirse ás salas favoritas"
+#: C/tomboy.xml:1185(title)
+msgid "Configure note synchronization service (Local Folder)"
+msgstr "Configurar o servizo de sincronización de notas (Cartafol local)"
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Prema <key>F5</key>."
-
-#: C/favorite-rooms.page:76(p)
+#: C/tomboy.xml:1187(para)
msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"You may want to synchronize your notes to a local folder if that folder is "
+"available to your other systems, or if that folder represents a local mount "
+"of a remote server."
msgstr ""
-"Seleccione <guiseq><gui>Salas</gui><gui>Unirse ás favoritas</gui></guiseq> "
-"para unirse a todas as súas salas favoritas."
-
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "Seleccione a sala favorita que quere xestionar:"
-#: C/favorite-rooms.page:90(p)
+#: C/tomboy.xml:1191(para)
msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
+"Choose <guimenuitem>Local Folder</guimenuitem> from the <guilabel>Service</"
+"guilabel> drop-down list. Choose the desired synchronization "
+"<guilabel>Folder Path</guilabel>, and then select the <guibutton>Save</"
+"guibutton> button. You are now ready to synchronize your notes."
msgstr ""
-"Para unirse a unha sala favorita debe estar conectado a Internet e coa conta."
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Xestionar as salas favoritas"
+#: C/tomboy.xml:1198(title)
+msgid "Synchronize your notes"
+msgstr "Sincronizar as súas notas"
-#: C/favorite-rooms.page:101(p)
+#: C/tomboy.xml:1200(para)
msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Manage Favorites</gui></guiseq>."
+"You can synchronize your notes at any time by selecting "
+"<menuchoice><guimenu>Tools</guimenu><guimenuitem>Synchronize Notes</"
+"guimenuitem></menuchoice> from any note or from the <interface>Search All "
+"Notes</interface> dialog."
msgstr ""
-"Dese a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
-"gui><gui>Xestionar salas favoritas</gui></guiseq>."
-#: C/favorite-rooms.page:107(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"manage the favorite rooms of."
-msgstr ""
-"Desde a lista despregábel <gui>Conta</gui> seleccione a conta da que quere "
-"xestionar as salas favoritas."
-
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Seleccione <placeholder-1/> para ver todas as súas salas favoritas."
-
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Seleccione a sala favorita que quere xestionar:"
+#: C/tomboy.xml:1210(title)
+msgid "Handling synchronization conflicts"
+msgstr "Xestionar conflitos de sincronización"
-#: C/favorite-rooms.page:121(p)
+#: C/tomboy.xml:1212(para)
msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
+"When synchronizing notes between multiple computers, conflicts may occur. "
+"Usually this is the result of not synchronizing regularly when switching "
+"between systems. Tomboy will detect conflicts in the content of your notes "
+"and help you to avoid loss of important data."
msgstr ""
-"Seleccione a caixa de verificación <gui>Autoconectar</gui> para unirse a esa "
-"sala automaticamente ao conectarse coa conta."
-
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "Prema <gui>Eliminar</gui> para elimianr a sala das súas favoritas."
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Cando remate prema <placeholder-1/>."
-
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "Evitar que <app>Empathy</app> inicie sesión automaticamente na conta."
-
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "Desactivar unha conta"
-#: C/disable-account.page:41(p)
+#: C/tomboy.xml:1217(para)
msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
+"If a conflict is detected during note synchronization, the <interface>Note "
+"Conflict</interface> dialog will appear. If you do not need the changes you "
+"made in your local note, you can select <guilabel>Overwrite local note</"
+"guilabel>. If you would like to keep your local changes in a new note, "
+"select <guilabel>Rename local note</guilabel>."
msgstr ""
-"Pode desactivar unha conta para evitar que <app>Empathy</app> inicie sesión "
-"nela, sen ter que quitar a conta completamente. Pode querer desactivar unha "
-"conta e reactivala se só quere iniciar sesión na conta de vez en cando, pero "
-"segue querendo usar <app>Empathy</app> para outras contas."
-#: C/disable-account.page:52(p)
-msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
-msgstr ""
-"Seleccione a conta que quere desactivar desde a lista de contas na parte "
-"esquerda da xanela."
+#: C/tomboy.xml:1226(title)
+msgid "Preferences"
+msgstr "Preferencias"
-#: C/disable-account.page:56(p)
+#: C/tomboy.xml:1228(para)
msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
+"To set preferences for Tomboy, right-click on the icon in the panel, and "
+"select <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> from "
+"the menu. You will see a dialog similar to the one displayed in <xref "
+"linkend=\"pref-editing\"/>. There are two categories of preferences, "
+"<guilabel>Editing</guilabel> and <guilabel>Hotkeys</guilabel>. Preferences "
+"for each tab will be described below."
msgstr ""
-"Deseleccione <gui style=\"checkbox\">Activada</gui> na parte dereita da "
-"xanela."
-
-#: C/disable-account.page:62(p)
-msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
-msgstr "Para reactivar a conta simplemente seleccione <placeholder-1/>."
-
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Rexistre unha conta con un dos servizos de mensaxería admitidos."
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Rexistrar unha nova conta"
+#: C/tomboy.xml:1238(title)
+msgid "Editing"
+msgstr "Editar"
-#: C/create-account.page:36(p)
+#: C/tomboy.xml:1240(para)
msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
+"The editing tab will allow you to set preferences related to editing notes. "
+"There are three checkboxes on this tab, which can either be turned on or off."
msgstr ""
-"Moitos tipos de conta requiren que cree unha conta cun fornecedor de contas "
-"antes de poder conectarse e usar aplicativos de mensaxaría instantánea como "
-"<app>Empathy</app>. Con algúns fornecedores de contas pode usar "
-"<app>Empathy</app> para rexistrar una nova conta, usando os mesmos pasos que "
-"seguiría en <link xref=\"add-account\">engadir unha conta</link>."
-
-#: C/create-account.page:42(p)
-msgid ""
-"This page provides information on creating a new account for various types "
-"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect using "
-"<app>Empathy</app>."
-msgstr ""
-"Esta páxina fornece información sobre crear unha nova conta para varios "
-"tipos de conta. O seu fornecedor de contas debería fornecerlle un ID de "
-"inicio de sesión e un contrasinal, así como outra información adicional que "
-"pode necesitar para conectarse con <app>Empathy</app>."
-
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
-#: C/create-account.page:48(p)
-msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
-msgstr ""
-"Facebook é unha das redes sociais máis usadas. Permite aos usuarios crear o "
-"seu propio perfil e comunicarse cos seus amigos."
+#: C/tomboy.xml:1246(term)
+msgid "Spellcheck While Typing"
+msgstr "Comprobar ortografía mentres se escribe"
-#: C/create-account.page:52(p)
+#: C/tomboy.xml:1249(para)
msgid ""
-"To use Facebook to communicate with your friends, you will need to create a "
-"new account from the website: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
+"Enable this checkbox to underline misspellings in red, and provide "
+"suggestions in the right click context menu. Enable or disable the checkbox "
+"using the mouse or the key combination <keycombo><keycap>Alt</"
+"keycap><keycap>S</keycap></keycombo>."
msgstr ""
-"Para usar Facebook para comunicarse cos seus amigos necesita crear unha nova "
-"conta desde o sitio web: <link href=\"http://www.facebook.com\">www.facebook."
-"com</link>."
-
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
-#: C/create-account.page:62(p)
+#: C/tomboy.xml:1259(para)
msgid ""
-"Jabber is an open instant messaging system. Like email, Jabber allows you to "
-"choose your account provider and communicate with all other Jabber users, "
-"regardless of their account provider."
+"The spellcheck option is only available if you have the "
+"<application>GtkSpell</application> package installed."
msgstr ""
-"Jabber é un sistema de mensaxaría instantánea abeto. Como o correo "
-"electrónico, Jabber permítelle seleccionar o seu fornecedor de conta e "
-"comunicarse cos ouros usuarios de Jabber, independentemente do fornecedor da "
-"conta."
+"A opción de comprobación ortográfica só está dispoñíbel se ten o paquete "
+"<application>GtkSpell</application> instalado."
-#: C/create-account.page:66(p)
-msgid ""
-"You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
-msgstr ""
-"Deberá crear unha nova conta con un fornecedor Jabber. Existen moitos "
-"fornecedores libres; un fornecedor popular é <link href=\"http://register."
-"jabber.org/\">Jabber.org</link>."
+#: C/tomboy.xml:1266(term)
+msgid "Highlight WikiWords"
+msgstr "Realzar as palabras wiki"
-#: C/create-account.page:71(p)
+#: C/tomboy.xml:1269(para)
msgid ""
-"If you use Google Mail or Google Talk, you already have a Jabber account. "
-"Google Talk is a Jabber service. Simply use your Google Mail address and "
-"password in <app>Empathy</app> to connect."
+"Enable this checkbox to create links for phrases <literal>ThatLookLikeThis</"
+"literal>. Clicking on the link will create a new note with the title "
+"corresponding to the link text. Enable or disable this checkbox using the "
+"mouse or the key combination <keycombo><keycap>Alt</keycap><keycap>W</"
+"keycap></keycombo>."
msgstr ""
-"Se usa Google Mail ou Google Talk xa ten unha conta Jabber. Talk é un "
-"servizo Jabber. Simplemente use o seu enderezo de Google Mail e o seu "
-"contrasinal para conectarse."
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Persoas próximas"
+#: C/tomboy.xml:1282(term)
+msgid "Use Custom Font"
+msgstr "Usar un tipo de letra personalizado"
-#: C/create-account.page:80(p)
+#: C/tomboy.xml:1285(para)
msgid ""
-"You do not need to create an account with a service provider to use this "
-"feature. This service works whenever you are connected to a local network, "
-"such as a wireless hotspot. It automatically finds all other users on the "
-"network who are also using this service."
+"Enable this checkbox to set a custom font to be used in your notes. If this "
+"option is disabled, the default system font will be used. Enable or disable "
+"this checkbox using the mouse or the key combination <keycombo><keycap>Alt</"
+"keycap><keycap>F</keycap></keycombo>."
msgstr ""
-"Para usar esta característica non precisa crear unha conta con un fornecedor "
-"de servizos. Este servizo funciona sempre que esté conectado a unha rede "
-"local, tal como un punto sen fíos. Automaticamente encontra outros usuarios "
-"na rede que estean usando este servizo."
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr ""
-"Para obter máis información consulte a <link xref=\"salut-protocol\"/>."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
-
-#: C/create-account.page:91(p)
-msgid ""
-"SIP is an open system which allows users to have audio and video "
-"conversations over the Internet. You need to create an account with a SIP "
-"provider. You can communicate with all other SIP users, regardless of which "
-"SIP provider they use."
-msgstr ""
-"SIP é un sistema aberto que permite aos usuarios realizar conversas de son e "
-"vídeo en Internet. Debe crear unha conta cun fornecedor SIP. Pode "
-"comunicarse con tódolos usuarios SIP, independentemente do fornecedor SIP "
-"que usen."
-
-#: C/create-account.page:97(p)
-msgid ""
-"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
-"index.php?page=register\">Ekiga.net</link> service does not currently work "
-"with <app>Empathy</app>."
-msgstr ""
-"Debido a algunhas diferencias técnicas, actualmente o servizo libre <link "
-"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> non "
-"funciona con <app>Empathy</app>."
-
-#: C/create-account.page:102(p)
-msgid ""
-"Some SIP providers allow you to call normal phones from your computer. "
-"Generally, you will need to subscribe to a paid service for this feature."
-msgstr ""
-"Algúns fornecedores SIP permítenlle chamar a teléfonos normais desde o seu "
-"equipo. Xeralmente deberá subscribirse a un servizo de pago para usar esta "
-"característica."
-
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
-
-#: C/create-account.page:109(p)
-msgid ""
-"You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
-"is only established each time you connect. If another user is using the "
-"nickname, you will need to choose a new nickname."
-msgstr ""
-"Non necesita rexistrar unha conta para usar o IRC. Aínda que especifique un "
-"alcume ao engadir unha conta IRC en <app>Empathy</app>, este alcume só se "
-"estabelece cada vez que se conecta. Se outro usuario está usando o nome, "
-"deberá elixir un alcume novo."
-
-#: C/create-account.page:114(p)
-msgid ""
-"Some IRC networks use a service called NickServ to allow users to protect "
-"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
-msgstr ""
-"Algunhas redes IRC usan un servizo chamado NickServ para permitir aos "
-"usuarios protexer os seus alcumes. Para obter máis información consulte a "
-"<link xref=\"irc-nick-password\"/>."
-
-#: C/create-account.page:117(p)
-msgid ""
-"Some IRC servers are password protected. You will need to know the password "
-"to connect to these servers. Generally, these are private IRC networks."
-msgstr ""
-"Algúns servidores de IRC están protexidos con contrasinal. Necesitará "
-"coñecer o contrasinal para conectarse a eses servidores. Xeralmente son "
-"redes de IRC privadas."
+#: C/tomboy.xml:1298(title)
+msgid "Tomboy Editing Preferences"
+msgstr "Preferencias de edición de Tomboy"
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Servizos privativos"
+#: C/tomboy.xml:1309(title)
+msgid "Hotkeys"
+msgstr "Teclas rápidas"
-#: C/create-account.page:124(p)
+#: C/tomboy.xml:1311(para)
msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
+"The hotkeys tab allows you to set global key combinations to perform "
+"different functions in Tomboy. In order to set key combinations, you must "
+"have the <guibutton>Listen for Hotkeys</guibutton> checkbox enabled. Use "
+"<keycombo><keycap>Alt</keycap><keycap>H</keycap></keycombo> to toggle this "
+"option."
msgstr ""
-"Existen moitos servizos privativos de mensaxaría instantánea desenvolvidos "
-"por diferentes empresas e organizacións, <app>Empathy</app> permítelle "
-"conectarse a unha conta existente dos servizos máis populares. Para crear "
-"unha nova conta con un destes servizos, debe visitar a páxina web do servizo "
-"e aceptar os termos de uso."
-
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
-
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
-
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
-
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr ""
-"Cambie o seu estado para avisar da súa dispoñibilidade aos seus contactos."
-
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "Cambiar o seu estado"
-
-#: C/change-status.page:36(p)
-msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
-msgstr ""
-"Pode estabelecer o seu estado para indicar a súa dispoñibilidade aos seus "
-"contactos <app>Empathy</app> permítelle seleccionar unha lista de estados "
-"predefinidos."
-
-#: C/change-status.page:41(p)
-msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr ""
-"Prema na lista despregábel na parte superior da xanela da <gui>Lista de "
-"contactos</gui>."
-
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "Seleccione o estado desde a lista."
-
-#: C/change-status.page:52(p)
-msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
-msgstr ""
-"Consulte a <link xref=\"status-icons\"/> para obter unha lista de estados "
-"predefinidos e o que significan. Tamén pode <link xref=\"set-custom-message"
-"\"> engadir mensaxes de estado personalizados</link> para fornecerlle aos "
-"seus contactos máis información sobre a súa dispoñibilidade."
-
-#: C/change-status.page:58(p)
-msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
-msgstr ""
-"Se non usa o seu equipo durante un tempo ou se se activa o protector de "
-"pantallas, o estado cambiarase automaticamente a Ausente."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None)
-msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
-msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
-
-#: C/audio-video.page:8(desc)
-msgid ""
-"Information on when it is possible to have an audio or video conversation."
-msgstr "Información sobre cando é posíbel ter unha conversa de vídeo ou son."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Compatibilidade de son e vídeo"
-
-#: C/audio-video.page:34(p)
-msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
-msgstr ""
-"Só pode ter conversas de son e vídeo con contactos que estean usando un "
-"aplicativo que tamén admita esta característica. Cando os aplicativos dos "
-"seus contactos admitan conversas de son ou vídeo poderá velo mediante unha "
-"icona xunto aos seus nomes, na lista de contactos:"
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Icona"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Descrición"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Icona para a conversa de son"
-
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "O contacto pode ter conversas de son."
-
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Icona para a conversa de vídeo"
-
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "O contacto pode ter conversas de vídeo."
-
-#: C/audio-video.page:83(p)
-msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
-msgstr ""
-"Para poder ter unha conversa de son debe ter unha tarxeta de son admitida "
-"polo sistema operativo e un micrófono que funcione."
-
-#: C/audio-video.page:87(p)
-msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
-msgstr ""
-"Para poder ter unha conversa de vídeo debe ter unha cámara web compatíbel "
-"polo sistema operativo e un micrófono que funcione."
-
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Tipos de contas admitidas"
-
-#: C/audio-video.page:97(p)
-msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
-msgstr ""
-"Só pode ter conversas de son e vídeo usando contas en certos servizos "
-"compatíbeis. A seguinte táboa mostra se o son ou vídeo están admitidos para "
-"cada tipo de conta."
-
-#: C/audio-video.page:102(p)
-msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
-msgstr ""
-"Os tipos de contas son fornecidos por engadidos. Pode que o seu sistema non "
-"teña dispoñíbel todos os seguintes tipos, ou pode ter tipos non mostrados "
-"aquí. As actualizacións de engadidos pode facer posíbel conversas de son ou "
-"vídeo en tipos de contas que aquí móstranse como non compatíbeis."
-
-#: C/audio-video.page:110(p)
-msgid ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
-msgstr ""
-"Gustariame poñer táboas como ésta sen usar nada para Non e ✔ para Sí, pero "
-"débese tener en conta o impacto na accesibilidade. Xa <link href=\"http://"
-"mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
-"\">preguntei ao equipo de accesibilidade</link>."
-
-#: C/audio-video.page:118(p)
-msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
-msgstr ""
-"Existe traballo recente en telepathy-butterfly e papyon para admitir son e "
-"vídeo para MSN. Pode que se publique a tempo para 2.28 pero xa non serve a "
-"planificación de publicacións de GNOME non se pode estar seguro. Se parece "
-"que vai dar tempo incluirase."
-
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Servizo"
-
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Son"
-
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Vídeo"
-
-#: C/audio-video.page:136(p) C/audio-video.page:137(p)
-#: C/audio-video.page:141(p) C/audio-video.page:142(p)
-#: C/audio-video.page:146(p) C/audio-video.page:147(p)
-#: C/audio-video.page:156(p) C/audio-video.page:157(p)
-#: C/audio-video.page:161(p) C/audio-video.page:162(p)
-#: C/audio-video.page:166(p) C/audio-video.page:167(p)
-#: C/audio-video.page:181(p) C/audio-video.page:182(p)
-#: C/audio-video.page:186(p) C/audio-video.page:187(p)
-#: C/audio-video.page:191(p) C/audio-video.page:192(p)
-#: C/audio-video.page:196(p) C/audio-video.page:197(p)
-#: C/audio-video.page:201(p) C/audio-video.page:202(p)
-#: C/audio-video.page:211(p) C/audio-video.page:212(p)
-#: C/audio-video.page:216(p) C/audio-video.page:217(p)
-msgid "No"
-msgstr "Non"
-
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Chat de Facebook"
-
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
-
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "Si"
-
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
-
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
-
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
-
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
-
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
-
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Chamar aos seus contactos a través de Internet."
-
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Comezar unha conversa de son"
-
-#: C/audio-call.page:29(p)
-msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
-msgstr ""
-"Pode chamar aos seus contactos e ter conversas de son con eles. Esta "
-"característica só funciona con certo tipo de contas e require que a outra "
-"persoa teña un aplicativo que admita chamadas de son."
-
-#: C/audio-call.page:34(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Audio Call</gui>."
-msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">chamada de "
-"vídeo</media> ao lado do nome do contacto ao que quere chamar e seleccione "
-"<gui style=\"menuitem\">Chamada de son</gui>."
-
-#: C/audio-call.page:55(p)
-msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
-msgstr ""
-"Para trocar unha conversa de vídeo nunha conversa de son, seleccione "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
-"activado</gui></guiseq>."
-
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Comezar unha conversa de son con un metacontacto."
-
-#: C/audio-call.page:71(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
-msgstr ""
-"Seleccione o contacto co que desexe ter unha conversa e desde o menú "
-"seleccione <gui style=\"menuitem\">Audiochamada</gui>."
-
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Engadir a alguén á lista de contactos."
-
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Engadir a alguén á súa lista de contactos."
-
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr ""
-"Seleccione<guiseq><gui>Conversa</gui><gui>Engadir contacto</gui></guiseq>."
-
-#: C/add-contact.page:40(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you wish to "
-"use to connect to your contact. Your contact will need to be using the same "
-"service as the account you select."
-msgstr ""
-"Desde a lista despregábel <gui>Conta</gui> seleccione a conta que quere usar "
-"par conectar co seu contacto. O seu contacto deberá usar o mesmo servizo que "
-"a conta que estea seleccionando."
-
-#: C/add-contact.page:45(p)
-msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
-msgstr ""
-"No campo <gui>Identificador</gui> introduza o ID de inicio de sesión do seu "
-"contacto, o seu nome en pantalla ou outro identificador axeitado para o tipo "
-"de servizo."
-
-#: C/add-contact.page:49(p)
-msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
-msgstr ""
-"No campo <gui>Alcume</gui>escriba o nome do seu contacto tal e como lle "
-"gustaría que aparecese na súa lista de contactos."
-
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr ""
-"Prema <gui>Engadir</gui> para engadir a persoa á súa lista de contactos."
-
-#: C/add-contact.page:61(p)
-msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
-msgstr ""
-"Par engadir unha nova persoa á súa lista de contactos necesita estar "
-"conectado a Internet e á súa conta."
-
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Engadir unha nova conta en <app>Empathy</app>."
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "Engadir unha nova conta"
+#: C/tomboy.xml:1322(term)
+msgid "Show notes menu"
+msgstr "Mostrar o menú de notas"
-#: C/add-account.page:41(p)
-msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
-msgstr ""
-"Pode engadir contas de mensaxaría instantánea de calquera servizo admitido "
-"para comunicarse con todos os seus contactos no <app>Empathy</app>. Para "
-"algúns fornecedores de contas estes pasos permitiranlle rexistrar unha nova "
-"conta. Para obter máis información consulte a <link xref=\"create-account\"/"
-">."
+#: C/tomboy.xml:1325(para)
+msgid "Enter the key combination to open the notes menu."
+msgstr "Prema a combinación de teclas para abrir o menú de notas."
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Prema <gui style=\"button\">Engadir</gui>."
+#: C/tomboy.xml:1330(term)
+msgid "Open \"Start Here\""
+msgstr "Abrir \"Comezar aquí\""
-#: C/add-account.page:57(p)
+#: C/tomboy.xml:1333(para)
msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"Enter the key combination to open the <quote>Start Here</quote> note, which "
+"is preinstalled with Tomboy."
msgstr ""
-"Desde a lista despregábel <gui>Protocolo</gui>seleccione o tipo de conta que "
-"quere engadir."
-#: C/add-account.page:61(p)
-msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
-msgstr ""
-"Se aínda non ten unha conta rexistrada seleccione <gui>Crear unha nova conta "
-"no servidor</gui>. Esta característica non está dispoñíbel para todos os "
-"tipos de contas e pode non funcionar con algúns fornecedores de contas. Para "
-"obter máis información consulte a <link xref=\"create-account\"/>."
+#: C/tomboy.xml:1339(term)
+msgid "Create new note"
+msgstr "Crear unha nova nota"
-#: C/add-account.page:66(p)
-msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
+#: C/tomboy.xml:1342(para)
+msgid "Enter the key combination to create a new note."
msgstr ""
-"Introduza a información requirida. Para a maioría das contas só necesitará "
-"un ID de inicio de sesión e un contrasinal. Algunhas contas poden requirir "
-"información adicional. Para obter máis información consulte a <link xref="
-"\"accounts-window#details\"/>."
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Prema <gui style=\"button\">Iniciar sesión</gui>."
+#: C/tomboy.xml:1347(term)
+msgid "Search notes"
+msgstr "Buscar notas"
-#: C/add-account.page:78(p)
+#: C/tomboy.xml:1350(para)
msgid ""
-"To change the name that identifies the account in the <gui>Accounts</gui> "
-"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
+"Enter the key combination to open the <interface>Search All Notes</"
+"interface> dialog."
msgstr ""
-"Para cambiar o nome que identifica a conta na xanela <gui>Contas</gui>, "
-"seleccione a conta da lista á esquerda e prema no nome ou a barra "
-"espaciadora. Edite o nome da conta e prema <key>Intro</key> cando remate."
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Engadir, modificar e borrar contas."
-
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Xanela de contas"
-
-#: C/accounts-window.page:35(p)
-msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
-msgstr ""
-"A xanela <gui>Contas</gui> permítelle engadir, modificar e eliminar contas."
+#: C/tomboy.xml:1357(title)
+msgid "Tomboy Hotkey Preferences"
+msgstr "Preferencias das teclas rápidas de Tomboy"
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Detalles da conta"
+#: C/tomboy.xml:1368(title)
+msgid "Synchronization"
+msgstr "Sincronización"
-#: C/accounts-window.page:44(p)
-msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+#: C/tomboy.xml:1370(para)
+msgid "Please see <xref linkend=\"synchronization\"/> for more details."
msgstr ""
-"Para a maioría dos tipos de conta pode, simplemente, introducir un ID de "
-"inicio de sesión e un contrasinal. Porén, algúns tipos de conta poden "
-"requirir información adicional."
-
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Opcións avanzadas para contas Jabber e Google Talk."
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Detalles da conta Jabber"
+#: C/tomboy.xml:1375(title) C/tomboy.xml:1402(title)
+msgid "Add-ins"
+msgstr "Engadidos"
-#: C/account-jabber.page:31(p)
-msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+#: C/tomboy.xml:1377(para)
+msgid "The add-ins tab allows you to enable and configure Tomboy Add-ins."
msgstr ""
-"A maioría das contas Jabber, para conectarse, só requiren un ID de inicio de "
-"sesión e un contrasinal. Para algunhas contas en certo tipo de redes, pode "
-"necesitar introducir información adicional na sección <gui>Avanzadas</gui>. "
-"Xeralmente non necesita usar as opcións avanzadas de embaixo. Consulte a "
-"<link xref=\"add-account\"/> para obter instrucións xerais para engadir unha "
-"conta."
-#: C/account-jabber.page:39(p)
+#: C/tomboy.xml:1380(para)
msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"The list of installed add-ins shows on the left. An add-in is enabled by "
+"selecting it from the list and then selecting <guibutton>Enable</guibutton>. "
+"Disable an add-in by selecting it from the list and then selecting "
+"<guibutton>Disable</guibutton>."
msgstr ""
-"Google Talk é un tipo de conta Jabber. Estas instrucións tamén funcionan "
-"para contas de Google Talk."
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Requírese cifrado (TLS/SSL)"
-
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorar os erros de certificados SSL"
-#: C/account-jabber.page:47(p)
+#: C/tomboy.xml:1386(para)
msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
+"Please see <xref linkend=\"plugins\"/> for more information about the add-"
+"ins that are installed with Tomboy."
msgstr ""
-"Sempre que sexa posíbel, a comunicación entre <app>Empathy</app> e o "
-"servidor Jabber está cifrada. Se a comunicación cifrada non é posíbel, pode "
-"que as mensaxes se envíen sen cifrar. Seleccione <gui>Require cifrado</gui> "
-"para evitar que <app>Empathy</app> se comunique co servidor Jabber cando non "
-"é posíbel cifrar a comunicación."
-#: C/account-jabber.page:52(p)
-msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+#: C/tomboy.xml:1390(title)
+msgid "Tomboy Add-in Preferences"
msgstr ""
-"Algúns servidores Jabber poden cifrar datos usando certificados non válidos "
-"ou usando certificados de autoridades descoñecidas. Se confía no servidor ao "
-"que se está conectando pode seleccionar <gui>Ignorar os erros de "
-"certificados SSL</gui> para permitir comunicacións cifradas con certificados "
-"non válidos."
-
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Recurso"
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioridade"
+#: C/tomboy.xml:1406(member)
+msgid "Backlinks"
+msgstr "Retroligazóns"
-#: C/account-jabber.page:61(p)
-msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+#: C/tomboy.xml:1408(member) C/tomboy.xml:1445(term)
+msgid "Bugzilla URL Drop"
msgstr ""
-"Se ten múltiples aplicativos (en equipos diferentes, por exemplo) conectados "
-"á súa conta ao mesmo tempo, pode configurar un recurso para identificar "
-"univocamente cada unha. De forma predefinida <app>Empathy</app> usará "
-"<input>Telepathy</input> como recurso."
-#: C/account-jabber.page:65(p)
-msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+#: C/tomboy.xml:1410(member) C/tomboy.xml:1468(term)
+msgid "Evolution Mail Drop"
msgstr ""
-"Pode estabelecer a prioridade para especificar que aplicativo debería "
-"recibir mensaxes entrantes dos seus contactos. As mensaxes novas enviaranse "
-"ao aplicativo coa prioridade máis alta."
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Sobrescribir os axustes do servidor"
-
-#: C/account-jabber.page:71(p)
-msgid ""
-"<app>Empathy</app> will use default settings to connect to the Jabber server "
-"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
-msgstr ""
-"<app>Empathy</app> usará a configuración predeterminada para conectarse ao "
-"servidor Jabber en función do seu ID de inicio de sesión. Para algúns "
-"servidores Jabber precisará introducir manualmente os axustes do servidor. O "
-"seu fornecedor de Jabber deberíalle fornecer ditos axustes."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:112(None)
-msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+#: C/tomboy.xml:1416(member) C/tomboy.xml:1510(term)
+msgid "Note of the Day"
msgstr ""
-"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Información adicional necesaria para conectarse a redes IRC."
+#: C/tomboy.xml:1418(member) C/tomboy.xml:1531(term)
+msgid "Print Notes"
+msgstr "Imprimir notas"
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Detalles da conta IRC"
+#: C/tomboy.xml:1420(member)
+msgid "and Sticky Notes Import."
+msgstr "e importar notas adhesivas."
-#: C/account-irc.page:33(p)
+#: C/tomboy.xml:1404(para)
msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
-"account."
+"By default, Tomboy comes with several pre-installed add-ins: <placeholder-1/"
+"> Since these are preinstalled, they are ready to use and are automatically "
+"loaded into the Tomboy interface."
msgstr ""
-"As contas de IRC requiren información diferente que outros tipos de contas. "
-"Para crear unha conta IRC debe especificar cando menos a rede IRC e o "
-"alcume. Esta páxina detalla a información que pode fornecer para unha conta "
-"de IRC."
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Rede"
-
-#: C/account-irc.page:46(p)
-msgid ""
-"IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+#: C/tomboy.xml:1425(para)
+msgid "Some add-ins exist that are not installed by default."
msgstr ""
-"IRC é un sistema aberto que permite á xente estar en diferentes redes IRC. "
-"Cada rede é distinta e ten os seus propios usuarios e salas de chat. "
-"<app>Empathy</app> lista as redes máis populares na lista despregábel "
-"<gui>Rede</gui>. Aínda así engadir máis redes. Consulte embaixo a <link xref="
-"\"#networks\"/>."
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Alcume"
+#: C/tomboy.xml:1430(term)
+msgid "Backlinks (What links here?)"
+msgstr "Retroligazóns (Que liga aquí?)"
-#: C/account-irc.page:54(p)
+#: C/tomboy.xml:1433(para)
msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"This add-in allows you to know which notes link to the note you are "
+"currently editing. It makes it easier to keep track of the relationships "
+"between notes. If this add-in is enabled, the <link linkend=\"tools\">Tools</"
+"link> menu will have a <guimenuitem>What links here?</guimenuitem> option. "
+"When you select this option, it will list all the notes which link to the "
+"current note in a submenu. Select a note in the submenu to open it."
msgstr ""
-"O seu alcume é un nome único na rede IRC. Só unha persoa nunha rede pode "
-"usar certo alcume. Se obtén unha mensaxe que dí <link xref=\"prob-conn-name"
-"\" role=\"error-msg\"/> deberá cambiar o seu alcume."
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Contrasinal"
-
-#: C/account-irc.page:61(p)
+#: C/tomboy.xml:1448(para)
msgid ""
-"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"Allows you to drag a Bugzilla URL from your browser directly into a Tomboy "
+"note. The bug number is inserted as a link with a small bug icon next to it. "
+"Once the Bugzilla link has been inserted into the note, click on it to open "
+"the URL in your web browser."
msgstr ""
-"Algúns servidores, particularmente aqueles en redes privadas, requiren un "
-"contrasinal para a conexión. Se está autorizado a usar a rede, os "
-"administradores da rede forneceranlle un contrasinal."
-
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Contrasinais NickServ"
-#: C/account-irc.page:66(p)
+#: C/tomboy.xml:1454(para)
msgid ""
-"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular freenode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
-"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
-"more details."
+"Customize the icons that are used by editing the add-in preferences in the "
+"<link linkend=\"prefs-plugins\">Preferences Dialog</link>. After "
+"highlighting the Bugzilla Add-in, click <guibutton>Preferences</guibutton> "
+"to open the <interface>Bugzilla Add-in Settings</interface> dialog. To add a "
+"new icon, click <guibutton>Add</guibutton>, select an icon on your computer, "
+"provide a Bugzilla host name (e.g., bugzilla.gnome.org), and click "
+"<guibutton>Open</guibutton>. Any Bugzilla URL that is dragged and dropped "
+"from one of these custom host names will now use the icon you specified."
msgstr ""
-"Nalgunhas redes pode rexistrar os alcumes con un servizo coñecido como "
-"«NickServ». <app>Empathy</app> non admite directamente contrasinais para "
-"alcumes. Nalgunhas redes, incluíndo a popular rede freenode, os contrasinais "
-"do servidor redirecciónanse automaticamente a NickServ, permitíndolle usar "
-"este campo para identificarse con NickServ. Para obter máis información "
-"contacte a <link xref=\"irc-nick-password\"/>."
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Nome real"
-
-#: C/account-irc.page:77(p)
+#: C/tomboy.xml:1471(para)
msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
+"This add-in allows you to drag and drag an e-mail message from the "
+"<application>Evolution</application> mail application to one of your Tomboy "
+"notes. Clicking on the mail icon in the note will then open the "
+"corresponding e-mail message in Evolution."
msgstr ""
-"Pode fornecer o seu nome real ademais do seu alcume. Outros usuarios poderán "
-"velo ao ver a súa información."
-
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Mensaxe de saída"
-#: C/account-irc.page:82(p)
+#: C/tomboy.xml:1482(para)
msgid ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
+"will have the <guimenuitem>Export to HTML</guimenuitem> option available."
msgstr ""
-"Cando se desconecta enviase unha mensaxe de saída todas as salas de conversa "
-"nas que está e a todos os usuarios cos que ten unha conversa privada. Use "
-"este campo para fornecer unha mensaxe personalizada."
-
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "Redes IRC"
-
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Redes"
-#: C/account-irc.page:99(p)
+#: C/tomboy.xml:1486(para)
msgid ""
-"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"After selecting this option, you will be presented with a dialog that allows "
+"you to choose where to save the <acronym>HTML</acronym> file. Enter the "
+"destination filename and click <guibutton>OK</guibutton> to save the file, "
+"or <guibutton>Cancel</guibutton> to abort the operation."
msgstr ""
-"<app>Empathy</app> inclúe unha lista de redes IRC populares. Se quere usar "
-"outra rede IRC pode engadila á lista. Tamén pode modificar e eliminar redes "
-"da lista."
-#: C/account-irc.page:104(p)
+#: C/tomboy.xml:1492(para)
msgid ""
-"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
-"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+"To export any notes for which a link exists in the current note, select the "
+"<guibutton>Export linked notes</guibutton> button."
msgstr ""
-"Para engadir unha rede á lista prema <media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Engadir</media>."
-#: C/account-irc.page:107(p)
+#: C/tomboy.xml:1502(para)
msgid ""
-"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+"Allows you to use a fixed-width font when creating/editing notes. If this "
+"add-in is enabled, the <link linkend=\"text\">Text</link> menu will have a "
+"<guimenuitem>Fixed Width</guimenuitem> option."
msgstr ""
-"Para modificar unha rede da lista seleccione a rede e prema <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Editar</media>."
-#: C/account-irc.page:110(p)
+#: C/tomboy.xml:1513(para)
msgid ""
-"To remove a network from the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">Remove</media>."
+"This add-in automatically creates a \"Today\" note for jotting daily "
+"thoughts down. The current date is used as a basis for the title of the "
+"note. As an example, the title of a \"Today\" note created on February 28, "
+"2007, would be, \"Today: Wednesday, February 28 2007\""
msgstr ""
-"Para eliminar unha rede da lista seleccione e prema <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
-"\"16\">Eliminar</media>."
-#: C/account-irc.page:115(p)
+#: C/tomboy.xml:1519(para)
msgid ""
-"When adding or modifying a network, you can enter the following information:"
+"If you leave a \"Today\" note unmodified, the Note of the Day Add-in will "
+"automatically delete the note."
msgstr ""
-"Ao engadir ou modificar unha rede pode introducir a seguinte información:"
-#: C/account-irc.page:121(p)
+#: C/tomboy.xml:1522(para)
msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
-msgstr "Este é o nome da rede como quere que apareza na lista de redes."
-
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Conxunto de caracteres"
-
-#: C/account-irc.page:126(p)
-msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"To customize the content of the default \"Today\" note, create a new note "
+"and change the title of the note to be, \"Today: Template\". Change the "
+"content of the template note to whatever you like. When new \"Today\" notes "
+"are created, it will then use the content of your \"Today: Template\" note."
msgstr ""
-"Isto especifica a codificación de caracteres usada xeralmente nesta rede. "
-"Unha codificación de caracteres é unha forma específica de gravar os "
-"caracteres internamente nun computador. Existen moitas configuracións de "
-"caracteres e debe usar a mesma configuración de caracteres que o resto de "
-"usuarios para poder ver as súas mensaxes correctamente."
-#. Translators: Recommend character encodings that are common
-#. for your language.
-#: C/account-irc.page:135(p)
+#: C/tomboy.xml:1534(para)
msgid ""
-"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
-"can handle text from most of the world's languages. Another common encoding "
-"for English and some other Western languages is ISO-8859-1."
+"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
+"will have the <guimenuitem>Print</guimenuitem> option available."
msgstr ""
-"De forma predefinida <app>Empathy</app> usa UTF-8, unha codificación de "
-"caracteres moderna que pode xestionar texto na maioría dos idiomas do mundo. "
-"Outra configuración de caracteres común para inglés e outros idiomas "
-"occidentais é ISO-8859-1."
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidores"
+#: C/tomboy.xml:1544(term)
+msgid "Sticky Notes Import"
+msgstr "Importar notas adhesivas"
-#: C/account-irc.page:142(p)
+#: C/tomboy.xml:1547(para)
msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
-msgstr ""
-"Unha rede IRC pode ter moitos servidores aos que se pode conectar. Cando "
-"está conectado a un servidor nunha rede en particular, pode comunicarse con "
-"todos os usuarios en todos os servidores desa rede. Pode engadir e quitar "
-"servidores para esa rede usando os botóns <gui>Engadir</gui> e "
-"<gui>Eliminar</gui>."
-
-#: C/account-irc.page:147(p)
-msgid ""
-"When a server is selected, click the field under <gui>Server</gui> or "
-"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
-"to focus the field, and press the space bar to begin editing."
+"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
+"will have the <guimenuitem>Import from Sticky Notes</guimenuitem> option "
+"available."
msgstr ""
-"Cando un servidor estea seleccionado prema o campo baixo <gui>Servidor</gui> "
-"ou <gui>Porto</gui> para editalo. De forma alternativa, use as frechas "
-"esquerda e dereita para dar o foco ao campo e prema a barra espazadora para "
-"comezar a editalo."
+"Cando este engadido está instalado, o menú <link linkend=\"tools"
+"\">Ferramentas</link> terá unha nova opción dispoñíbel <guimenuitem>Importar "
+"desde notas adhesivas</guimenuitem>."
-#: C/account-irc.page:151(p)
+#: C/tomboy.xml:1551(para)
msgid ""
-"Select the check box in the <gui>SSL</gui> column to encrypt all "
-"communication with a server. Note that this does not prevent other users on "
-"the network from seeing what you write on public chat rooms."
+"Use this option to import notes from the <application>Sticky Notes</"
+"application> application that is available in prior releases of GNOME. This "
+"option has been included in Tomboy to provide an upgrade path for users who "
+"would like to migrate from <application>Sticky Notes</application> to Tomboy "
+"for their note taking purposes."
msgstr ""
-"Seleccione a caixa de verificación na columna <gui>SSL</gui> para cifrar "
-"toda a comunicación co servidor. Note que isto non prevén que outros "
-"usuarios na rede vexan o que escribe en salas de conversa públicas."
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
+#: C/tomboy.xml:0(None)
msgid "translator-credits"
-msgstr "Fran Diéguez <frandieguez@ubuntu.com>, 2010"
-
-#~ msgid ""
-#~ "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-#~ "mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-#~ "media> icon next to the name of the contact you wish to call and choose "
-#~ "<gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the "
-#~ "contact and choose <gui style=\"menuitem\">Audio Call</gui>."
-#~ msgstr ""
-#~ "Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
-#~ "\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
-#~ "\">Audiochamada</media> ao lado do nome do contacto ao que quere chamar e "
-#~ "seleccione <gui style=\"menuitem\">Audiochamada</gui>. De forma "
-#~ "alternativa, prema co botón dereito e seleccione <gui style=\"menuitem"
-#~ "\">Audiochamada</gui>."
-
-#~ msgid "Contact List"
-#~ msgstr "Lista de contactos"
-
-#~ msgid "video call"
-#~ msgstr "vídeochamada"
-
-#~ msgid "Video Call"
-#~ msgstr "Vídeochamada"
-
-#~ msgid "Connected"
-#~ msgstr "Conectado"
-
-#~ msgid "Hang up"
-#~ msgstr "Colgar"
-
-#~ msgid "Video Off"
-#~ msgstr "Vídeo desactivado"
-
-#~ msgid "Empathy"
-#~ msgstr "Empathy"
-
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "Share my desktop"
-#~ msgstr "Compartir o meu escritorio"
-
-#~ msgid "Custom Message"
-#~ msgstr "Mensaxe personalizada"
-
-#~ msgid "Enter"
-#~ msgstr "Introducir"
-
-#~ msgid "Select <placeholder-1/>."
-#~ msgstr "Seleccione <placeholder-1/>."
-
-#~ msgid "Saved Presets"
-#~ msgstr "Preferencias gardadas"
-
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgid "Add"
-#~ msgstr "Engadir"
-
-#~ msgid "Close"
-#~ msgstr "Pechar"
-
-#~ msgid "Chat"
-#~ msgstr "Conversa"
-
-#~ msgid "Send file"
-#~ msgstr "Enviar ficheiro"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
-#~ msgid "Stop"
-#~ msgstr "Deter"
-
-#~ msgid "Clear"
-#~ msgstr "Limpar"
-
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
-#~ msgid "F4"
-#~ msgstr "F4"
-
-#~ msgid "Click on <placeholder-1/>."
-#~ msgstr "Prema sobre <placeholder-1/>."
-
-#~ msgid "Network error"
-#~ msgstr "Erro de rede"
-
-#~ msgid "edit"
-#~ msgstr "editar"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgid "Enabled"
-#~ msgstr "Activar"
-
-#~ msgid "Name in use"
-#~ msgstr "Nome en uso"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Fallou a autenticación"
-
-#~ msgid "#593733"
-#~ msgstr "#593733"
-
-#~ msgid "search through all of your previous conversations"
-#~ msgstr "buscar a través de todas as súas conversas anteriores"
-
-#~ msgid "browse previous conversations"
-#~ msgstr "explorar as conversas anteriores"
-
-#~ msgid "View"
-#~ msgstr "Ver"
-
-#~ msgid "Previous Conversations"
-#~ msgstr "Conversas previas"
-
-#~ msgid "F3"
-#~ msgstr "F3"
-
-#~ msgid "Search"
-#~ msgstr "Buscar"
-
-#~ msgid "For"
-#~ msgstr "Por"
-
-#~ msgid "Find"
-#~ msgstr "Buscar"
-
-#~ msgid "Conversations"
-#~ msgstr "Conversas"
-
-#~ msgid "View Previous Conversations"
-#~ msgstr "Ver as conversas anteriores"
-
-#~ msgid "CreativeCommons website"
-#~ msgstr "Sitio web de Creative Commons"
-
-#~ msgid "Conversation"
-#~ msgstr "Conversa"
-
-#~ msgid "Show Contact List"
-#~ msgstr "Mostrar a lista de contactos"
-
-#~ msgid "server password"
-#~ msgstr "contrasinal do servidor"
-
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
-
-#~ msgid "telepathy-idle"
-#~ msgstr "telepathy-idle"
-
-#~ msgid "Room"
-#~ msgstr "Sala"
-
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
-#~ msgid "Account"
-#~ msgstr "Conta"
-
-#~ msgid "#"
-#~ msgstr "#"
-
-#~ msgid "Join the room"
-#~ msgstr "Unirse á sala"
-
-#~ msgid "<placeholder-1/> as normal."
-#~ msgstr "<placeholder-1/> é normal."
-
-#~ msgid "/help"
-#~ msgstr "/help"
-
-#~ msgid "Pidgin"
-#~ msgstr "Pidgin"
-
-#~ msgid "Yes, import my account details from"
-#~ msgstr "Si, importar os detalles da miña conta desde"
-
-#~ msgid "Forward"
-#~ msgstr "Adiante"
-
-#~ msgid "Offline Contacts"
-#~ msgstr "Contactos desconectados"
-
-#~ msgid "Ctrl"
-#~ msgstr "Ctrl"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "Server"
-#~ msgstr "Servidor"
-
-#~ msgid "Invite to chatroom"
-#~ msgstr "Invitar a unha sala de conversa"
-
-#~ msgid "Room List"
-#~ msgstr "Lista de salas"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferencias"
-
-#~ msgid "Choose <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-#~ msgstr "Seleccione <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-
-#~ msgid "Location"
-#~ msgstr "Localización"
-
-#~ msgid "Publish location to my contacts"
-#~ msgstr "Publicar a localización aos meus contactos"
-
-#~ msgid "Reduce location accuracy"
-#~ msgstr "Reducir a exactitude da localización"
-
-#~ msgid "Geoclue Settings"
-#~ msgstr "Configuración de Geoclue"
-
-#~ msgid "Google Latitude"
-#~ msgstr "Google Latitude"
-
-#~ msgid "Yahoo Fire Eagle"
-#~ msgstr "Yahoo Fire Eagle"
-
-#~ msgid "Brightkite"
-#~ msgstr "Brightkite"
-
-#~ msgid "Favorite Chat Room"
-#~ msgstr "Sala de conversa favorita"
-
-#~ msgid "F5"
-#~ msgstr "F5"
-
-#~ msgid "Press <placeholder-1/>."
-#~ msgstr "Prema <placeholder-1/>."
-
-#~ msgid "Join Favorites"
-#~ msgstr "Unirse ás favoritas"
-
-#~ msgid "Manage Favorites"
-#~ msgstr "Xestionar favoritas"
-
-#~ msgid "All"
-#~ msgstr "Todas"
-
-#~ msgid "Auto-Connect"
-#~ msgstr "Conectarse automaticamente"
-
-#~ msgid "add an account"
-#~ msgstr "engadir unha conta"
-
-#~ msgid "www.facebook.com"
-#~ msgstr "www.facebook.com"
-
-#~ msgid "Jabber.org"
-#~ msgstr "Jabber.org"
-
-#~ msgid "Sipphone"
-#~ msgstr "Sipphone"
-
-#~ msgid "Ekiga.net"
-#~ msgstr "Ekiga.net"
-
-#~ msgid "audio call"
-#~ msgstr "chamada de son"
-
-#~ msgid "Audio Call"
-#~ msgstr "chamada de vídeo"
-
-#~ msgid "Add Contact"
-#~ msgstr "Engadir contacto"
-
-#~ msgid "Identifier"
-#~ msgstr "Identificador"
-
-#~ msgid "Alias"
-#~ msgstr "Alias"
-
-#~ msgid "Log in"
-#~ msgstr "Iniciar a sesión"
-
-#~ msgid "Telepathy"
-#~ msgstr "Telepathy"
-
-#~ msgid "Port"
-#~ msgstr "Porto"
-
-#~ msgid "SSL"
-#~ msgstr "SSL"
+msgstr "Fran Dieguez <frandieguez@gnome.org>, 2011."
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 55595eca0..ec80885f0 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -4,10 +4,11 @@
msgid ""
msgstr ""
"Project-Id-Version: Empathy manual\n"
-"POT-Creation-Date: 2010-10-06 13:07+0000\n"
+"POT-Creation-Date: 2011-07-19 20:27+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -157,15 +158,15 @@ msgstr "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0"
#: C/video-call.page:28(title)
msgid "Start a video conversation"
-msgstr "Začni video konferenco"
+msgstr "Začenjanje video konference"
#: C/video-call.page:30(p)
msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
-msgstr "V primeru da imate spletno kamero lahko svoje stike pokličite in imate z njimi video pogovor. Ta zmožnost deluje le z določenimi vrstami računov in zahteva da ima druga oseba program, ki podpira video klice."
+msgstr "V primeru da imate spletno kamero, lahko svoje stike pokličite in imate z njimi video pogovor. Ta zmožnost deluje le z določenimi vrstami računov in zahteva, da ima druga oseba program, ki podpira video klice."
#: C/video-call.page:37(p)
msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Video Call</gui>."
-msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati in izberite <gui style=\"menuitem\">Video klic</gui>. Dodatno lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</gui>. "
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati, in izberite <gui style=\"menuitem\">Video klic</gui>. Namesto tega lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</gui>. "
#: C/video-call.page:43(p)
#: C/audio-call.page:42(p)
@@ -199,32 +200,32 @@ msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite
#: C/send-message.page:65(p)
#: C/audio-call.page:78(p)
msgid "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a contact in the <gui>Contact List</gui> window, and stop over it for a second: a small pop-up message will appear showing the number of the contacts that form the meta-contact."
-msgstr "Če želite videti ali je stik <em>meta-stik</em>, premaknite miško na stik v oknu <gui>Seznam stikov</gui> in se nad njim za trenutek zaustavite: pojavilo se bo majhno pojavno sporočilo, ki prikazuje število stikov, ki tvorijo meta-stik."
+msgstr "Če želite videti ali je stik <em>meta-stik</em>, premaknite miško na stik v oknu <gui>Seznam stikov</gui> in se nad njim za trenutek zaustavite: pojavilo se bo majhno sporočilo, ki prikazuje število stikov, ki tvorijo meta-stik."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
-msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
-msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
-msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:62(None)
#: C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
-msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
#: C/status-icons.page:7(desc)
msgid "Understanding the various statuses and status icons."
@@ -319,7 +320,7 @@ msgstr "Nastavitev vašega stanja na <em>Nepovezano</em> prekine povezavo z vsem
#: C/share-desktop.page:7(desc)
msgid "Share the desktop with your contacts."
-msgstr "Dajte namizje v souporabo z vašimi stiki."
+msgstr "Dajanje namizja v souporabo s stiki."
#: C/share-desktop.page:28(title)
msgid "Share your desktop"
@@ -331,13 +332,13 @@ msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti
#: C/share-desktop.page:38(p)
msgid "In order to be able to share your desktop or to remotely use your contacts desktop, it is necessary to have a remote desktop viewer application installed in your system."
-msgstr "Za souporabo svojega namizja ali za oddaljeno uporabo namizja vašega stika morate imeti na svojemu sistemu nameščen program oddaljenega pregledovalnika namizja."
+msgstr "Za souporabo svojega namizja ali za oddaljeno uporabo namizja svojega stika morate imeti na svojemu sistemu nameščen program oddaljenega pregledovalnika namizja."
#: C/share-desktop.page:46(p)
#: C/send-file.page:40(p)
#: C/favorite-rooms.page:66(p)
msgid "From the <gui>Contact List</gui> window, perform one of the following:"
-msgstr "V okno <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
+msgstr "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
#: C/share-desktop.page:51(p)
msgid "Select the contact you want to share your desktop with, and choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>."
@@ -349,7 +350,7 @@ msgstr "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in
#: C/share-desktop.page:65(p)
msgid "A request will be sent to the contact you want to share your desktop with. If they accept, the default remote desktop viewer application will be launched in order to permit you to disconnect the user that is controlling your desktop."
-msgstr "Vašemu stiku bo poslana zahteva za souporabo namizja. V primeru da sprejmejo bo zagnan privzeti oddaljeni pregledovalnik namizja, ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaše namizje."
+msgstr "Vašemu stiku bo poslana zahteva za souporabo namizja. V primeru da zahtevo sprejme, se bo zagnal privzeti oddaljeni pregledovalnik namizja, ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaše namizje."
#: C/share-desktop.page:70(p)
msgid "For more information about how to use the remote desktop viewer application, refer to its help."
@@ -357,7 +358,7 @@ msgstr "Za več podrobnosti kako uporabiti program oddaljenega pregledovalnika n
#: C/share-desktop.page:77(p)
msgid "When you share your desktop with someone else, it is possible to experience system performance slowdown and low Internet speed."
-msgstr "Ko svoje namizje date v souporabo z nekom drugim, boste morda izkusili upočasnjenost sistema in nizko hitrost medmrežja."
+msgstr "Ko svoje namizje date v souporabo z nekom drugim, boste morda opazili upočasnjeno delovanje sistema in nizko hitrost medmrežja."
#: C/share-desktop.page:83(p)
msgid "Not all your contacts might be able to support this functionality. It is necessary for them to have at least the 2.28 version of <app>Empathy</app> and a remote desktop viewer application installed in their system."
@@ -398,7 +399,7 @@ msgstr "Izberite stanje, kateremu želite dodati sporočilu po meri. Izbrati mor
#: C/set-custom-status.page:58(p)
msgid "Enter your custom message in the text box at the top of the window, and press <key>Enter</key> to set the message."
-msgstr "V besedilno polje na vrhu okna vnesite sporočilo po meri in pritisnite <key>Vnosno tipko</key> za nastavitev sporočila. "
+msgstr "V besedilno polje na vrhu okna vnesite sporočilo po meri in pritisnite <key>Enter</key> za nastavitev sporočila. "
#: C/set-custom-status.page:64(p)
msgid "If you want to set the custom message as a favorite, saving it in order to use it again, click on the little star on the right of the text box where you wrote your custom message."
@@ -426,7 +427,7 @@ msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporočilo stanja,
#: C/set-custom-status.page:106(p)
msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr "Vnesite novo sporočilo po meri in pritisnite <key>Vnosno tipko</key> za njegovo spreminjanje."
+msgstr "Vnesite novo sporočilo po meri in pritisnite <key>Enter</key> za njegovo spremembo."
#: C/set-custom-status.page:113(p)
msgid "To remove a custom message:"
@@ -492,7 +493,7 @@ msgstr "philbull@gmail.com"
#: C/send-message.page:32(title)
msgid "Send a message to someone"
-msgstr "Nekomu pošlji sporočilo"
+msgstr "Pošiljanje sporočila nekomu"
#: C/send-message.page:36(p)
msgid "From the <gui>Contact List</gui> window, double-click the name of the contact that you want to have a conversation with."
@@ -500,11 +501,11 @@ msgstr "V <gui>Seznamu stikov</gui> dvokliknite ime stika s katerim želite imet
#: C/send-message.page:42(p)
msgid "A new window will open. Type a message into the box at the bottom of the window and press <key>Enter</key> to send it."
-msgstr "Odprlo se bo novo okno. Vpišite sporočilo v polje na dnu okna in pritisnite <key>Vnosno tipko</key> za pošiljanje."
+msgstr "Odprlo se bo novo okno. Vpišite sporočilo v polje na dnu okna in pritisnite <key>Enter</key> za pošiljanje."
#: C/send-message.page:50(title)
msgid "Send a message to a meta-contact"
-msgstr "Pošljite sporočilo meta-stiku"
+msgstr "Pošiljanje sporočila meta-stiku"
#: C/send-message.page:58(p)
msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Chat</gui>."
@@ -512,11 +513,11 @@ msgstr "Izberite ime stika s katerim želite imeti pogovor in izberite <gui styl
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
-msgstr "Pošljite datoteko iz vašega računalnika enemu od vaših stikov."
+msgstr "Pošljite datoteko s svojega računalnika enemu od svojih stikov."
#: C/send-file.page:36(title)
msgid "Send files"
-msgstr "Pošlji datoteke"
+msgstr "Pošiljanje datotek"
#: C/send-file.page:45(p)
msgid "Right click on the contact you want to send a file to, and choose <gui>Send file</gui>."
@@ -588,7 +589,7 @@ msgstr "Popolnoma odstrani račun iz <app>Empathy</app>."
#: C/remove-account.page:33(title)
msgid "Remove an account"
-msgstr "Odstrani račun"
+msgstr "Odstranitev računa"
#: C/remove-account.page:35(p)
msgid "You can completely remove an account from <app>Empathy</app> if you no longer wish to use the account. If you wish to use the account in <app>Empathy</app> again in the future, you will have to add your account details again."
@@ -673,7 +674,7 @@ msgstr "V sporočilu napake kliknite na ikono <media type=\"image\" mime=\"image
#: C/prob-conn-neterror.page:65(p)
#: C/prob-conn-acctdisabled.page:59(p)
msgid "Check in the <gui>Advanced</gui> section that all the details are correct. You should be able to find these details from the website of the messaging service."
-msgstr "V odseku <gui>Napredno</gui> preverite da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletišču storitve sporočanja."
+msgstr "V odseku <gui>Napredno</gui> preverite, da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletišču storitve sporočanja."
#: C/prob-conn-neterror.page:82(p)
#: C/prob-conn-auth.page:68(p)
@@ -710,11 +711,11 @@ msgstr "V besedilno polje <gui>Vzdevek</gui> vpišite nov vzdevek."
#: C/prob-conn-name.page:55(p)
msgid "If you have registered that nickname within the network you are using, set the password for that nickname. For more information, see <link xref=\"irc-nick-password\"/>."
-msgstr "V primeru da ste ta vzdevek vpisali znotraj omrežja, ki ga uporabljate, nastavite geslo za ta vzdevek. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+msgstr "V primeru da ste ta vzdevek ustvarili v omrežju, ki ga uporabljate, nastavite geslo za ta vzdevek. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
#: C/prob-conn-name.page:64(p)
msgid "Deselect the <gui>Enabled</gui> check-box next to the name of your account, and then select it again to try to reconnect to the service."
-msgstr "Odstranite izbiro z izbirnega polja <gui>Omogočeno</gui> poleg imena vašega računa, in ga ponovno izberite za poskus ponovne povezave s storitvijo."
+msgstr "Odstranite izbiro izbirnega polja <gui>Omogočeno</gui> poleg imena svojega računa, in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
#: C/prob-conn-auth.page:8(desc)
msgid "An error message which says “<gui>Authentication failed</gui>” appears in the main window."
@@ -730,7 +731,7 @@ msgstr "Ta vrsta napake se zgodi, ko vam storitev takojšnjega sporočanja ne do
#: C/prob-conn-auth.page:50(p)
msgid "Make sure that you have registered an account with the service you are trying to connect to. If you do not have an account, most services will not allow you to connect."
-msgstr "Prepričajte se, da ste vpisali račun s storitvijo na katero se želite povezati. V primeru da nimate računa, vam večina storitev ne bo dovolila povezave."
+msgstr "Prepričajte se, da ste ustvarili račun za storitev s katero se želite povezati. V primeru da nimate računa, vam večina storitev ne bo dovolila povezave."
#: C/prob-conn-auth.page:63(p)
#: C/prob-conn-acctdisabled.page:54(p)
@@ -755,19 +756,19 @@ msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Računi</gui></guiseq> in izberite
#: C/prob-conn-acctdisabled.page:65(p)
msgid "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. If it is not, select the check-box to enable the account."
-msgstr "Preverite če je izbrano izbirno polje <gui style=\"checkbox\">Enabled</gui>. V nasprotnemu primeru izberite izbirno polje za omogočitev računa."
+msgstr "Preverite, če je izbrano izbirno polje <gui style=\"checkbox\">Omogočeno</gui>. Če ni, ga izberite in s tem omogočite račun."
#: C/prev-conv.page:8(desc)
msgid "Browse or search your previous conversations."
-msgstr "Brskanje ali iskanje vaših predhodnih pogovorov."
+msgstr "Brskanje ali iskanje po preteklih pogovorih."
#: C/prev-conv.page:35(title)
msgid "View previous conversations"
-msgstr "Ogled predhodnih pogovorov"
+msgstr "Ogled preteklih pogovorov"
#: C/prev-conv.page:39(p)
msgid "Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, independent of the selection (like in yellow or something), we can use the term \"highlight\". Otherwise we need to use the term \"select\". Watch that bug."
-msgstr "Poudarjanje besedila je čudno: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. V primeru da pride do dejanskega poudarjanja neodvisno od izbire (na primer v rumeni barvi) lahko uporabimo izraz \"poudarijanje\". V nasprotnemu primeru moramo uporabiti \"izbira\". Opazujte ta hrošč."
+msgstr "Poudarjanje besedila je čudno: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. V primeru da pride do dejanskega poudarjanja neodvisno od izbire (na primer v rumeni barvi), lahko uporabimo izraz \"poudarjanje\". V nasprotnemu primeru moramo uporabiti \"izbira\". Opazujte ta hrošč."
#: C/prev-conv.page:46(p)
msgid "<app>Empathy</app> automatically saves all your text conversations you have with your contacts. You can <link xref=\"#search\">search through all of your previous conversations</link> or <link xref=\"#browse\">browse previous conversations</link> by contact and date."
@@ -788,7 +789,7 @@ msgstr "Izvedete lahko iskanje celega besedila skozi vse vaše predhodne pogovor
#: C/prev-conv.page:67(p)
#: C/prev-conv.page:96(p)
msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</key>."
-msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Predhodni pogovori</gui></guiseq>. Dodatno lahko pritisnete <key>F3</key>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Pretekli pogovori</gui></guiseq>. Namesto tega lahko pritisnete <key>F3</key>."
#: C/prev-conv.page:71(p)
msgid "Select the <gui>Search</gui> tab."
@@ -796,7 +797,7 @@ msgstr "Izberite zavihek <gui>Iskanje</gui>."
#: C/prev-conv.page:74(p)
msgid "In the <gui>For</gui> field, type the text you want to search for. Click <gui>Find</gui> or press <key>Enter</key>."
-msgstr "V polje <gui>Za</gui>, vtipkajte besedilo, ki ga želite iskati. Kliknite <gui>išči</gui> ali pritisnite <key>Vnosno tipko</key>."
+msgstr "V polje <gui>Za</gui>, vtipkajte besedilo, ki ga želite iskati. Kliknite <gui>išči</gui> ali pritisnite <key>Enter</key>."
#: C/prev-conv.page:78(p)
msgid "Any conversations that matched your search terms will be shown in the list below the search field. By default, conversations are ordered by date."
@@ -860,15 +861,15 @@ msgstr "V primeru da imate Janeza Novaka, ki uporablja tri različne storitve sp
#: C/link-contacts.page:40(p)
msgid "janes@facebook"
-msgstr "janes@facebook"
+msgstr "janez@facebook"
#: C/link-contacts.page:45(p)
msgid "jane.smith@gmail"
-msgstr "jane.smith@gmail"
+msgstr "janez.novak@gmail"
#: C/link-contacts.page:50(p)
msgid "jane_smith@hotmail"
-msgstr "jane_smith@hotmail"
+msgstr "janez_novak@hotmail"
#: C/link-contacts.page:55(p)
msgid "You can combine these contacts into a single Jane Smith one."
@@ -900,7 +901,7 @@ msgstr "Ločevanje stikov"
#: C/link-contacts.page:94(p)
msgid "From the <gui>Contact List</gui>, right-click the contact to separate, and select <gui style=\"menuitem\">Link Contacts...</gui>."
-msgstr "V <gui>Seznam stikov</gui> desno kliknite na stik za ločevanje in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
+msgstr "V <gui>Seznamu stikov</gui> desno kliknite na stik za ločevanje in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
#: C/link-contacts.page:100(p)
msgid "Click <gui style=\"button\">Unlink</gui>."
@@ -976,7 +977,7 @@ msgstr "Z drugimi uporabniki IRC imate lahko zasebne pogovore zunaj javnih klepe
#: C/irc-start-conversation.page:37(p)
msgid "In the contact list for an IRC chat room, double click the name of the user you want to chat with. Alternatively, right click the name of the user and choose <gui>Chat</gui>."
-msgstr "Na seznamu stikov klepetalnice IRC dvokliknite ime uporabnika s katerim želite klepetati. Dodatno lahko desno kliknete na ima uporabnika in izberete <gui>Klepet</gui>."
+msgstr "Na seznamu stikov klepetalnice IRC dvokliknite ime uporabnika s katerim želite klepetati. Namesto tega lahko desno kliknete na ima uporabnika in izberete <gui>Klepet</gui>."
#: C/irc-start-conversation.page:45(p)
msgid "The IRC room contact list is not the same as <app>Empathy</app> contact list. It contains a list of users in the IRC chat room you joined. Different rooms can have different contacts listed."
@@ -988,7 +989,7 @@ msgstr "Seznam stikov sobe IRC je običajno na desni strani okna sobe IRC. V pri
#: C/irc-send-file.page:9(desc)
msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "<app>Empathy</app> trenutno ne podpira pošiljanja datotek z uporabo IRC."
+msgstr "<app>Empathy</app> trenutno ne podpira pošiljanja datotek preko IRC-a."
#: C/irc-send-file.page:31(title)
msgid "Send files over IRC"
@@ -996,7 +997,7 @@ msgstr "Pošiljanje datotek preko IRC-a"
#: C/irc-send-file.page:33(p)
msgid "It is not currently possible to send files using IRC."
-msgstr "Trenutno z uporabo IRC ni mogoče pošiljati datotek."
+msgstr "Trenutno preko IRC-a ni mogoče pošiljati datotek."
#: C/irc-nick-password.page:10(desc)
msgid "Protect your nickname to prevent other IRC users from using it."
@@ -1004,15 +1005,15 @@ msgstr "Zaščitite vaš vzdevek in preprečite da bi ga uporabljali drugi upora
#: C/irc-nick-password.page:33(title)
msgid "Use a nickname password on IRC"
-msgstr "Uporaba gesla vzdevka na IRC"
+msgstr "Uporaba gesla vzdevka na IRC-u"
#: C/irc-nick-password.page:35(p)
msgid "On some IRC networks, you can register your nickname with a service called NickServ. By sending special messages to NickServ, you can set your password and identify yourself. Some IRC chat rooms may not allow you to join without a registered nickname."
-msgstr "Na nekaterih omrežjih IRC lahko vpišete svoj vzdevek s storitvijo z imenom NickServ. S pošiljanjem posebnih sporočil NickServ lahko nastavite svojo geslo in se identificirate. Nekatere sobe klepeta IRC vam morda ne dovolijo pridružitve brez vpisanega vzdevka. "
+msgstr "Na nekaterih omrežjih IRC lahko ustvarite svoj vzdevek s storitvijo z imenom NickServ. S pošiljanjem posebnih sporočil NickServ lahko nastavite svojo geslo in se identificirate. Nekatere sobe klepeta IRC vam morda ne dovolijo pridružitve brez vpisanega vzdevka. "
#: C/irc-nick-password.page:40(p)
msgid "<app>Empathy</app> does not currently support nickname registration. Some IRC networks, however, will automatically forward a <em>server password</em> to NickServ. On these networks, you can use the IRC password in <app>Empathy</app> to identify yourself to NickServ. The popular freenode network is known to have this feature."
-msgstr "<app>Empathy</app> trenutno ne podpira vpisa vzdevkov. Nekatera omrežja IRC bodo NickServ samodejno posredovala <em>geslo strežnika</em>. Na teh omrežjih lahko uporabite geslo IRC v <app>Empathy</app> za identifikacijo sebe NickServ. Priljubljeno omrežje FreeNode ima to zmožnost."
+msgstr "<app>Empathy</app> trenutno ne podpira ustvarjanja vzdevkov. Nekatera omrežja IRC bodo NickServ samodejno posredovala <em>geslo strežnika</em>. Na teh omrežjih lahko uporabite geslo IRC v <app>Empathy</app> za identifikacijo sebe NickServ. Priljubljeno omrežje FreeNode ima to zmožnost."
#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
@@ -1024,7 +1025,7 @@ msgstr "Izberite račun IRC s seznama na levi strani pogovornega okna."
#: C/irc-nick-password.page:57(p)
msgid "In the <gui>Password</gui> field, type the password you used to register your nikcname."
-msgstr "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za vpis vašega vzdevka."
+msgstr "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za ustvarjanje svojega vzdevka."
#: C/irc-nick-password.page:63(p)
#: C/import-account.page:61(p)
@@ -1033,7 +1034,7 @@ msgstr "Kliknite <gui style=\"button\">Uveljavi</gui>."
#: C/irc-nick-password.page:69(p)
msgid "These instructions only allow you to use a password-protected nickname on certain IRC networks. It is not currently possible to register an IRC nickname or change your nickname password using <app>Empathy</app>."
-msgstr "Ta navodila vam dovolijo uporabo z geslom zaščitenega vzdevka na določenih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogoče vpisati vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
+msgstr "Ta navodila vam dovolijo uporabo z geslom zaščitenega vzdevka na določenih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogoče ustvariti vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
#: C/irc-manage.page:9(desc)
msgid "How to use IRC with <app>Empathy</app>."
@@ -1041,7 +1042,7 @@ msgstr "Kako uporabiti IRC z <app>Empathy</app>."
#: C/irc-manage.page:34(title)
msgid "Internet Relay Chat (IRC)"
-msgstr "Klepet medmrežnega prenašanja (IRC)"
+msgstr "Klepet IRC"
#: C/irc-manage.page:37(p)
#: C/account-irc.page:39(p)
@@ -1067,11 +1068,11 @@ msgstr "Pogoste težave"
#: C/irc-join-room.page:8(desc)
msgid "Join an IRC channel."
-msgstr "Pridruži se kanalu IRC"
+msgstr "Pridružitev kanalu IRC"
#: C/irc-join-room.page:31(title)
msgid "Join an IRC chat room"
-msgstr "Pridruži se sobi klepeta IRC"
+msgstr "Pridružitev klepetalnici IRC"
#: C/irc-join-room.page:33(p)
msgid "You can join IRC chat rooms (also known as IRC channels) on any IRC network you’re connected to. To connect to an IRC network, see <link xref=\"add-account\"/> and <link xref=\"account-irc\"/>."
@@ -1105,7 +1106,7 @@ msgstr "Vstop v z geslom zaščitene klepetalnice IRC."
#: C/irc-join-pwd.page:25(title)
msgid "Join a protected IRC chat room"
-msgstr "Pridruži se zaščiteni sobi klepeta IRC"
+msgstr "Pridružitev zaščiteni klepetalnici IRC"
#: C/irc-join-pwd.page:27(p)
msgid "On some IRC networks, private IRC rooms may be protected with a password. If you know the password, use the following steps to join:"
@@ -1125,11 +1126,11 @@ msgstr "Podprti ukazi IRC"
#: C/irc-commands.page:18(title)
msgid "Supported IRC commands"
-msgstr "Podpri ukazi IRC"
+msgstr "Podprti ukazi IRC"
#: C/irc-commands.page:19(p)
msgid "To see the list of the supported IRC commands, in a chat room type <input>/help</input> and press <key>Enter</key>."
-msgstr "Za ogled seznama podprtih ukazov IRC v klepetalnico vpišite <input>/help</input> in pritisnite <key>Vnosno tipko</key>."
+msgstr "Za ogled seznama podprtih ukazov IRC v klepetalnico vpišite <input>/help</input> in pritisnite <key>Enter</key>."
#: C/irc-commands.page:24(p)
msgid "All commands available have a small description on their usage."
@@ -1138,8 +1139,8 @@ msgstr "Vsi razpoložljivi ukazi imajo kratek opis njihove uporabe. "
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/introduction.page:41(None)
-msgid "@@image: 'figures/empathy-main-window.png'; md5=489ba00b0fc377aba4c691210b6e0650"
-msgstr "@@image: 'figures/empathy-main-window.png'; md5=489ba00b0fc377aba4c691210b6e0650"
+msgid "@@image: 'figures/empathy-main-window.png'; md5=54908dcb2588beddb15ef0968d2c2582"
+msgstr "@@image: 'figures/empathy-main-window.png'; md5=54908dcb2588beddb15ef0968d2c2582"
#: C/introduction.page:9(desc)
msgid "Introduction to the <app>Empathy</app> instant messenger."
@@ -1155,11 +1156,11 @@ msgstr "<app>Empathy</app> je program hipnega sporočanja za namizje GNOME. Podp
#: C/introduction.page:28(p)
msgid "<app>Empathy</app> includes features that help you better collaborate while at work, and that let you easily keep in touch with your friends."
-msgstr "<app>Empathy</app> vključuje zmožnosti, ki vam pomagajo na delu sodelovati in tiste, ki vam omogočajo vzdrževanje stikov s svojimi prijatelji."
+msgstr "<app>Empathy</app> vključuje zmožnosti, ki vam pomagajo sodelovati pri delu in zmožnosti, ki vam omogočajo vzdrževanje stikov s svojimi prijatelji."
#: C/introduction.page:32(p)
msgid "Using <app>Empathy</app>, you can group all the conversations in a single window, have multiple windows for different kind of conversations, easily search through your previous conversations, and share your desktop in just two clicks."
-msgstr "Z <app>Empathy</app> lahko vse pogovore združite v eno okno, ali imate več oken za različne vrste pogovorov; enostavno iščite skozi svoje predhodne pogovore in dajte svoje namizje v souporabo s samo dvema klikoma."
+msgstr "Z <app>Empathy</app> lahko vse pogovore združite v eno okno, ali imate več oken za različne vrste pogovorov; enostavno iščete skozi svoje predhodne pogovore in date svoje namizje v souporabo s samo dvema klikoma."
#: C/introduction.page:39(title)
msgid "<gui>Contact List</gui> window"
@@ -1176,8 +1177,8 @@ msgstr "Glavno okno <app>Empathy</app>."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/index.page:28(None)
-msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
-msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgid "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+msgstr "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
#: C/index.page:7(title)
#: C/index.page:8(title)
@@ -1194,7 +1195,7 @@ msgstr "Upravljanje z računi"
#: C/index.page:39(title)
msgid "Contact Management"
-msgstr "Upravljanje s stiki"
+msgstr "Upravljanje stikov"
#: C/index.page:43(title)
msgid "Text Conversations"
@@ -1222,7 +1223,7 @@ msgstr "peter.haslam@freenet.de"
#: C/import-account.page:42(title)
msgid "Import an existing account"
-msgstr "Uvozi obstoječi račun"
+msgstr "Uvoz obstoječega računa"
#: C/import-account.page:44(p)
msgid "The first time you run <app>Empathy</app>, it will offer to import your accounts from other instant messaging applications. Currently, the only supported application is <app>Pidgin</app>."
@@ -1282,7 +1283,7 @@ msgstr "Skupinski pogovori vam omogočajo besedilne pogovor z več kot enim stik
#: C/group-conversations.page:40(p)
msgid "To have a group conversation you need to have a registered account with either Jabber or Google Talk, or a People Nearby account."
-msgstr "Za skupinski pogovor morate imeti vpisan račun z Jabber ali Google Talk ali račun Ljudje v bližini."
+msgstr "Za skupinski pogovor morate imeti ustvarjen račun Jabber ali Google Talk ali račun Ljudje v bližini."
#: C/group-conversations.page:46(p)
msgid "You can have a group conversation only with the contacts that are using the same service as yours."
@@ -1290,7 +1291,7 @@ msgstr "Skupinske pogovore lahko imate le s stiki, ki uporabljajo enako storitev
#: C/group-conversations.page:54(title)
msgid "Start a group conversation"
-msgstr "Začni skupinski pogovor"
+msgstr "Začenjanje skupinskega pogovora"
#: C/group-conversations.page:63(p)
msgid "From the <gui>Account</gui> drop-down list, select the account you want to use for the group conversation."
@@ -1302,7 +1303,7 @@ msgstr "V besedilno polje <gui>Strežnik</gui> vnesite ime strežnika za gostova
#: C/group-conversations.page:73(p)
msgid "Leave it empty if it will be on the current server."
-msgstr "Pustite prazno, če bo soba na trenutnemu strežniku."
+msgstr "Polje pustite prazno, če bo soba na trenutnemu strežniku."
#: C/group-conversations.page:78(p)
msgid "In the <gui>Room</gui> text box, type the name you want to give to the conversation."
@@ -1314,7 +1315,7 @@ msgstr "To bo bilo ime sobe za pogovor. To ime bo javno dostopno za druge ljudi,
#: C/group-conversations.page:90(p)
msgid "To invite other contacts to join the group conversation, from the <gui>Contact List</gui> window, select the contact you want to invite, and perform one of the following:"
-msgstr "Za povabilo drugih stikov v skupinski pogovor v oknu <gui>Seznam stikov</gui> izberite stik, ki ga želite povabiti, in izvedite nekaj od sledečega:"
+msgstr "Za povabilo drugih stikov v skupinski pogovor v oknu <gui>Seznam stikov</gui> izberite stik, ki ga želite povabiti, in izvedite nekaj od naslednjega:"
#: C/group-conversations.page:97(p)
msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
@@ -1330,7 +1331,7 @@ msgstr "V primeru da imate odprt več kot en skupinski pogovor izberite tistega
#: C/group-conversations.page:118(title)
msgid "Join a group conversation"
-msgstr "Pridruži se skupinskemu pogovoru"
+msgstr "Pridružitev skupinskemu pogovoru"
#: C/group-conversations.page:128(p)
msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
@@ -1338,7 +1339,7 @@ msgstr "Razširite odsek <gui>Seznam sob</gui> za ogled vseh obstoječih sob."
#: C/group-conversations.page:133(p)
msgid "Double-click on the name of a room to join it."
-msgstr "Dvokiliknite na ime sobe za pridružitev."
+msgstr "Dvokliknite na ime sobe za pridružitev."
#: C/group-conversations.page:139(p)
msgid "It is not possible to join all existing rooms. Some of the rooms might require a password, or might be invitation only. <app>Empathy</app> does not support these kind of rooms."
@@ -1446,7 +1447,7 @@ msgstr "Kateri podatki so poslani"
#: C/geolocation-privacy.page:36(p)
msgid "What is possible to send is: your country, region, locality, area, street, building, floor, room, and postal code, longitude, latitude and altitude, speed and bearing."
-msgstr "Mogoče je poslati: vašo državo, regijo, krajevnost, področje, ulico, zgradbo, nadstropje, sobo, poštno številko, zemljepisno širino in dolžino, nadmorsko višino, hitrost in smer."
+msgstr "Mogoče je poslati: državo, regijo, krajevnost, področje, ulico, zgradbo, nadstropje, sobo, poštno številko, zemljepisno širino in dolžino, nadmorsko višino, hitrost in smer."
#: C/geolocation-privacy.page:40(p)
msgid "The accuracy and the quantity of information about your geographical position are based on the software or on the infrastructure used to discover your position."
@@ -1554,7 +1555,7 @@ msgstr "Nastavi sobo kot priljubljeno"
#: C/favorite-rooms.page:35(p)
msgid "Join a room."
-msgstr "Pridruži se sobi."
+msgstr "Pridružite se sobi."
#: C/favorite-rooms.page:40(p)
msgid "See <link xref=\"irc-join-room\"/> for more information on how to join an IRC room."
@@ -1590,7 +1591,7 @@ msgstr "Za pridružitev priljubljeni sobi morate biti povezani z medmrežjem in
#: C/favorite-rooms.page:98(title)
msgid "Manage favorite rooms"
-msgstr "Upravljaj s priljubljenimi sobami"
+msgstr "Upravljanje s priljubljenimi sobami"
#: C/favorite-rooms.page:101(p)
msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>."
@@ -1626,7 +1627,7 @@ msgstr "Preprečitev samodejnega prijavljanja <app>Empathy</app> v račun."
#: C/disable-account.page:39(title)
msgid "Disable an account"
-msgstr "Onemogoči račun"
+msgstr "Onemogočitev računa"
#: C/disable-account.page:41(p)
msgid "You can disable an account to prevent <app>Empathy</app> from logging in to it without removing the account entirely. You may wish to disable and re-enable an account if you only want to be logged in to the account at certain times, but you still want to use <app>Empathy</app> for other accounts."
@@ -1646,15 +1647,15 @@ msgstr "Za ponovno omogočitev računa enostavno izberite <gui style=\"checkbox\
#: C/create-account.page:9(desc)
msgid "Register for an account with one of the supported messaging services."
-msgstr "Vpis za račun z eno od podprtih storitev sporočanja."
+msgstr "Ustvarjanje računa z eno od podprtih storitev sporočanja."
#: C/create-account.page:34(title)
msgid "Register for a new account"
-msgstr "Vpiši za nov račun"
+msgstr "Ustvarjanje novega računa"
#: C/create-account.page:36(p)
msgid "Most account types require you to create an account with a account provider before you can connect using instant messaging applications like <app>Empathy</app>. With some account providers, you can use <app>Empathy</app> to register for a new account, using the same steps as you would to <link xref=\"add-account\">add an account</link>."
-msgstr "Večina vrst računov pred povezovanjem s programom hipnega sporočanja kot je <app>Empathy</app> zahteva ustvarjanje računa s ponudnikom računa. Za nekatere ponudnike računov je mogoče za vpis novega računa uporabiti <app>Empathy</app> z uporabo enakih korakov kot za <link xref=\"add-account\">dodajanje računa</link>."
+msgstr "Večina vrst računov pred povezovanjem s programom hipnega sporočanja kot je <app>Empathy</app> zahteva ustvarjanje računa s ponudnikom računa. Za nekatere ponudnike računov je mogoče za ustvarjanje novega računa uporabiti <app>Empathy</app> z uporabo enakih korakov kot za <link xref=\"add-account\">dodajanje računa</link>."
#: C/create-account.page:42(p)
msgid "This page provides information on creating a new account for various types of accounts. Your account provider should give you a login ID and a password, as well as any additional information you need to connect using <app>Empathy</app>."
@@ -1726,7 +1727,7 @@ msgstr "IRC"
#: C/create-account.page:109(p)
msgid "You do not need to register for an account to use IRC. Although you specify a nickname when you add an IRC account to <app>Empathy</app>, this nickname is only established each time you connect. If another user is using the nickname, you will need to choose a new nickname."
-msgstr "Za uporabo IRC-a se ne potrebujete vpisati za račun. Čeprav ob dodajanju računa IRC v <app>Empathy</app> navedete vzdevek, je vzdevek vzpostavljen ob vsaki povezavi. V primeru da vzdevek uporablja drug uporabnik, boste morali izbrati nov vzdevek. "
+msgstr "Za uporabo IRC-a vam ni treba ustvariti računa. Čeprav ob dodajanju računa IRC v <app>Empathy</app> navedete vzdevek, je vzdevek vzpostavljen ob vsaki povezavi. V primeru da vzdevek uporablja drug uporabnik, boste morali izbrati nov vzdevek. "
#: C/create-account.page:114(p)
msgid "Some IRC networks use a service called NickServ to allow users to protect their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
@@ -1770,7 +1771,7 @@ msgstr "Spremenite svoje stanje za oglaševanje vaše razpoložljivosti vašim s
#: C/change-status.page:34(title)
msgid "Change your status"
-msgstr "Spremenite vaše stanje"
+msgstr "Sprememba stanja"
#: C/change-status.page:36(p)
msgid "You can set your status to indicate your availability to your contacts. <app>Empathy</app> allows you to select from a list of defined statuses."
@@ -2020,7 +2021,7 @@ msgstr "Dodajanje novega računa"
#: C/add-account.page:41(p)
msgid "You can add instant messaging accounts from any supported service to communicate with all of your contacts in <app>Empathy</app>. For some account providers, these steps will also allow you to register for a new account. For more details, see <link xref=\"create-account\"/>."
-msgstr "Račune hipnega sporočanja za sporazumevanje z vsemi vašimi stiki v <app>Empath</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike računov vam bodo ti koraki omogočili tudi vpis za nov račun. Za več podrobnosti si oglejte <link xref=\"create-account\"/>."
+msgstr "Račune hipnega sporočanja za sporazumevanje z vsemi svojimi stiki v <app>Empathy</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike računov vam bodo ti koraki omogočili tudi ustvarjanje novega računa. Za več podrobnosti si oglejte <link xref=\"create-account\"/>."
#: C/add-account.page:52(p)
msgid "Click <gui style=\"button\">Add</gui>."
@@ -2032,7 +2033,7 @@ msgstr "Na spustnemu seznamu <gui>Protokol</gui> izberite vrsto računa, ki jo
#: C/add-account.page:61(p)
msgid "If you do not already have a registered account, select <gui>Create a new account on the server</gui>. This feature is not available for all account types, and may not work with some account providers. See <link xref=\"create-account\"/> for more information."
-msgstr "V primeru da še niste vpisali računa, izberite <gui>Ustvari nov račun na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste računov in morda ne bo delovala z nekaterimi ponudniki računov. Za več podrobnosti si oglejte <link xref=\"create-account\"/>. "
+msgstr "V primeru da še niste ustvarili novega račun, izberite <gui>Ustvari nov račun na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste računov in morda ne bo delovala z nekaterimi ponudniki računov. Za več podrobnosti si oglejte <link xref=\"create-account\"/>. "
#: C/add-account.page:66(p)
msgid "Enter the required information. For most accounts, you will only need a login ID and a password. Some accounts may require additional information. See <link xref=\"accounts-window#details\"/> for more information."
@@ -2044,7 +2045,7 @@ msgstr "Kliknite <gui style=\"button\">Prijava</gui>."
#: C/add-account.page:78(p)
msgid "To change the name that identifies the account in the <gui>Accounts</gui> window, select the account from the list on the left and either click on the name or press the space bar. Edit the account name and press <key>Enter</key> when you’re finished."
-msgstr "Za spremembo imena, ki identificira račun v oknu <gui>Računi</gui> izberite račun s seznama na levi in ali kliknite na ime ali pritisnite preslednico. Uredi ime računa in pritisnite <key>Vnosno tipko</key> ko ste končali."
+msgstr "Za spremembo imena, ki identificira račun v oknu <gui>Računi</gui>, izberite račun s seznama na levi ali kliknite na ime ali pritisnite preslednico. Uredite ime računa in pritisnite <key>Enter</key>, ko ste končali."
#: C/accounts-window.page:11(desc)
msgid "Add, modify, and delete accounts."
@@ -2136,7 +2137,7 @@ msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Dodatni podatki potrebni za povezovanje z omrežji IRC."
+msgstr "Dodatni podatki, potrebni za povezovanje z omrežji IRC."
#: C/account-irc.page:31(title)
msgid "IRC account details"
@@ -2177,7 +2178,7 @@ msgstr "Gelsa NickServ"
#: C/account-irc.page:66(p)
msgid "On some networks, nicknames can be registered using a service known as NickServ. <app>Empathy</app> does not directly support nickname passwords. On some networks, including the popular freenode network, server passwords are automatically forwarded to NickServ, allowing you to set this field to identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for more details."
-msgstr "Na nekaterih omrežjih je vzdevke mogoče vpisati z uporabo storitve NickServ. <app>Empathy</app> gesel vzdevkov ne podpira neposredno. Na nekaterih omrežjih, vključno s priljubljenim omrežjem FreeNode, so strežniška gesla samodejno posredovana NickServ, kar vam omogoča nastavitev tega polja za identifikacijo z NickServ. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+msgstr "Na nekaterih omrežjih je vzdevke mogoče ustvariti z uporabo storitve NickServ. <app>Empathy</app> gesel vzdevkov ne podpira neposredno. Na nekaterih omrežjih, vključno s priljubljenim omrežjem FreeNode, so strežniška gesla samodejno posredovana NickServ, kar vam omogoča nastavitev tega polja za identifikacijo z NickServ. Za več podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
#: C/account-irc.page:76(gui)
msgid "Real name"
@@ -2236,7 +2237,7 @@ msgid "This specifies the character encoding that is typically used on this netw
msgstr "To navede znakovno kodiranje, ki je običajno uporabljano na temu omrežju. Znakovno kodiranje je določen način notranjega zapisovanja znakov v računalniku. Obstaja več znakovnih kodiranj. Za pravilen ogled sporočil drugih uporabnikov morate uporabljati isto znakovno kodiranje kot oni."
#. Translators: Recommend character encodings that are common
-#. for your language.
+#. for your language.
#: C/account-irc.page:135(p)
msgid "By default, <app>Empathy</app> uses UTF-8, a modern character encoding that can handle text from most of the world's languages. Another common encoding for English and some other Western languages is ISO-8859-1."
msgstr "Privzeto <app>Empathy</app> uporablja UTF-8, priljubljeno znakovno kodiranje, ki lahko upravlja z večino svetovnih jezikov. Drugo pogosto kodiranje za slovenščino in nekatere druge srednjeevropske jezike je ISO-8859-2."
@@ -2251,7 +2252,7 @@ msgstr "Omrežje IRC ima lahko veliko strežnikov na katere se lahko povežete.
#: C/account-irc.page:147(p)
msgid "When a server is selected, click the field under <gui>Server</gui> or <gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys to focus the field, and press the space bar to begin editing."
-msgstr "Ko je strežnik izbran za urejanje kliknite na <gui>Strežnik</gui> ali <gui>Vrata</gui>. Dodatno lahko uporabite puščici levo in desno za žariščenje na polje in pritisnite preslednico za začetek urejanja."
+msgstr "Ko je strežnik izbran za urejanje kliknite na <gui>Strežnik</gui> ali <gui>Vrata</gui>. Namesto tega lahko uporabite puščici levo in desno za žariščenje na polje in pritisnite preslednico za začetek urejanja."
#: C/account-irc.page:151(p)
msgid "Select the check box in the <gui>SSL</gui> column to encrypt all communication with a server. Note that this does not prevent other users on the network from seeing what you write on public chat rooms."
@@ -2261,52 +2262,3 @@ msgstr "Izberite izbirno polje v stolpcu <gui>SSL</gui> za šifriranje vse komun
#: C/index.page:0(None)
msgid "translator-credits"
msgstr "Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2010"
-
-#~ msgid ""
-#~ "To turn a video conversation into an audio conversation, choose "
-#~ "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
-#~ "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
-#~ "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
-#~ "it."
-#~ msgstr ""
-#~ "Za spremembo video pogovora v zvočni pogovor izberite<guiseq><gui style="
-#~ "\"menu\">Video</gui><gui style=\"menuitem\">Izklopi video</gui></guiseq> "
-#~ "ali v orodni vrstici kliknite gumb <media type=\"image\" mime=\"image/png"
-#~ "\" src=\"figures/camera-web.png\">video klic</media> za odstranitev "
-#~ "njegove izbire."
-#~ msgid ""
-#~ "Click on the trash icon next to the account name to remove the account."
-#~ msgstr "Kliknite na ikono smeti poleg imena računa za njegovo odstranitev."
-#~ msgid "To join such a room, if you know the password:"
-#~ msgstr "Za pridružitev takšni sobi, v primeru da veste geslo:"
-#~ msgid ""
-#~ "There are a number of popular free SIP account providers; one popular "
-#~ "provider is <link href=\"https://signup.sipphone.com/new-users/app?"
-#~ "class=NewUser;proc=start\">Sipphone</link>."
-#~ msgstr ""
-#~ "Obstaja veliko brezplačnih ponudnikov SIP; eden od priljubljenih "
-#~ "ponudnikov je <link href=\"https://signup.sipphone.com/new-users/app?"
-#~ "class=NewUser;proc=start\">Sipphone</link>."
-#~ msgid ""
-#~ "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-#~ "mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-#~ "media> icon next to the name of the contact you wish to call and choose "
-#~ "<gui style=\"menuitem\">Audio Call</gui>. Alternatively, right click the "
-#~ "contact and choose <gui style=\"menuitem\">Audio Call</gui>."
-#~ msgstr ""
-#~ "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime="
-#~ "\"image/png\" src=\"figures/audio-input-microphone.png\">zvočni klic</"
-#~ "media> poleg imena stika, ki ga želite klicati in izberite <gui style="
-#~ "\"menuitem\">Zvočni klic</gui>. Dodatno lahko desno kliknete na stik in "
-#~ "izberete <gui style=\"menuitem\">Zvočni klic</gui>."
-#~ msgid ""
-#~ "To turn an audio conversation into a video conversation, choose "
-#~ "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
-#~ "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
-#~ "\"figures/camera-web.png\">video call</media> toolbar button to select it."
-#~ msgstr ""
-#~ "Za spremembo zvočnega pogovora v video pogovor izberite <guiseq><gui "
-#~ "style=\"menu\">Video</gui><gui style=\"menuitem\">Video vklopljen</gui></"
-#~ "guiseq> ali za izbiro kliknite na gumb <media type=\"image\" mime=\"image/"
-#~ "png\" src=\"figures/camera-web.png\">video klic</media> v orodni vrstici."
-
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index dfdb922ed..645d667db 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the empathy package.
# Lavande <lavande@thislove.cz.cc>, 2010
# Tao Wang <dancefire@gmail.com>, 2010
+# lainme <lainme993@gmail.com>, 2011
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"POT-Creation-Date: 2010-07-13 11:44+0000\n"
-"PO-Revision-Date: 2010-07-14 16:35+1000\n"
-"Last-Translator: Tao Wang <dancefire@gmail.com>\n"
+"POT-Creation-Date: 2011-07-11 12:41+0000\n"
+"PO-Revision-Date: 2011-07-11 20:40+0800\n"
+"Last-Translator: lainme <lainme993@gmail.com>\n"
"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,8 +19,8 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:63(None)
-#: C/audio-video.page:70(None) C/audio-call.page:65(None)
+#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr ""
"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -34,18 +35,19 @@ msgstr "向您的联系人发起视频会话。"
#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
-#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
-#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
-#: C/irc-commands.page:10(name) C/introduction.page:13(name)
-#: C/index.page:18(name) C/import-account.page:23(name)
-#: C/hide-contacts.page:11(name) C/group-conversations.page:19(name)
-#: C/geolocation-what-is.page:18(name) C/geolocation-turn.page:18(name)
-#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
-#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
-#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:18(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:20(name)
+#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
+#: C/introduction.page:13(name) C/index.page:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name) C/create-account.page:19(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
@@ -55,52 +57,59 @@ msgstr "Milo Casagrande"
#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
-#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
-#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
-#: C/irc-commands.page:11(email) C/introduction.page:14(email)
-#: C/index.page:19(email) C/import-account.page:24(email)
-#: C/hide-contacts.page:12(email) C/group-conversations.page:20(email)
-#: C/geolocation-what-is.page:19(email) C/geolocation-turn.page:19(email)
-#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
+#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
+#: C/introduction.page:14(email) C/index.page:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:19(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:21(email)
+#: C/create-account.page:20(email) C/audio-video.page:18(email)
+#: C/audio-call.page:20(email) C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
#: C/video-call.page:25(p) C/status-icons.page:24(p)
#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:20(p) C/send-file.page:25(p)
+#: C/send-message.page:21(p) C/send-file.page:25(p)
#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:23(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
-#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
-#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
-#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
-#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
-#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
-#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:22(p)
-#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:28(p)
-#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:20(p)
+#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
+#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
+#: C/create-account.page:23(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
+#: C/add-account.page:28(p) C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
msgid "Creative Commons Share Alike 3.0"
msgstr "知识共享-相同方式共享 (Creative Commons Share Alike) 3.0"
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
msgid "Start a video conversation"
msgstr "发起视频会话"
-#: C/video-call.page:37(p)
+#: C/video-call.page:30(p)
+#, fuzzy
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
msgid ""
-"If you have a webcam, you can call your contacts and have an video "
+"If you have a webcam, you can call your contacts and have a video "
"conversation with them. This features only works with certain types of "
"accounts, and it requires the other person to have an application that "
"supports video calls."
@@ -108,67 +117,111 @@ msgstr ""
"如果您有网络摄像头,您可以呼叫您的联系人并和他们进行视频会话。此功能仅可用于"
"特定类型的帐号,并需要对方也安装了支持视频呼叫的程序。"
-#: C/video-call.page:44(p)
+#: C/video-call.page:37(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
msgid ""
"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-"choose <gui style=\"menuitem\">Video Call</gui>."
+"\"menuitem\">Video Call</gui>."
msgstr ""
"在<gui>联系人列表</gui>窗口,点击您想呼叫的联系人的名字旁的<media type="
"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
"图标并选择<gui style=\"menuitem\">视频呼叫</gui>。同样,也可以右击联系人并选"
"择<gui style=\"menuitem\">视频呼叫</gui>。"
-#: C/video-call.page:50(p) C/audio-call.page:52(p)
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
msgid ""
"A new window will open. When the connection is established, you will see "
"<gui>Connected</gui> at the bottom of the window, along with the total "
"conversation time."
msgstr ""
-"连接建立后,会打开新的窗口,您将在窗口底部看见<gui>已连接</gui>,以及总对话时"
+"连接建立后,会打开新的窗口,您将在窗口底部看见<gui>已连接</gui>,以及总会话时"
"间。"
-#: C/video-call.page:55(p) C/audio-call.page:57(p)
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr "点击<gui style=\"button\">挂断</gui>以结束会话。"
-#: C/video-call.page:61(p)
+#: C/video-call.page:54(p)
+#, fuzzy
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to deselect it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
msgstr ""
"要将视频会话转为音频会话,则选择<guiseq><gui style=\"menu\">视频</gui><gui "
"style=\"menuitem\">关闭视频</gui></guiseq>,或者点击工具栏上的<media type="
"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
"按钮以取消选择。"
+#: C/video-call.page:60(title)
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "向您的联系人发起视频会话。"
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "从 <gui>联系人列表</gui> 窗口,点击顶部的下拉菜单。"
+
+#: C/video-call.page:68(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字,然后选择 <gui>聊天</gui>"
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
-msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
-msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
-msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
-msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
#: C/status-icons.page:7(desc)
msgid "Understanding the various statuses and status icons."
@@ -304,7 +357,7 @@ msgstr ""
"为了能够共享您的桌面或者远程使用您联系人的桌面,需要在您的系统中安装远程桌面"
"查看应用程序。"
-#: C/share-desktop.page:46(p) C/send-message.page:35(p) C/send-file.page:40(p)
+#: C/share-desktop.page:46(p) C/send-file.page:40(p)
#: C/favorite-rooms.page:66(p)
msgid "From the <gui>Contact List</gui> window, perform one of the following:"
msgstr "从 <gui>联系人列表</gui> 窗口,执行下列操作中的一个:"
@@ -499,37 +552,35 @@ msgstr ""
msgid "Send a message to one of your contacts."
msgstr "发送消息给一个您的联系人。"
-#: C/send-message.page:16(name) C/send-file.page:17(name)
+#: C/send-message.page:17(name) C/send-file.page:17(name)
#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
#: C/change-status.page:19(name) C/add-contact.page:18(name)
msgid "Phil Bull"
msgstr "Phil Bull"
-#: C/send-message.page:17(email) C/send-file.page:18(email)
+#: C/send-message.page:18(email) C/send-file.page:18(email)
#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
#: C/change-status.page:20(email) C/add-contact.page:19(email)
msgid "philbull@gmail.com"
msgstr "philbull@gmail.com"
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
msgid "Send a message to someone"
msgstr "发送一条消息给某人"
-#: C/send-message.page:40(p)
+#: C/send-message.page:36(p)
+#, fuzzy
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
msgid ""
-"Double click the name of the contact that you want to have a conversation "
-"with."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
msgstr "双击您想要进行交谈的联系人的名字。"
-#: C/send-message.page:46(p)
-msgid ""
-"Right-click on the name of the contact you want to have a conversation with, "
-"and choose <gui>Chat</gui>."
-msgstr "右键点击您想要进行交谈的联系人的名字,然后选择 <gui>聊天</gui>"
-
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
msgid ""
"A new window will open. Type a message into the box at the bottom of the "
"window and press <key>Enter</key> to send it."
@@ -537,6 +588,22 @@ msgstr ""
"这时会打开一个新的窗口。在窗口底部的文本框中输入一条消息,然后按<key>回车键</"
"key>来发送。"
+#: C/send-message.page:50(title)
+#, fuzzy
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "发送一条消息给某人"
+
+#: C/send-message.page:58(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字,然后选择 <gui>聊天</gui>"
+
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
msgstr "从您的计算机上发送一个文件至您的联系人。"
@@ -714,11 +781,11 @@ msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
msgid ""
"An error message which says “<gui>Network error</gui>” appears in the main "
"window."
-msgstr ""
+msgstr "一个显示“<gui>网络错误</gui>”的信息显示在主窗口中。"
#: C/prob-conn-neterror.page:33(title)
msgid "I get a message that says “Network error”"
-msgstr ""
+msgstr "我收到“网络错误”的信息"
#: C/prob-conn-neterror.page:36(cite)
msgid "shaunm"
@@ -735,18 +802,19 @@ msgid ""
"This kind of error happens when <app>Empathy</app> cannot communicate with "
"the instant messaging service for some reason."
msgstr ""
+"这种错误在 <app>Empathy</app> 由于某种原因而无法和即时通讯服务器连上时出现。"
#: C/prob-conn-neterror.page:45(p)
msgid ""
"Also, this kind of error happens when you try to use an IRC account without "
"setting a nickname."
-msgstr ""
+msgstr "此外,这种错误也在您试图不设置昵称而使用 IRC 账户时出现。"
#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
#: C/prob-conn-acctdisabled.page:43(p)
msgid ""
"Make sure that you are connected to the Internet, or to a local area network."
-msgstr ""
+msgstr "确保您已经连接到互联网,或者一个本地网络。"
#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
#: C/prob-conn-auth.page:57(p)
@@ -754,6 +822,8 @@ msgid ""
"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
"\">edit</media> icon in the error message."
msgstr ""
+"点击错误信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+"edit.png\">编辑</media>图标。"
#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
msgid ""
@@ -761,35 +831,37 @@ msgid ""
"You should be able to find these details from the website of the messaging "
"service."
msgstr ""
+"检查<gui>高级</gui>选项卡中是否所有细节都是正确的。您可以从即时通讯服务商的网"
+"站上找到这些信息。"
#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
msgid ""
"Deselect the <gui>Enabled</gui>, and then select it again to try to "
"reconnect to the service."
-msgstr ""
+msgstr "取消选择<gui>已启用</gui>,然后再次选中以重新连接到服务器。"
#: C/prob-conn-neterror.page:90(title)
msgid "Proxy support"
-msgstr ""
+msgstr "代理支持"
#: C/prob-conn-neterror.page:91(p)
msgid ""
"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
+msgstr "目前 <app>Empathy</app> 无法在代理下工作。"
#: C/prob-conn-name.page:9(title)
msgid "“Name in use”"
-msgstr ""
+msgstr "“用户名已经被占用”"
#: C/prob-conn-name.page:10(desc)
msgid ""
"An error message which says “<gui>Name in use</gui>” appears in the main "
"window."
-msgstr ""
+msgstr "一个显示“<gui>用户名已经被占用</gui>”的信息显示在主窗口中。"
#: C/prob-conn-name.page:32(title)
msgid "I get a message that says “Name in use”"
-msgstr ""
+msgstr "我收到“用户名已经被占用”的信息"
#: C/prob-conn-name.page:34(p)
msgid ""
@@ -797,10 +869,12 @@ msgid ""
"you are using a nickname that is already being used by someone else on that "
"particular network."
msgstr ""
+"这种错误出现在您尝试连接到 IRC 账户,然而您使用的昵称正在被该网络上其他人使用"
+"的情况下。"
#: C/prob-conn-name.page:50(p)
msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr ""
+msgstr "在<gui>昵称</gui>文本框中,输入一个新昵称。"
#: C/prob-conn-name.page:55(p)
msgid ""
@@ -808,22 +882,25 @@ msgid ""
"the password for that nickname. For more information, see <link xref=\"irc-"
"nick-password\"/>."
msgstr ""
+"如果您已经在所用的网路中注册了昵称,请为该昵称设置密码。更多信息参见 <link "
+"xref=\"irc-nick-password\"/>。"
#: C/prob-conn-name.page:64(p)
msgid ""
"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
"and then select it again to try to reconnect to the service."
msgstr ""
+"取消选择账户旁边的<gui>已启用</gui>选框,然后再次选中以重新连接到服务器。"
#: C/prob-conn-auth.page:8(desc)
msgid ""
"An error message which says “<gui>Authentication failed</gui>” appears in "
"the main window."
-msgstr ""
+msgstr "一个显示“<gui>验证失败</gui>”的信息显示在主窗口中。"
#: C/prob-conn-auth.page:36(title)
msgid "I get a message that says “Authentication failed”"
-msgstr ""
+msgstr "我收到“验证失败”的信息"
#: C/prob-conn-auth.page:38(p)
msgid ""
@@ -831,6 +908,8 @@ msgid ""
"allowing you to connect because it does not recognize your username or "
"password for some reason."
msgstr ""
+"这种错误是由于您的即时通信服务器不允许您连接,由于某种原因,它不识别您的用户"
+"名或者密码。"
#: C/prob-conn-auth.page:50(p)
msgid ""
@@ -838,21 +917,23 @@ msgid ""
"trying to connect to. If you do not have an account, most services will not "
"allow you to connect."
msgstr ""
+"确保您已经在要连接的服务上注册了账户。如果没有账户,多数服务都不会允许您连"
+"接。"
#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
msgid ""
"Type your username and password again to make sure that they are correct."
-msgstr ""
+msgstr "再次输入您的用户名和密码,以确保它们是正确的。"
#: C/prob-conn-acctdisabled.page:7(desc)
msgid ""
"The instant messaging account that you want to use is not enabled in the "
"list of accounts."
-msgstr ""
+msgstr "您要连接的即时通信账户没有在帐号列表中启用。"
#: C/prob-conn-acctdisabled.page:33(title)
msgid "My account is not enabled"
-msgstr ""
+msgstr "我的账户没有启用"
#: C/prob-conn-acctdisabled.page:35(p)
msgid ""
@@ -860,26 +941,31 @@ msgid ""
"drop-down account list when you try to start a new conversation or join a "
"room, your account details may not be correct."
msgstr ""
+"如果当您尝试开始一个新会话或者加入房间时,要使用的即时聊天账户没有在下拉的账"
+"户列表中启用,您的账户信息可能不正确。"
#: C/prob-conn-acctdisabled.page:48(p)
msgid ""
"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
"account that is not working."
msgstr ""
+"选择<guiseq><gui>编辑</gui><gui>账户</gui></guiseq>,再选择不工作的账户。"
#: C/prob-conn-acctdisabled.page:65(p)
msgid ""
"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
"If it is not, select the check-box to enable the account."
msgstr ""
+"检查<gui style=\"checkbox\">已启用</gui>选框是否勾选。没有的勾选它已启用账"
+"户。"
#: C/prev-conv.page:8(desc)
msgid "Browse or search your previous conversations."
-msgstr ""
+msgstr "浏览或搜索您之前的会话。"
#: C/prev-conv.page:35(title)
msgid "View previous conversations"
-msgstr ""
+msgstr "查看之前的会话"
#: C/prev-conv.page:39(p)
msgid ""
@@ -897,22 +983,25 @@ msgid ""
"your previous conversations</link> or <link xref=\"#browse\">browse previous "
"conversations</link> by contact and date."
msgstr ""
+"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
+"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
+"\">浏览之前的会话。"
#: C/prev-conv.page:54(p)
msgid ""
"You do not need to be connected to the Internet to view and search your "
"previous conversations."
-msgstr ""
+msgstr "您不需要连接到网络来查看和搜索您之前的会话。"
#: C/prev-conv.page:61(title)
msgid "Search previous conversations"
-msgstr ""
+msgstr "搜索之前的会话"
#: C/prev-conv.page:63(p)
msgid ""
"You can perform a full-text search through all of your previous "
"conversations."
-msgstr ""
+msgstr "您可以在之前的所有会话中进行全文搜索。"
#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
msgid ""
@@ -920,10 +1009,12 @@ msgid ""
"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
"<key>F3</key>."
msgstr ""
+"从<gui>联系人列表</gui>窗口,选择<guiseq><gui>查看</gui><gui>以前的会话</"
+"gui></guiseq>。或者可以按<key>F3</key>键。"
#: C/prev-conv.page:71(p)
msgid "Select the <gui>Search</gui> tab."
-msgstr ""
+msgstr "选择<gui>搜索</gui>标签。"
#: C/prev-conv.page:74(p)
msgid ""
@@ -936,6 +1027,7 @@ msgid ""
"Any conversations that matched your search terms will be shown in the list "
"below the search field. By default, conversations are ordered by date."
msgstr ""
+"任何符合搜索项的会话都会显示在搜索域下面的列表中。会话默认安装时间排序。"
#: C/prev-conv.page:82(p)
msgid ""
@@ -945,17 +1037,17 @@ msgstr ""
#: C/prev-conv.page:89(title)
msgid "Browse previous conversations"
-msgstr ""
+msgstr "浏览之前的会话"
#: C/prev-conv.page:91(p)
msgid ""
"You can browse your previous conversations with your contacts or in chat "
"rooms by date."
-msgstr ""
+msgstr "您可以按时间顺序浏览之前和联系人或在聊天室中的会话。"
#: C/prev-conv.page:100(p)
msgid "Select the <gui>Conversations</gui> tab."
-msgstr ""
+msgstr "选择<gui>会话</gui>标签。"
#: C/prev-conv.page:103(p)
msgid ""
@@ -991,47 +1083,140 @@ msgid ""
"Conversations</gui> window will open with that contact already selected."
msgstr ""
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr ""
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "合并和分割联系人"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr ""
+
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "合并联系人"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
+msgstr ""
+
+#: C/link-contacts.page:70(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr "从 <gui>已保存的自定义状态</gui> 框中,选择您想要删除的状态消息。"
+
+#: C/link-contacts.page:76(p)
+#, fuzzy
+#| msgid "Click on <gui style=\"button\">Remove</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "点击 <gui style=\"button\">删除</gui>。"
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+
+#: C/link-contacts.page:91(title)
+msgid "Separating contacts"
+msgstr "分割联系人"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+
+#: C/link-contacts.page:100(p)
+#, fuzzy
+#| msgid "Click on <gui style=\"button\">Remove</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "点击 <gui style=\"button\">删除</gui>。"
+
#: C/license.page:8(desc)
msgid "Legal information."
-msgstr ""
+msgstr "法律信息。"
#: C/license.page:11(title)
msgid "License"
-msgstr ""
+msgstr "许可"
#: C/license.page:12(p)
msgid ""
"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
"Unported license."
msgstr ""
+"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
#: C/license.page:20(p)
msgid "You are free:"
-msgstr ""
+msgstr "您可以自由:"
#: C/license.page:25(em)
msgid "To share"
-msgstr ""
+msgstr "分享"
#: C/license.page:26(p)
msgid "To copy, distribute and transmit the work."
-msgstr ""
+msgstr "复制、分发或者传播作品。"
#: C/license.page:29(em)
msgid "To remix"
-msgstr ""
+msgstr "再创作"
#: C/license.page:30(p)
msgid "To adapt the work."
-msgstr ""
+msgstr "修改作品。"
#: C/license.page:33(p)
msgid "Under the following conditions:"
-msgstr ""
+msgstr "需遵守一下条件:"
#: C/license.page:38(em)
msgid "Attribution"
-msgstr ""
+msgstr "署名"
#: C/license.page:39(p)
msgid ""
@@ -1039,16 +1224,20 @@ msgid ""
"licensor (but not in any way that suggests that they endorse you or your use "
"of the work)."
msgstr ""
+"您必须按照作者或许可人指定的方式对作品署名(但不能以任何方式暗示他们认可您或者"
+"您对作品的使用)。"
#: C/license.page:46(em)
msgid "Share Alike"
-msgstr ""
+msgstr "相同方式共享"
#: C/license.page:47(p)
msgid ""
"If you alter, transform, or build upon this work, you may distribute the "
"resulting work only under the same, similar or a compatible license."
msgstr ""
+"如果您改变、转换本作品或者以本作品为基础进行再创作,您应以相同、相似或者兼容"
+"的协议发布修改后的作品。"
#: C/license.page:53(p)
msgid ""
@@ -1057,14 +1246,19 @@ msgid ""
"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
"sa/3.0/\">Commons Deed</link>."
msgstr ""
+"许可的全文参见 <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"legalcode\">CreativeCommons 网站</link>,或者阅读完整的<link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/\">通俗协议</link>。"
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
-msgstr ""
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a conversation with an IRC contact."
+msgstr "向您的联系人发起视频会话。"
#: C/irc-start-conversation.page:30(title)
msgid "Chat with somebody on IRC"
-msgstr ""
+msgstr "与 IRC 中某人聊天"
#: C/irc-start-conversation.page:32(p)
msgid ""
@@ -1095,23 +1289,23 @@ msgstr ""
#: C/irc-send-file.page:9(desc)
msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr ""
+msgstr "<app>Empathy</app> 目前不支持 IRC 传文件。"
#: C/irc-send-file.page:31(title)
msgid "Send files over IRC"
-msgstr ""
+msgstr "通过 IRC 传送文件"
#: C/irc-send-file.page:33(p)
msgid "It is not currently possible to send files using IRC."
-msgstr ""
+msgstr "目前无法用 IRC 传送文件。"
#: C/irc-nick-password.page:10(desc)
msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr ""
+msgstr "保护您的昵称,以防其他 IRC 用户使用。"
#: C/irc-nick-password.page:33(title)
msgid "Use a nickname password on IRC"
-msgstr ""
+msgstr "在 IRC 中使用昵称和密码"
#: C/irc-nick-password.page:35(p)
msgid ""
@@ -1132,7 +1326,7 @@ msgstr ""
#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
-msgstr ""
+msgstr "设置一个 IRC 密码:"
#: C/irc-nick-password.page:54(p)
msgid "Select the IRC account from the list on the left of the dialog."
@@ -1146,7 +1340,7 @@ msgstr ""
#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr ""
+msgstr "点击<gui style=\"button\">应用</gui>。"
#: C/irc-nick-password.page:69(p)
msgid ""
@@ -1157,11 +1351,11 @@ msgstr ""
#: C/irc-manage.page:9(desc)
msgid "How to use IRC with <app>Empathy</app>."
-msgstr ""
+msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
#: C/irc-manage.page:34(title)
msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "互联网中继聊天(IRC)"
#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
msgid ""
@@ -1171,27 +1365,27 @@ msgstr ""
#: C/irc-manage.page:43(title)
msgid "IRC Chat Rooms and Conversations"
-msgstr ""
+msgstr "IRC 聊天室和会话"
#: C/irc-manage.page:45(title)
msgid "Chat Rooms and Conversations"
-msgstr ""
+msgstr "聊天室和会话"
#: C/irc-manage.page:50(title)
msgid "Common IRC Problems"
-msgstr ""
+msgstr "常见 IRC 问题"
-#: C/irc-manage.page:52(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:55(title)
msgid "Common Problems"
-msgstr ""
+msgstr "常见问题"
#: C/irc-join-room.page:8(desc)
msgid "Join an IRC channel."
-msgstr ""
+msgstr "加入一个 IRC 频道。"
#: C/irc-join-room.page:31(title)
msgid "Join an IRC chat room"
-msgstr ""
+msgstr "加入一个 IRC 聊天室"
#: C/irc-join-room.page:33(p)
msgid ""
@@ -1221,20 +1415,20 @@ msgstr ""
#: C/irc-join-room.page:57(p)
msgid "Click <gui>Join</gui> to enter the room."
-msgstr ""
+msgstr "点击<gui>加入</gui>来进入房间。"
#: C/irc-join-room.page:64(p)
msgid ""
"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
+msgstr "要加入多个房间,您需要对每个房间重复上面的步骤。"
#: C/irc-join-pwd.page:9(desc)
msgid "Enter password-protected IRC chat rooms."
-msgstr ""
+msgstr "进入有密码保护的 IRC 聊天室。"
#: C/irc-join-pwd.page:25(title)
msgid "Join a protected IRC chat room"
-msgstr ""
+msgstr "加入一个受保护的 IRC 聊天室"
#: C/irc-join-pwd.page:27(p)
msgid ""
@@ -1244,7 +1438,7 @@ msgstr ""
#: C/irc-join-pwd.page:33(p)
msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr ""
+msgstr "如往常一样<link xref=\"irc-join-room\">加入房间</link>。"
#: C/irc-join-pwd.page:38(p)
msgid ""
@@ -1254,11 +1448,11 @@ msgstr ""
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
-msgstr ""
+msgstr "支持的 IRC 命令。"
#: C/irc-commands.page:18(title)
msgid "Supported IRC commands"
-msgstr ""
+msgstr "支持的 IRC 命令"
#: C/irc-commands.page:19(p)
msgid ""
@@ -1268,23 +1462,25 @@ msgstr ""
#: C/irc-commands.page:24(p)
msgid "All commands available have a small description on their usage."
-msgstr ""
+msgstr "所有可用命令都有一个简单的用法描述。"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/introduction.page:41(None)
msgid ""
"@@image: 'figures/empathy-main-window.png'; "
-"md5=489ba00b0fc377aba4c691210b6e0650"
+"md5=54908dcb2588beddb15ef0968d2c2582"
msgstr ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
#: C/introduction.page:9(desc)
msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr ""
+msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
#: C/introduction.page:21(title)
msgid "Introduction"
-msgstr ""
+msgstr "介绍"
#: C/introduction.page:23(p)
msgid ""
@@ -1310,68 +1506,71 @@ msgstr ""
#: C/introduction.page:39(title)
msgid "<gui>Contact List</gui> window"
-msgstr ""
+msgstr "<gui>联系人列表</gui>窗口"
#: C/introduction.page:40(desc)
msgid "<app>Empathy</app> main window"
-msgstr ""
+msgstr "<app>Empathy</app> 主窗口"
#: C/introduction.page:42(p)
msgid "<app>Empathy</app> main window."
-msgstr ""
+msgstr "<app>Empathy</app> 主窗口。"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:27(None)
+#: C/index.page:28(None)
msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
msgstr ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Instant Messenger"
-msgstr ""
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络聊天工具"
-#: C/index.page:26(title)
+#: C/index.page:27(title)
msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy 网络聊天工具标识</media> Empathy 网络聊天工具"
-#: C/index.page:32(title)
+#: C/index.page:35(title)
msgid "Account Management"
-msgstr ""
+msgstr "账户管理"
-#: C/index.page:36(title)
+#: C/index.page:39(title)
msgid "Contact Management"
-msgstr ""
+msgstr "联系人管理"
-#: C/index.page:40(title)
+#: C/index.page:43(title)
msgid "Text Conversations"
-msgstr ""
+msgstr "文字聊天"
-#: C/index.page:44(title)
+#: C/index.page:47(title)
msgid "Audio and Video Conversations"
-msgstr ""
+msgstr "音频和视频聊天"
-#: C/index.page:48(title)
+#: C/index.page:51(title)
msgid "Advanced Actions"
msgstr ""
#: C/import-account.page:10(desc)
msgid "Import an account from another instant messaging application."
-msgstr ""
+msgstr "从其他即时聊天程序中导入账户。"
#: C/import-account.page:19(name)
msgid "Peter Haslam"
-msgstr ""
+msgstr "Peter Haslam"
#: C/import-account.page:20(email)
msgid "peter.haslam@freenet.de"
-msgstr ""
+msgstr "peter.haslam@freenet.de"
#: C/import-account.page:42(title)
msgid "Import an existing account"
-msgstr ""
+msgstr "导入已存在的账户"
#: C/import-account.page:44(p)
msgid ""
@@ -1408,7 +1607,7 @@ msgstr ""
#: C/hide-contacts.page:19(title)
msgid "Hide offline contacts"
-msgstr ""
+msgstr "隐藏离线的联系人"
#: C/hide-contacts.page:21(p)
msgid ""
@@ -1418,7 +1617,7 @@ msgstr ""
#: C/hide-contacts.page:25(p)
msgid "To hide the contacts that are offline:"
-msgstr ""
+msgstr "要隐藏离线的联系人:"
#: C/hide-contacts.page:31(p)
msgid ""
@@ -1429,7 +1628,7 @@ msgstr ""
#: C/hide-contacts.page:36(p)
msgid "To show the offline contacts again, repeat the same procedure above."
-msgstr ""
+msgstr "要再次显示离线的联系人,重复上面的步骤。"
#: C/group-conversations.page:8(desc)
msgid "Start or join a group conversation with your contacts."
@@ -1519,11 +1718,11 @@ msgstr ""
#: C/group-conversations.page:128(p)
msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
-msgstr ""
+msgstr "展开<gui>房间列表</gui>部分来查看所有存在的房间。"
#: C/group-conversations.page:133(p)
msgid "Double-click on the name of a room to join it."
-msgstr ""
+msgstr "双击房间的名称来加入它。"
#: C/group-conversations.page:139(p)
msgid ""
@@ -1534,29 +1733,29 @@ msgstr ""
#: C/geolocation-what-is.page:9(desc)
msgid "Understanding geolocation."
-msgstr ""
+msgstr "了解地理位置。"
#: C/geolocation-what-is.page:33(title)
msgid "What is geolocation"
-msgstr ""
+msgstr "什么是地理位置"
#: C/geolocation-what-is.page:35(p)
msgid ""
"Geolocation allows you to identify the real geographical location of a "
"computer or a device connected to the Internet."
-msgstr ""
+msgstr "地理位置允许您确定连接到网络的一台电脑或设备在地理上的真实位置。"
#: C/geolocation-what-is.page:37(p)
msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr ""
+msgstr "通过 <app>Empathy</app> 中的地理位置,您可以:"
#: C/geolocation-what-is.page:42(p)
msgid "Publish your geographical location to your contacts."
-msgstr ""
+msgstr "公布您的地理位置给联系人。"
#: C/geolocation-what-is.page:47(p)
msgid "See your contacts’ geographical location and quickly contact them."
-msgstr ""
+msgstr "查看联系人的地址位置并快速联系他们。"
#: C/geolocation-what-is.page:52(p)
msgid ""
@@ -1572,19 +1771,19 @@ msgstr ""
#: C/geolocation-turn.page:9(desc)
msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr ""
+msgstr "在 <app>Empathy</app> 中如何激活和禁用地理位置。"
#: C/geolocation-turn.page:33(title)
msgid "Activate/Deactivate geolocation"
-msgstr ""
+msgstr "激活/禁用地理位置"
#: C/geolocation-turn.page:37(p)
msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr ""
+msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
#: C/geolocation-turn.page:42(p)
msgid "Select the <gui>Location</gui> tab."
-msgstr ""
+msgstr "选择<gui>位置</gui>标签。"
#: C/geolocation-turn.page:47(p)
msgid ""
@@ -1604,7 +1803,7 @@ msgstr ""
#: C/geolocation-turn.page:61(p)
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
@@ -1614,7 +1813,7 @@ msgstr ""
#: C/geolocation-supported.page:31(title)
msgid "Supported services"
-msgstr ""
+msgstr "支持的设备"
#: C/geolocation-supported.page:33(p)
msgid ""
@@ -1647,7 +1846,7 @@ msgstr ""
#: C/geolocation-privacy.page:32(title)
msgid "Geolocation Privacy"
-msgstr ""
+msgstr "地理位置隐私"
#: C/geolocation-privacy.page:35(title)
msgid "What information is sent"
@@ -1690,7 +1889,7 @@ msgstr ""
#: C/geolocation-privacy.page:63(title)
msgid "What is the privacy mode"
-msgstr ""
+msgstr "什么是隐私模式"
#: C/geolocation-privacy.page:64(p)
msgid ""
@@ -1713,7 +1912,7 @@ msgstr ""
#: C/geolocation-privacy.page:82(p)
msgid "Privacy mode is enabled by default."
-msgstr ""
+msgstr "隐私模式默认被激活"
#: C/geolocation-privacy.page:87(p)
msgid ""
@@ -1722,7 +1921,7 @@ msgstr ""
#: C/geolocation-privacy.page:92(p)
msgid "Only your contacts can see your position."
-msgstr ""
+msgstr "只有您的联系人可以看到您的位置。"
#: C/geolocation-not-showing.page:8(desc)
msgid "<app>Empathy</app> does not publish my geographical position."
@@ -1761,7 +1960,7 @@ msgstr ""
#: C/geolocation.page:8(desc)
msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr ""
+msgstr "使用和了解 <app>Empathy</app> 中的地理位置。"
#: C/geolocation.page:32(title)
msgid "Geographical position"
@@ -1773,7 +1972,7 @@ msgstr ""
#: C/geolocation.page:39(title)
msgid "Fix common problems"
-msgstr ""
+msgstr "修复常见问题"
#: C/favorite-rooms.page:10(desc)
msgid "Set, join and manage favorite rooms."
@@ -1789,7 +1988,7 @@ msgstr ""
#: C/favorite-rooms.page:35(p)
msgid "Join a room."
-msgstr ""
+msgstr "加入一个房间。"
#: C/favorite-rooms.page:40(p)
msgid ""
@@ -1815,7 +2014,7 @@ msgstr ""
#: C/favorite-rooms.page:71(p)
msgid "Press <key>F5</key>."
-msgstr ""
+msgstr "按 <key>F5</key> 键。"
#: C/favorite-rooms.page:76(p)
msgid ""
@@ -1869,7 +2068,7 @@ msgstr ""
#: C/favorite-rooms.page:134(p)
msgid "When done, click <gui>Close</gui>."
-msgstr ""
+msgstr "完成后点<gui>关闭</gui>。"
#: C/disable-account.page:9(desc)
msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
@@ -1877,7 +2076,7 @@ msgstr ""
#: C/disable-account.page:39(title)
msgid "Disable an account"
-msgstr ""
+msgstr "禁用一个账户"
#: C/disable-account.page:41(p)
msgid ""
@@ -1909,11 +2108,11 @@ msgstr ""
msgid "Register for an account with one of the supported messaging services."
msgstr ""
-#: C/create-account.page:33(title)
+#: C/create-account.page:34(title)
msgid "Register for a new account"
-msgstr ""
+msgstr "注册一个新账户"
-#: C/create-account.page:35(p)
+#: C/create-account.page:36(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
@@ -1922,7 +2121,7 @@ msgid ""
"<link xref=\"add-account\">add an account</link>."
msgstr ""
-#: C/create-account.page:41(p)
+#: C/create-account.page:42(p)
msgid ""
"This page provides information on creating a new account for various types "
"of accounts. Your account provider should give you a login ID and a "
@@ -1930,53 +2129,53 @@ msgid ""
"<app>Empathy</app>."
msgstr ""
-#: C/create-account.page:46(title)
+#: C/create-account.page:47(title)
msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
-#: C/create-account.page:47(p)
+#: C/create-account.page:48(p)
msgid ""
"Facebook is one of the most-used social networks. It allows users to create "
"their own profile and to communicate with their friends."
msgstr ""
-#: C/create-account.page:51(p)
+#: C/create-account.page:52(p)
msgid ""
"To use Facebook to communicate with your friends, you will need to create a "
"new account from the website: <link href=\"http://www.facebook.com\">www."
"facebook.com</link>."
msgstr ""
-#: C/create-account.page:59(title) C/audio-video.page:170(p)
+#: C/create-account.page:60(title) C/audio-video.page:170(p)
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
-#: C/create-account.page:61(p)
+#: C/create-account.page:62(p)
msgid ""
"Jabber is an open instant messaging system. Like email, Jabber allows you to "
"choose your account provider and communicate with all other Jabber users, "
"regardless of their account provider."
msgstr ""
-#: C/create-account.page:65(p)
+#: C/create-account.page:66(p)
msgid ""
"You will need to create a new account with a Jabber provider. There are many "
"free providers; one popular provider is <link href=\"http://register.jabber."
"org/\">Jabber.org</link>."
msgstr ""
-#: C/create-account.page:70(p)
+#: C/create-account.page:71(p)
msgid ""
"If you use Google Mail or Google Talk, you already have a Jabber account. "
"Google Talk is a Jabber service. Simply use your Google Mail address and "
"password in <app>Empathy</app> to connect."
msgstr ""
-#: C/create-account.page:77(title) C/audio-video.page:190(p)
+#: C/create-account.page:78(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr ""
-#: C/create-account.page:79(p)
+#: C/create-account.page:80(p)
msgid ""
"You do not need to create an account with a service provider to use this "
"feature. This service works whenever you are connected to a local network, "
@@ -1984,15 +2183,15 @@ msgid ""
"network who are also using this service."
msgstr ""
-#: C/create-account.page:84(p)
+#: C/create-account.page:85(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr ""
-#: C/create-account.page:88(title) C/audio-video.page:205(p)
+#: C/create-account.page:89(title) C/audio-video.page:205(p)
msgid "SIP"
-msgstr ""
+msgstr "SIP"
-#: C/create-account.page:90(p)
+#: C/create-account.page:91(p)
msgid ""
"SIP is an open system which allows users to have audio and video "
"conversations over the Internet. You need to create an account with a SIP "
@@ -2000,31 +2199,24 @@ msgid ""
"SIP provider they use."
msgstr ""
-#: C/create-account.page:95(p)
-msgid ""
-"There are a number of popular free SIP account providers; one popular "
-"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
-"class=NewUser;proc=start\">Sipphone</link>."
-msgstr ""
-
-#: C/create-account.page:100(p)
+#: C/create-account.page:97(p)
msgid ""
"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
"index.php?page=register\">Ekiga.net</link> service does not currently work "
"with <app>Empathy</app>."
msgstr ""
-#: C/create-account.page:105(p)
+#: C/create-account.page:102(p)
msgid ""
"Some SIP providers allow you to call normal phones from your computer. "
"Generally, you will need to subscribe to a paid service for this feature."
msgstr ""
-#: C/create-account.page:110(title) C/audio-video.page:165(p)
+#: C/create-account.page:107(title) C/audio-video.page:165(p)
msgid "IRC"
-msgstr ""
+msgstr "IRC"
-#: C/create-account.page:112(p)
+#: C/create-account.page:109(p)
msgid ""
"You do not need to register for an account to use IRC. Although you specify "
"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
@@ -2032,23 +2224,23 @@ msgid ""
"nickname, you will need to choose a new nickname."
msgstr ""
-#: C/create-account.page:117(p)
+#: C/create-account.page:114(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
msgstr ""
-#: C/create-account.page:120(p)
+#: C/create-account.page:117(p)
msgid ""
"Some IRC servers are password protected. You will need to know the password "
"to connect to these servers. Generally, these are private IRC networks."
msgstr ""
-#: C/create-account.page:125(title)
+#: C/create-account.page:122(title)
msgid "Proprietary Services"
msgstr ""
-#: C/create-account.page:127(p)
+#: C/create-account.page:124(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2057,21 +2249,21 @@ msgid ""
"web site and agree to its terms of use."
msgstr ""
-#: C/create-account.page:136(link) C/audio-video.page:135(p)
+#: C/create-account.page:133(link) C/audio-video.page:135(p)
msgid "AIM"
-msgstr ""
+msgstr "AIM"
-#: C/create-account.page:141(link) C/audio-video.page:160(p)
+#: C/create-account.page:138(link) C/audio-video.page:160(p)
msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
-#: C/create-account.page:146(link) C/audio-video.page:175(p)
+#: C/create-account.page:143(link) C/audio-video.page:175(p)
msgid "MSN"
-msgstr ""
+msgstr "MSN"
-#: C/create-account.page:151(link) C/audio-video.page:210(p)
+#: C/create-account.page:148(link) C/audio-video.page:210(p)
msgid "Yahoo!"
-msgstr ""
+msgstr "Yahoo!"
#: C/change-status.page:9(desc)
msgid "Change your status to advertise your availability to your contacts."
@@ -2079,7 +2271,7 @@ msgstr ""
#: C/change-status.page:34(title)
msgid "Change your status"
-msgstr ""
+msgstr "改变您的状态"
#: C/change-status.page:36(p)
msgid ""
@@ -2112,11 +2304,13 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None) C/audio-call.page:47(None)
+#: C/audio-video.page:58(None)
msgid ""
"@@image: 'figures/audio-input-microphone.png'; "
"md5=8d89026b66a263a3bc5b1f0665948567"
msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
#: C/audio-video.page:8(desc)
msgid ""
@@ -2125,7 +2319,7 @@ msgstr ""
#: C/audio-video.page:32(title)
msgid "Audio and video support"
-msgstr ""
+msgstr "音频和视频支持"
#: C/audio-video.page:34(p)
msgid ""
@@ -2137,15 +2331,15 @@ msgstr ""
#: C/audio-video.page:43(p)
msgid "Icon"
-msgstr ""
+msgstr "图标"
#: C/audio-video.page:48(p)
msgid "Description"
-msgstr ""
+msgstr "描述"
#: C/audio-video.page:58(media)
msgid "Icon for audio conversation"
-msgstr ""
+msgstr "音频聊天的图标"
#: C/audio-video.page:64(p)
msgid "The contact is able to have an audio conversation."
@@ -2153,7 +2347,7 @@ msgstr ""
#: C/audio-video.page:70(media)
msgid "Icon for video conversation"
-msgstr ""
+msgstr "视频聊天的图标"
#: C/audio-video.page:76(p)
msgid "The contact is able to have a video conversation."
@@ -2173,7 +2367,7 @@ msgstr ""
#: C/audio-video.page:95(title)
msgid "Supported Account Types"
-msgstr ""
+msgstr "支持的账户类型"
#: C/audio-video.page:97(p)
msgid ""
@@ -2208,15 +2402,15 @@ msgstr ""
#: C/audio-video.page:128(p)
msgid "Service"
-msgstr ""
+msgstr "服务"
#: C/audio-video.page:129(p)
msgid "Audio"
-msgstr ""
+msgstr "音频"
#: C/audio-video.page:130(p)
msgid "Video"
-msgstr ""
+msgstr "视频"
#: C/audio-video.page:136(p) C/audio-video.page:137(p)
#: C/audio-video.page:141(p) C/audio-video.page:142(p)
@@ -2236,15 +2430,15 @@ msgstr ""
#: C/audio-video.page:140(p)
msgid "Facebook Chat"
-msgstr ""
+msgstr "Facebook 聊天"
#: C/audio-video.page:145(p)
msgid "gadugadu"
-msgstr ""
+msgstr "gadugadu"
#: C/audio-video.page:150(p)
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: C/audio-video.page:151(p) C/audio-video.page:152(p)
#: C/audio-video.page:171(p) C/audio-video.page:172(p)
@@ -2255,71 +2449,106 @@ msgstr ""
#: C/audio-video.page:155(p)
msgid "Groupwise"
-msgstr ""
+msgstr "Groupwise"
#: C/audio-video.page:180(p)
msgid "myspace"
-msgstr ""
+msgstr "myspace"
#: C/audio-video.page:185(p)
msgid "qq"
-msgstr ""
+msgstr "qq"
#: C/audio-video.page:195(p)
msgid "sametime"
-msgstr ""
+msgstr "sametime"
#: C/audio-video.page:200(p)
msgid "silc"
-msgstr ""
+msgstr "silc"
#: C/audio-video.page:215(p)
msgid "zephyr"
-msgstr ""
+msgstr "zephyr"
#: C/audio-call.page:9(desc)
msgid "Call your contacts over the Internet."
msgstr ""
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
msgid "Start an audio conversation"
-msgstr ""
+msgstr "开始音频聊天"
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(p)
msgid ""
"You can call your contacts and have an audio conversation with them. This "
"features only works with certain types of accounts, and it requires the "
"other person to have an application that supports audio calls."
msgstr ""
-#: C/audio-call.page:46(p)
+#: C/audio-call.page:34(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
msgid ""
"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-"media> icon next to the name of the contact you wish to call and choose <gui "
-"style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact "
-"and choose <gui style=\"menuitem\">Audio Call</gui>."
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
msgstr ""
+"在<gui>联系人列表</gui>窗口,点击您想呼叫的联系人的名字旁的<media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
+"图标并选择<gui style=\"menuitem\">视频呼叫</gui>。同样,也可以右击联系人并选"
+"择<gui style=\"menuitem\">视频呼叫</gui>。"
-#: C/audio-call.page:63(p)
+#: C/audio-call.page:55(p)
+#, fuzzy
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to select it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
msgstr ""
+"要将视频会话转为音频会话,则选择<guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">关闭视频</gui></guiseq>,或者点击工具栏上的<media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
+"按钮以取消选择。"
+
+#: C/audio-call.page:63(title)
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "向您的联系人发起视频会话。"
+
+#: C/audio-call.page:71(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字,然后选择 <gui>聊天</gui>"
#: C/add-contact.page:9(desc)
msgid "Add someone to the contact list."
-msgstr ""
+msgstr "添加某人到联系人列表。"
#: C/add-contact.page:33(title)
msgid "Add someone to your list of contacts"
-msgstr ""
+msgstr "添加某人到您的联系人列表"
#: C/add-contact.page:37(p)
msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr ""
+msgstr "选择<guiseq><gui>聊天</gui><gui>添加联系人</gui></guiseq>。"
#: C/add-contact.page:40(p)
msgid ""
@@ -2352,11 +2581,11 @@ msgstr ""
#: C/add-account.page:9(desc)
msgid "Add a new account to <app>Empathy</app>."
-msgstr ""
+msgstr "向 <app>Empathy</app> 添加新账户。"
#: C/add-account.page:39(title)
msgid "Add a new account"
-msgstr ""
+msgstr "添加一个新账户"
#: C/add-account.page:41(p)
msgid ""
@@ -2368,7 +2597,7 @@ msgstr ""
#: C/add-account.page:52(p)
msgid "Click <gui style=\"button\">Add</gui>."
-msgstr ""
+msgstr "点击<gui style=\"button\">添加</gui>。"
#: C/add-account.page:57(p)
msgid ""
@@ -2405,21 +2634,21 @@ msgstr ""
#: C/accounts-window.page:11(desc)
msgid "Add, modify, and delete accounts."
-msgstr ""
+msgstr "添加、修改和删除账户。"
#: C/accounts-window.page:33(title)
msgid "Accounts Window"
-msgstr ""
+msgstr "账户窗口"
#: C/accounts-window.page:35(p)
msgid ""
"The <gui>Accounts</gui> window allows you to add, modify, and delete "
"accounts."
-msgstr ""
+msgstr "<gui>账户</gui>窗口允许您添加、修改和删除账户。"
#: C/accounts-window.page:43(title)
msgid "Account Details"
-msgstr ""
+msgstr "账户详细信息"
#: C/accounts-window.page:44(p)
msgid ""
@@ -2434,7 +2663,7 @@ msgstr ""
#: C/account-jabber.page:29(title)
msgid "Jabber account details"
-msgstr ""
+msgstr "Jabber 账户信息"
#: C/account-jabber.page:31(p)
msgid ""
@@ -2453,11 +2682,11 @@ msgstr ""
#: C/account-jabber.page:45(gui)
msgid "Encryption required (TLS/SSL)"
-msgstr ""
+msgstr "需要加密(TLS/SSL)"
#: C/account-jabber.page:46(gui)
msgid "Ignore SSL certificate errors"
-msgstr ""
+msgstr "忽略 SSL 证书错误"
#: C/account-jabber.page:47(p)
msgid ""
@@ -2478,11 +2707,11 @@ msgstr ""
#: C/account-jabber.page:59(gui)
msgid "Resource"
-msgstr ""
+msgstr "资源"
#: C/account-jabber.page:60(gui)
msgid "Priority"
-msgstr ""
+msgstr "优先级"
#: C/account-jabber.page:61(p)
msgid ""
@@ -2515,13 +2744,14 @@ msgstr ""
#. It doesn't matter what you translate it to: it's not used at all.
#: C/account-irc.page:106(None)
msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr ""
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/account-irc.page:112(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr ""
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
@@ -2529,7 +2759,7 @@ msgstr ""
#: C/account-irc.page:31(title)
msgid "IRC account details"
-msgstr ""
+msgstr "IRC 账户信息"
#: C/account-irc.page:33(p)
msgid ""
@@ -2541,7 +2771,7 @@ msgstr ""
#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
msgid "Network"
-msgstr ""
+msgstr "网络"
#: C/account-irc.page:46(p)
msgid ""
@@ -2553,7 +2783,7 @@ msgstr ""
#: C/account-irc.page:53(gui)
msgid "Nickname"
-msgstr ""
+msgstr "昵称"
#: C/account-irc.page:54(p)
msgid ""
@@ -2565,7 +2795,7 @@ msgstr ""
#: C/account-irc.page:60(gui)
msgid "Password"
-msgstr ""
+msgstr "密码"
#: C/account-irc.page:61(p)
msgid ""
@@ -2576,7 +2806,7 @@ msgstr ""
#: C/account-irc.page:65(title)
msgid "NickServ Passwords"
-msgstr ""
+msgstr "NickServ 密码"
#: C/account-irc.page:66(p)
msgid ""
@@ -2611,11 +2841,11 @@ msgstr ""
#: C/account-irc.page:94(title)
msgid "IRC Networks"
-msgstr ""
+msgstr "IRC 网络"
#: C/account-irc.page:97(title)
msgid "Networks"
-msgstr ""
+msgstr "网络"
#: C/account-irc.page:99(p)
msgid ""
@@ -2657,7 +2887,7 @@ msgstr ""
#: C/account-irc.page:125(gui)
msgid "Charset"
-msgstr ""
+msgstr "字符集"
#: C/account-irc.page:126(p)
msgid ""
@@ -2679,7 +2909,7 @@ msgstr ""
#: C/account-irc.page:141(gui)
msgid "Servers"
-msgstr ""
+msgstr "服务器"
#: C/account-irc.page:142(p)
msgid ""
@@ -2708,4 +2938,4 @@ msgstr ""
msgid "translator-credits"
msgstr ""
"Lavande <lavande@thislove.cz.cc>, 2010\n"
-"Tao Wang <dancefire@gmail.com>, 2010"
+"Tao Wang <dancefire@gmail.com>, 2010lainme <lainme993@gmail.com>, 2011"
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index fd895d508..33dcbfb93 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -44,6 +44,7 @@ libempathy_gtk_handwritten_source = \
empathy-chat.c \
empathy-contact-blocking-dialog.c \
empathy-contact-dialogs.c \
+ empathy-contact-chooser.c \
empathy-contact-list-store.c \
empathy-contact-list-view.c \
empathy-contact-menu.c \
@@ -109,6 +110,7 @@ libempathy_gtk_headers = \
empathy-chat.h \
empathy-contact-blocking-dialog.h \
empathy-contact-dialogs.h \
+ empathy-contact-chooser.h \
empathy-contact-list-store.h \
empathy-contact-list-view.h \
empathy-contact-menu.h \
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 5bdea6aff..26b30f6e9 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -190,8 +190,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
* http://www.hypothetic.org/docs/msn/general/names.php */
#define MSN_USER_NAME EMAIL_LOCALPART
/* Based on the official help:
- * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html */
-#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})"
+ * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html
+ * Looks like an email address can be used as well (bgo #655959)
+ * */
+#define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})|("EMAIL_LOCALPART"@"HOST")"
#define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$"
#define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$"
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 2991784f1..eb01fe25b 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -23,6 +23,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <pulse/pulseaudio.h>
#include <telepathy-glib/telepathy-glib.h>
@@ -30,6 +31,7 @@
#include "empathy-call-utils.h"
+#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-request-util.h>
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -192,3 +194,32 @@ empathy_call_new_with_streams (const gchar *contact,
g_hash_table_unref (streamed_media_request);
g_object_unref (call_req);
}
+
+void
+empathy_call_set_stream_properties (GstElement *element)
+{
+ GstStructure *props;
+ GSettings *gsettings_call;
+ gboolean echo_cancellation;
+
+ gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
+
+ echo_cancellation = g_settings_get_boolean (gsettings_call,
+ EMPATHY_PREFS_CALL_ECHO_CANCELLATION);
+
+ props = gst_structure_new ("props",
+ PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone",
+ NULL);
+
+ if (echo_cancellation)
+ {
+ gst_structure_set (props,
+ "filter.want", G_TYPE_STRING, "echo-cancel",
+ NULL);
+ }
+
+ g_object_set (element, "stream-properties", props, NULL);
+ gst_structure_free (props);
+
+ g_object_unref (gsettings_call);
+}
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 99a97f202..87676161c 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,6 +21,8 @@
#ifndef __EMPATHY_CALL_UTILS_H__
#define __EMPATHY_CALL_UTILS_H__
+#include <gst/gst.h>
+
G_BEGIN_DECLS
/* Calls */
@@ -38,6 +40,8 @@ GHashTable * empathy_call_create_streamed_media_request (const gchar *contact,
gboolean initial_audio,
gboolean initial_video);
+void empathy_call_set_stream_properties (GstElement *element);
+
G_END_DECLS
#endif /* __EMPATHY_CALL_UTILS_H__ */
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index 18d12963e..248999427 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -453,7 +453,7 @@ chat_text_maybe_append_date_and_time (EmpathyChatTextView *view,
/* Get the date of the message we are appending */
date = g_date_time_new_from_unix_utc (timestamp);
- delta = g_date_time_difference (last_date, date);
+ delta = g_date_time_difference (date, last_date);
/* If last message was from another day we append date and time */
if (delta >= G_TIME_SPAN_DAY) {
append_date = TRUE;
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 239be0b1f..032dd2464 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -149,6 +149,11 @@ struct _EmpathyChatPriv {
* messages in tab will be properly shown */
gboolean retrieving_backlogs;
gboolean sms_channel;
+
+ /* we need to know whether populate-popup happened in response to
+ * the keyboard or the mouse. We can't ask GTK for the most recent
+ * event, because it will be a notify event. Instead we track it here */
+ GdkEventType most_recent_event_type;
};
typedef struct {
@@ -1702,6 +1707,8 @@ chat_input_key_press_event_cb (GtkWidget *widget,
priv = GET_PRIV (chat);
+ priv->most_recent_event_type = event->type;
+
/* Catch ctrl+up/down so we can traverse messages we sent */
if ((event->state & GDK_CONTROL_MASK) &&
(event->keyval == GDK_KEY_Up ||
@@ -2157,11 +2164,24 @@ chat_text_send_cb (GtkMenuItem *menuitem,
chat_input_text_view_send (chat);
}
+static gboolean
+chat_input_button_press_event_cb (GtkTextView *view,
+ GdkEventButton *event,
+ EmpathyChat *chat)
+{
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+
+ priv->most_recent_event_type = event->type;
+
+ return FALSE;
+}
+
static void
chat_input_populate_popup_cb (GtkTextView *view,
GtkMenu *menu,
EmpathyChat *chat)
{
+ EmpathyChatPriv *priv = GET_PRIV (chat);
GtkTextBuffer *buffer;
GtkTextTagTable *table;
GtkTextTag *tag;
@@ -2212,12 +2232,31 @@ chat_input_populate_popup_cb (GtkTextView *view,
/* Add the spell check menu item. */
table = gtk_text_buffer_get_tag_table (buffer);
tag = gtk_text_tag_table_lookup (table, "misspelled");
- gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
- gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
- GTK_TEXT_WINDOW_WIDGET,
- x, y,
- &x, &y);
- gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (view), &iter, x, y);
+
+ switch (priv->most_recent_event_type) {
+ case GDK_BUTTON_PRESS:
+ /* get the location from the pointer */
+ gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+ gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
+ GTK_TEXT_WINDOW_WIDGET,
+ x, y,
+ &x, &y);
+ gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (view),
+ &iter, x, y);
+ break;
+
+ default:
+ g_warn_if_reached ();
+ /* assume the KEY_PRESS case */
+
+ case GDK_KEY_PRESS:
+ /* get the location from the cursor */
+ gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+ gtk_text_buffer_get_insert (buffer));
+ break;
+
+ }
+
start = end = iter;
if (gtk_text_iter_backward_to_tag_toggle (&start, tag) &&
gtk_text_iter_forward_to_tag_toggle (&end, tag)) {
@@ -2891,6 +2930,9 @@ chat_create_ui (EmpathyChat *chat)
g_signal_connect (chat->input_text_view, "realize",
G_CALLBACK (chat_input_realize_cb),
chat);
+ g_signal_connect (chat->input_text_view, "button-press-event",
+ G_CALLBACK (chat_input_button_press_event_cb),
+ chat);
g_signal_connect (chat->input_text_view, "populate-popup",
G_CALLBACK (chat_input_populate_popup_cb),
chat);
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 1cb2b279c..404dab172 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -758,9 +758,11 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
GtkBuilder *gui;
char *filename;
GtkWidget *contents;
- GtkWidget *account_hbox, *blocked_contacts_view;
+ GtkWidget *account_hbox, *blocked_contacts_view, *blocked_contacts_sw,
+ *remove_toolbar;
GtkEntryCompletion *completion;
TpAccountManager *am;
+ GtkStyleContext *context;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_CONTACT_BLOCKING_DIALOG,
@@ -782,8 +784,10 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
"add-button", &self->priv->add_button,
"add-contact-entry", &self->priv->add_contact_entry,
"blocked-contacts", &self->priv->blocked_contacts,
+ "blocked-contacts-sw", &blocked_contacts_sw,
"blocked-contacts-view", &blocked_contacts_view,
"remove-button", &self->priv->remove_button,
+ "remove-toolbar", &remove_toolbar,
NULL);
empathy_builder_connect (gui, self,
@@ -792,6 +796,12 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
"remove-button", "clicked", contact_blocking_dialog_remove_contacts,
NULL);
+ /* join the remove toolbar to the treeview */
+ context = gtk_widget_get_style_context (blocked_contacts_sw);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+ context = gtk_widget_get_style_context (remove_toolbar);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
/* add the contents to the dialog */
gtk_container_add (
GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))),
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.ui b/libempathy-gtk/empathy-contact-blocking-dialog.ui
index 2e943105e..78dd1cd2d 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.ui
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.ui
@@ -39,16 +39,17 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkVBox" id="blocked-contacts-vbox">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="blocked-contacts-sw">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
+ <property name="width_request">408</property>
+ <property name="height_request">252</property>
<child>
<object class="GtkTreeView" id="blocked-contacts-view">
<property name="visible">True</property>
@@ -77,22 +78,24 @@
</packing>
</child>
<child>
- <object class="GtkVButtonBox" id="vbuttonbox1">
+ <object class="GtkToolbar" id="remove-toolbar">
<property name="visible">True</property>
- <property name="layout_style">start</property>
+ <property name="icon_size">1</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
<child>
- <object class="GtkButton" id="remove-button">
- <property name="label">gtk-remove</property>
+ <object class="GtkToolButton" id="remove-button">
+ <property name="stock_id">gtk-remove</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="tooltip-text" translatable="yes">Remove</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
new file mode 100644
index 000000000..a4a0aad1d
--- /dev/null
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -0,0 +1,364 @@
+/*
+ * empathy-contact-chooser.c
+ *
+ * EmpathyContactChooser
+ *
+ * (c) 2009, Collabora Ltd.
+ *
+ * Authors:
+ * Danielle Madeley <danielle.madeley@collabora.co.uk>
+ */
+
+#include <glib/gi18n.h>
+#include <folks/folks-telepathy.h>
+
+#include "empathy-contact-chooser.h"
+
+#include <libempathy-gtk/empathy-individual-view.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+
+G_DEFINE_TYPE (EmpathyContactChooser,
+ empathy_contact_chooser, GTK_TYPE_BOX);
+
+enum {
+ SIG_SELECTION_CHANGED,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+typedef struct _AddTemporaryIndividualCtx AddTemporaryIndividualCtx;
+
+struct _EmpathyContactChooserPrivate
+{
+ TpAccountManager *account_mgr;
+
+ EmpathyIndividualStore *store;
+ EmpathyIndividualView *view;
+
+ GPtrArray *search_words;
+ gchar *search_str;
+
+ /* Context representing the FolksIndividual which are added because of the
+ * current search from the user. */
+ AddTemporaryIndividualCtx *add_temp_ctx;
+
+ EmpathyContactChooserFilterFunc filter_func;
+ gpointer filter_data;
+};
+
+struct _AddTemporaryIndividualCtx
+{
+ EmpathyContactChooser *self;
+ /* List of owned FolksIndividual */
+ GList *individuals;
+};
+
+static AddTemporaryIndividualCtx *
+add_temporary_individual_ctx_new (EmpathyContactChooser *self)
+{
+ AddTemporaryIndividualCtx *ctx = g_slice_new0 (AddTemporaryIndividualCtx);
+
+ ctx->self = self;
+ return ctx;
+}
+
+static void
+add_temporary_individual_ctx_free (AddTemporaryIndividualCtx *ctx)
+{
+ GList *l;
+
+ /* Remove all the individuals from the model */
+ for (l = ctx->individuals; l != NULL; l = g_list_next (l))
+ {
+ FolksIndividual *individual = l->data;
+
+ individual_store_remove_individual_and_disconnect (ctx->self->priv->store,
+ individual);
+
+ g_object_unref (individual);
+ }
+
+ g_list_free (ctx->individuals);
+ g_slice_free (AddTemporaryIndividualCtx, ctx);
+}
+
+static void
+contact_chooser_dispose (GObject *object)
+{
+ EmpathyContactChooser *self = (EmpathyContactChooser *)
+ object;
+
+ tp_clear_pointer (&self->priv->add_temp_ctx,
+ add_temporary_individual_ctx_free);
+
+ tp_clear_object (&self->priv->store);
+ tp_clear_pointer (&self->priv->search_words, g_ptr_array_unref);
+ tp_clear_pointer (&self->priv->search_str, g_free);
+
+ tp_clear_object (&self->priv->account_mgr);
+
+ G_OBJECT_CLASS (empathy_contact_chooser_parent_class)->dispose (
+ object);
+}
+
+static void
+empathy_contact_chooser_class_init (
+ EmpathyContactChooserClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->dispose = contact_chooser_dispose;
+
+ g_type_class_add_private (object_class,
+ sizeof (EmpathyContactChooserPrivate));
+
+ signals[SIG_SELECTION_CHANGED] = g_signal_new ("selection-changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE,
+ 1, FOLKS_TYPE_INDIVIDUAL);
+}
+
+static void
+view_selection_changed_cb (GtkWidget *treeview,
+ EmpathyContactChooser *self)
+{
+ FolksIndividual *individual;
+
+ individual = empathy_individual_view_dup_selected (self->priv->view);
+
+ g_signal_emit (self, signals[SIG_SELECTION_CHANGED], 0, individual);
+
+ tp_clear_object (&individual);
+}
+
+static gboolean
+filter_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ EmpathyContactChooser *self = user_data;
+ FolksIndividual *individual;
+ gboolean is_online;
+ gboolean display = FALSE;
+ gboolean searching = FALSE;
+
+ gtk_tree_model_get (model, iter,
+ EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
+ EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, &is_online,
+ -1);
+
+ if (individual == NULL)
+ goto out;
+
+ if (self->priv->search_words != NULL)
+ {
+ searching = TRUE;
+
+ /* Filter out the contact if we are searching and it doesn't match */
+ if (!empathy_individual_match_string (individual,
+ self->priv->search_str, self->priv->search_words))
+ goto out;
+ }
+
+ if (self->priv->filter_func == NULL)
+ display = TRUE;
+ else
+ display = self->priv->filter_func (self, individual, is_online, searching,
+ self->priv->filter_data);
+out:
+ tp_clear_object (&individual);
+ return display;
+}
+
+static void
+get_contacts_cb (TpConnection *connection,
+ guint n_contacts,
+ TpContact * const *contacts,
+ const gchar * const *requested_ids,
+ GHashTable *failed_id_errors,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyContactChooser *self =
+ (EmpathyContactChooser *) weak_object;
+ AddTemporaryIndividualCtx *ctx = user_data;
+ TpAccount *account;
+ TpfPersonaStore *store;
+ FolksIndividual *individual;
+ TpfPersona *persona_new;
+ GeeSet *personas;
+
+ if (self->priv->add_temp_ctx != ctx)
+ /* another request has been started */
+ return;
+
+ if (n_contacts != 1)
+ return;
+
+ account = g_object_get_data (G_OBJECT (connection), "account");
+
+ store = tpf_persona_store_new (account);
+ personas = GEE_SET (
+ gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
+ g_direct_hash, g_direct_equal));
+ persona_new = tpf_persona_new (contacts[0], store);
+ gee_collection_add (GEE_COLLECTION (personas),
+ tpf_persona_new (contacts[0], store));
+
+ individual = folks_individual_new (personas);
+
+ /* Pass ownership to the list */
+ ctx->individuals = g_list_prepend (ctx->individuals, individual);
+
+ individual_store_add_individual_and_connect (self->priv->store, individual);
+
+ g_clear_object (&persona_new);
+ g_clear_object (&personas);
+ g_object_unref (store);
+}
+
+static void
+add_temporary_individuals (EmpathyContactChooser *self,
+ const gchar *id)
+{
+ GList *accounts, *l;
+
+ tp_clear_pointer (&self->priv->add_temp_ctx,
+ add_temporary_individual_ctx_free);
+
+ if (tp_str_empty (id))
+ return;
+
+ self->priv->add_temp_ctx = add_temporary_individual_ctx_new (self);
+
+ /* Try to add an individual for each connected account */
+ accounts = tp_account_manager_get_valid_accounts (self->priv->account_mgr);
+ for (l = accounts; l != NULL; l = g_list_next (l))
+ {
+ TpAccount *account = l->data;
+ TpConnection *conn;
+ TpContactFeature features[] = { TP_CONTACT_FEATURE_ALIAS,
+ TP_CONTACT_FEATURE_AVATAR_DATA,
+ TP_CONTACT_FEATURE_PRESENCE,
+ TP_CONTACT_FEATURE_CAPABILITIES };
+
+ conn = tp_account_get_connection (account);
+ if (conn == NULL)
+ continue;
+
+ /* One day we'll have tp_connection_get_account()... */
+ g_object_set_data_full (G_OBJECT (conn), "account",
+ g_object_ref (account), g_object_unref);
+
+ tp_connection_get_contacts_by_id (conn, 1, &id, G_N_ELEMENTS (features),
+ features, get_contacts_cb, self->priv->add_temp_ctx, NULL,
+ G_OBJECT (self));
+ }
+
+ g_list_free (accounts);
+}
+
+static void
+search_text_changed (GtkEntry *entry,
+ EmpathyContactChooser *self)
+{
+ const gchar *id;
+
+ tp_clear_pointer (&self->priv->search_words, g_ptr_array_unref);
+ tp_clear_pointer (&self->priv->search_str, g_free);
+
+ id = gtk_entry_get_text (entry);
+
+ self->priv->search_words = empathy_live_search_strip_utf8_string (id);
+ self->priv->search_str = g_strdup (id);
+
+ add_temporary_individuals (self, id);
+
+ empathy_individual_view_refilter (self->priv->view);
+}
+
+static void
+empathy_contact_chooser_init (EmpathyContactChooser *self)
+{
+ EmpathyIndividualManager *mgr;
+ GtkTreeSelection *selection;
+ GtkWidget *scroll;
+ GtkWidget *search_entry;
+ GQuark features[] = { TP_ACCOUNT_MANAGER_FEATURE_CORE, 0 };
+
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_CONTACT_CHOOSER,
+ EmpathyContactChooserPrivate);
+
+ self->priv->account_mgr = tp_account_manager_dup ();
+
+ /* We don't wait for the CORE feature to be prepared, which is fine as we
+ * won't use the account manager until user starts searching. Furthermore,
+ * the AM has probably already been prepared by another Empathy
+ * component. */
+ tp_proxy_prepare_async (self->priv->account_mgr, features, NULL, NULL);
+
+ /* Search entry */
+ search_entry = gtk_entry_new ();
+ gtk_box_pack_start (GTK_BOX (self), search_entry, FALSE, TRUE, 6);
+ gtk_widget_show (search_entry);
+
+ g_signal_connect (search_entry, "changed",
+ G_CALLBACK (search_text_changed), self);
+
+ /* Add the treeview */
+ mgr = empathy_individual_manager_dup_singleton ();
+ self->priv->store = empathy_individual_store_new (mgr);
+ g_object_unref (mgr);
+
+ empathy_individual_store_set_show_groups (self->priv->store, FALSE);
+
+ self->priv->view = empathy_individual_view_new (self->priv->store,
+ EMPATHY_INDIVIDUAL_VIEW_FEATURE_NONE, EMPATHY_INDIVIDUAL_FEATURE_NONE);
+
+ empathy_individual_view_set_custom_filter (self->priv->view,
+ filter_func, self);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->view));
+
+ g_signal_connect (selection, "changed",
+ G_CALLBACK (view_selection_changed_cb), self);
+
+ scroll = gtk_scrolled_window_new (NULL, NULL);
+
+ gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (self->priv->view));
+
+ gtk_box_pack_start (GTK_BOX (self), scroll, TRUE, TRUE, 6);
+ gtk_widget_show (GTK_WIDGET (self->priv->view));
+ gtk_widget_show (scroll);
+}
+
+GtkWidget *
+empathy_contact_chooser_new (void)
+{
+ return g_object_new (EMPATHY_TYPE_CONTACT_CHOOSER,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ NULL);
+}
+
+FolksIndividual *
+empathy_contact_chooser_dup_selected (EmpathyContactChooser *self)
+{
+ return empathy_individual_view_dup_selected (self->priv->view);
+}
+
+void
+empathy_contact_chooser_set_filter_func (EmpathyContactChooser *self,
+ EmpathyContactChooserFilterFunc func,
+ gpointer user_data)
+{
+ g_assert (self->priv->filter_func == NULL);
+
+ self->priv->filter_func = func;
+ self->priv->filter_data = user_data;
+}
diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h
new file mode 100644
index 000000000..ba95bcfbe
--- /dev/null
+++ b/libempathy-gtk/empathy-contact-chooser.h
@@ -0,0 +1,66 @@
+/*
+ * empathy-contact-chooser.h
+ *
+ * EmpathyContactChooser
+ *
+ * (c) 2010, Collabora Ltd.
+ *
+ * Authors:
+ * Guillaume Desmottes <guillaume.desmottes@collabora.com>
+ */
+
+#ifndef __EMPATHY_CONTACT_CHOOSER_H__
+#define __EMPATHY_CONTACT_CHOOSER_H__
+
+#include <gtk/gtk.h>
+
+#include <telepathy-glib/account.h>
+
+#include "libempathy/empathy-tp-chat.h"
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_CONTACT_CHOOSER (empathy_contact_chooser_get_type ())
+#define EMPATHY_CONTACT_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_CONTACT_CHOOSER, EmpathyContactChooser))
+#define EMPATHY_CONTACT_CHOOSER_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_CONTACT_CHOOSER, EmpathyContactChooserClass))
+#define EMPATHY_IS_CONTACT_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_CONTACT_CHOOSER))
+#define EMPATHY_IS_CONTACT_CHOOSER_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_CONTACT_CHOOSER))
+#define EMPATHY_CONTACT_CHOOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CONTACT_CHOOSER, EmpathyContactChooserClass))
+
+typedef struct _EmpathyContactChooser EmpathyContactChooser;
+typedef struct _EmpathyContactChooserClass EmpathyContactChooserClass;
+typedef struct _EmpathyContactChooserPrivate EmpathyContactChooserPrivate;
+
+typedef gboolean (*EmpathyContactChooserFilterFunc) (
+ EmpathyContactChooser *self,
+ FolksIndividual *individual,
+ gboolean is_online,
+ gboolean searching,
+ gpointer user_data);
+
+struct _EmpathyContactChooser
+{
+ GtkBox parent;
+
+ EmpathyContactChooserPrivate *priv;
+};
+
+struct _EmpathyContactChooserClass
+{
+ GtkBoxClass parent_class;
+};
+
+GType empathy_contact_chooser_get_type (void);
+
+GtkWidget * empathy_contact_chooser_new (void);
+
+FolksIndividual * empathy_contact_chooser_dup_selected (
+ EmpathyContactChooser *self);
+
+void empathy_contact_chooser_set_filter_func (EmpathyContactChooser *self,
+ EmpathyContactChooserFilterFunc func,
+ gpointer user_data);
+
+G_END_DECLS
+
+#endif
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 2b0b51a36..4b2febd30 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -697,14 +697,14 @@ contact_list_view_drag_begin (GtkWidget *widget,
priv = GET_PRIV (widget);
- GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_begin (widget,
- context);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
return;
}
+ GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_begin (widget,
+ context);
+
path = gtk_tree_model_get_path (model, &iter);
priv->drag_row = gtk_tree_row_reference_new (model, path);
gtk_tree_path_free (path);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 0fb24430c..db63f0c0d 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -811,13 +811,13 @@ individual_view_drag_begin (GtkWidget *widget,
priv = GET_PRIV (widget);
- GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget,
- context);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
+ GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget,
+ context);
+
path = gtk_tree_model_get_path (model, &iter);
priv->drag_row = gtk_tree_row_reference_new (model, path);
gtk_tree_path_free (path);
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 219d0cc11..5620f4b7c 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -2779,7 +2779,7 @@ when_row_is_separator (GtkTreeModel *model,
COL_WHEN_TEXT, &when,
-1);
- ret = g_str_equal (when, "separator");
+ ret = !tp_strdiff (when, "separator");
g_free (when);
return ret;
}
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 7e4a82369..060e0aab5 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -526,13 +526,18 @@ typedef struct {
GSimpleAsyncResult *result;
guint width;
guint height;
+ struct SizeData size_data;
+ GdkPixbufLoader *loader;
+ GCancellable *cancellable;
+ guint8 data[512];
} PixbufAvatarFromIndividualClosure;
static PixbufAvatarFromIndividualClosure *
pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual,
GSimpleAsyncResult *result,
gint width,
- gint height)
+ gint height,
+ GCancellable *cancellable)
{
PixbufAvatarFromIndividualClosure *closure;
@@ -544,6 +549,7 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual,
closure->result = g_object_ref (result);
closure->width = width;
closure->height = height;
+ closure->cancellable = g_object_ref (cancellable);
return closure;
}
@@ -552,65 +558,120 @@ static void
pixbuf_avatar_from_individual_closure_free (
PixbufAvatarFromIndividualClosure *closure)
{
+ g_object_unref (closure->cancellable);
+ tp_clear_object (&closure->loader);
g_object_unref (closure->individual);
g_object_unref (closure->result);
g_free (closure);
}
static void
-avatar_file_load_contents_cb (GObject *object,
- GAsyncResult *result,
- gpointer user_data)
+avatar_icon_load_read_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- GFile *file = G_FILE (object);
+ GInputStream *stream = G_INPUT_STREAM (object);
PixbufAvatarFromIndividualClosure *closure = user_data;
- char *data = NULL;
- gsize data_size;
- struct SizeData size_data;
+ gssize n_read;
GError *error = NULL;
- GdkPixbufLoader *loader = NULL;
- if (!g_file_load_contents_finish (file, result, &data, &data_size,
- NULL, &error)) {
- DEBUG ("failed to load avatar from file: %s",
- error->message);
+ /* Finish reading this chunk from the stream */
+ n_read = g_input_stream_read_finish (stream, result, &error);
+ if (error != NULL) {
+ DEBUG ("Failed to finish read from pixbuf stream: %s",
+ error->message);
g_simple_async_result_set_from_error (closure->result, error);
- goto out;
+ goto out_close;
}
- size_data.width = closure->width;
- size_data.height = closure->height;
- size_data.preserve_aspect_ratio = TRUE;
-
- loader = gdk_pixbuf_loader_new ();
-
- g_signal_connect (loader, "size-prepared",
- G_CALLBACK (pixbuf_from_avatar_size_prepared_cb),
- &size_data);
-
- if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size,
- &error)) {
+ /* Write the chunk to the pixbuf loader */
+ if (!gdk_pixbuf_loader_write (closure->loader, (guchar *) closure->data,
+ n_read, &error)) {
DEBUG ("Failed to write to pixbuf loader: %s",
error ? error->message : "No error given");
g_simple_async_result_set_from_error (closure->result, error);
+ goto out_close;
+ }
+
+ if (n_read == 0) {
+ /* EOF? */
+ if (!gdk_pixbuf_loader_close (closure->loader, &error)) {
+ DEBUG ("Failed to close pixbuf loader: %s",
+ error ? error->message : "No error given");
+ g_simple_async_result_set_from_error (closure->result, error);
+ goto out;
+ }
+
+ /* We're done. */
+ g_simple_async_result_set_op_res_gpointer (closure->result,
+ avatar_pixbuf_from_loader (closure->loader),
+ g_object_unref);
+
goto out;
+ } else {
+ /* Loop round and read another chunk. */
+ g_input_stream_read_async (stream, closure->data,
+ G_N_ELEMENTS (closure->data),
+ G_PRIORITY_DEFAULT, closure->cancellable,
+ avatar_icon_load_read_cb, closure);
+
+ return;
}
- if (!gdk_pixbuf_loader_close (loader, &error)) {
- DEBUG ("Failed to close pixbuf loader: %s",
- error ? error->message : "No error given");
+
+out_close:
+ /* We must close the pixbuf loader before unreffing it. */
+ gdk_pixbuf_loader_close (closure->loader, NULL);
+
+out:
+ g_simple_async_result_complete (closure->result);
+
+ g_clear_error (&error);
+ pixbuf_avatar_from_individual_closure_free (closure);
+}
+
+static void
+avatar_icon_load_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GLoadableIcon *icon = G_LOADABLE_ICON (object);
+ PixbufAvatarFromIndividualClosure *closure = user_data;
+ GInputStream *stream;
+ GError *error = NULL;
+
+ stream = g_loadable_icon_load_finish (icon, result, NULL, &error);
+ if (error != NULL) {
+ DEBUG ("Failed to open avatar stream: %s", error->message);
g_simple_async_result_set_from_error (closure->result, error);
goto out;
}
- g_simple_async_result_set_op_res_gpointer (closure->result,
- avatar_pixbuf_from_loader (loader), g_object_unref);
+ closure->size_data.width = closure->width;
+ closure->size_data.height = closure->height;
+ closure->size_data.preserve_aspect_ratio = TRUE;
+
+ /* Load the data into a pixbuf loader in chunks. */
+ closure->loader = gdk_pixbuf_loader_new ();
+
+ g_signal_connect (closure->loader, "size-prepared",
+ G_CALLBACK (pixbuf_from_avatar_size_prepared_cb),
+ &(closure->size_data));
+
+ /* Begin to read the first chunk. */
+ g_input_stream_read_async (stream, closure->data,
+ G_N_ELEMENTS (closure->data),
+ G_PRIORITY_DEFAULT, closure->cancellable,
+ avatar_icon_load_read_cb, closure);
+
+ g_object_unref (stream);
+
+ return;
out:
g_simple_async_result_complete (closure->result);
g_clear_error (&error);
- g_free (data);
- tp_clear_object (&loader);
+ tp_clear_object (&stream);
pixbuf_avatar_from_individual_closure_free (closure);
}
@@ -623,7 +684,7 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
GAsyncReadyCallback callback,
gpointer user_data)
{
- GFile *avatar_file;
+ GLoadableIcon *avatar_icon;
GSimpleAsyncResult *result;
PixbufAvatarFromIndividualClosure *closure;
@@ -631,18 +692,19 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
callback, user_data,
empathy_pixbuf_avatar_from_individual_scaled_async);
- avatar_file =
+ avatar_icon =
folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual));
- if (avatar_file == NULL)
+ if (avatar_icon == NULL)
goto out;
closure = pixbuf_avatar_from_individual_closure_new (individual, result,
- width, height);
+ width, height,
+ cancellable);
if (closure == NULL)
goto out;
- g_file_load_contents_async (avatar_file, cancellable,
- avatar_file_load_contents_cb, closure);
+ g_loadable_icon_load_async (avatar_icon, width, cancellable,
+ avatar_icon_load_cb, closure);
g_object_unref (result);
@@ -1732,6 +1794,7 @@ file_manager_send_file_response_cb (GtkDialog *widget,
g_object_unref (file);
}
+ g_object_unref (contact);
gtk_widget_destroy (GTK_WIDGET (widget));
}
@@ -1771,7 +1834,7 @@ empathy_send_file_with_file_chooser (EmpathyContact *contact)
g_signal_connect (widget, "response",
G_CALLBACK (file_manager_send_file_response_cb),
- contact);
+ g_object_ref (contact));
gtk_widget_show (widget);
}
@@ -2011,3 +2074,157 @@ empathy_individual_match_string (FolksIndividual *individual,
* contact's vCard for example. */
return retval;
}
+
+static gboolean
+dtmf_dialpad_button_pressed_cb (GObject *button,
+ GtkEntry *entry)
+{
+ GtkEntryBuffer *buffer = gtk_entry_get_buffer (entry);
+ const gchar *label;
+
+ label = g_object_get_data (button, "label");
+ gtk_entry_buffer_insert_text (buffer, -1, label, -1);
+
+ return FALSE;
+}
+
+GtkWidget *
+empathy_create_dtmf_dialpad (GObject *self,
+ GCallback dtmf_button_pressed_cb,
+ GCallback dtmf_button_released_cb)
+{
+ GtkWidget *box, *entry, *table;
+ int i;
+ GQuark button_quark;
+ struct {
+ const gchar *label;
+ const gchar *sublabel;
+ TpDTMFEvent event;
+ } dtmfbuttons[] = { { "1", "", TP_DTMF_EVENT_DIGIT_1 },
+ { "2", "abc", TP_DTMF_EVENT_DIGIT_2 },
+ { "3", "def", TP_DTMF_EVENT_DIGIT_3 },
+ { "4", "ghi", TP_DTMF_EVENT_DIGIT_4 },
+ { "5", "jkl", TP_DTMF_EVENT_DIGIT_5 },
+ { "6", "mno", TP_DTMF_EVENT_DIGIT_6 },
+ { "7", "pqrs", TP_DTMF_EVENT_DIGIT_7 },
+ { "8", "tuv", TP_DTMF_EVENT_DIGIT_8 },
+ { "9", "wxyz", TP_DTMF_EVENT_DIGIT_9 },
+ { "#", "", TP_DTMF_EVENT_HASH },
+ { "0", "", TP_DTMF_EVENT_DIGIT_0 },
+ { "*", "", TP_DTMF_EVENT_ASTERISK },
+ { NULL, } };
+
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+
+ entry = gtk_entry_new ();
+ gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+
+ gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3);
+
+ button_quark = g_quark_from_static_string (EMPATHY_DTMF_BUTTON_ID);
+
+ table = gtk_table_new (4, 3, TRUE);
+
+ for (i = 0; dtmfbuttons[i].label != NULL; i++)
+ {
+ GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
+ GtkWidget *button = gtk_button_new ();
+ GtkWidget *label;
+ gchar *str;
+
+ gtk_container_add (GTK_CONTAINER (button), vbox);
+
+ /* main label */
+ label = gtk_label_new ("");
+ str = g_strdup_printf ("<span size='x-large'>%s</span>",
+ dtmfbuttons[i].label);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ g_free (str);
+
+ g_object_set_data (G_OBJECT (button), "label",
+ (gpointer) dtmfbuttons[i].label);
+
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 3);
+
+ /* sub label */
+ label = gtk_label_new ("");
+ str = g_strdup_printf (
+ "<span foreground='#555555'>%s</span>",
+ dtmfbuttons[i].sublabel);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ g_free (str);
+
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+
+ gtk_table_attach (GTK_TABLE (table), button, i % 3, i % 3 + 1,
+ i/3, i/3 + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
+
+ g_object_set_qdata (G_OBJECT (button), button_quark,
+ GUINT_TO_POINTER (dtmfbuttons[i].event));
+
+ /* To update the GtkEntry */
+ g_signal_connect (G_OBJECT (button), "pressed",
+ G_CALLBACK (dtmf_dialpad_button_pressed_cb), entry);
+
+ g_signal_connect (G_OBJECT (button), "pressed",
+ dtmf_button_pressed_cb, self);
+ g_signal_connect (G_OBJECT (button), "released",
+ dtmf_button_released_cb, self);
+ }
+
+ gtk_box_pack_start (GTK_BOX (box), table, FALSE, FALSE, 3);
+
+ return box;
+}
+
+void
+empathy_launch_program (const gchar *dir,
+ const gchar *name,
+ const gchar *args)
+{
+ GdkDisplay *display;
+ GError *error = NULL;
+ gchar *path, *cmd;
+ GAppInfo *app_info;
+ GdkAppLaunchContext *context = NULL;
+
+ /* Try to run from source directory if possible */
+ path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
+ name, NULL);
+
+ if (!g_file_test (path, G_FILE_TEST_EXISTS))
+ {
+ g_free (path);
+ path = g_build_filename (dir, name, NULL);
+ }
+
+ if (args != NULL)
+ cmd = g_strconcat (path, " ", args, NULL);
+ else
+ cmd = g_strdup (path);
+
+ app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
+ if (app_info == NULL)
+ {
+ DEBUG ("Failed to create app info: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ display = gdk_display_get_default ();
+ context = gdk_display_get_app_launch_context (display);
+
+ if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+ &error))
+ {
+ g_warning ("Failed to launch %s: %s", name, error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+out:
+ tp_clear_object (&app_info);
+ tp_clear_object (&context);
+ g_free (path);
+ g_free (cmd);
+}
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index f61e9e348..b65206bbe 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -49,6 +49,8 @@ G_BEGIN_DECLS
(x) < gdk_screen_width () && \
(y) < gdk_screen_height ())
+#define EMPATHY_DTMF_BUTTON_ID "empathy-call-dtmf-button-id"
+
typedef void (*EmpathyPixbufAvatarFromIndividualCb) (FolksIndividual *individual,
GdkPixbuf *pixbuf,
gpointer user_data);
@@ -141,6 +143,9 @@ void empathy_send_file_from_uri_list (EmpathyContact *conta
const gchar *uri_list);
void empathy_send_file_with_file_chooser (EmpathyContact *contact);
void empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler);
+GtkWidget * empathy_create_dtmf_dialpad (GObject *self,
+ GCallback pressed_cb,
+ GCallback released_cb);
/* Misc */
void empathy_make_color_whiter (GdkRGBA *color);
@@ -154,6 +159,10 @@ gboolean empathy_individual_match_string (
const gchar *text,
GPtrArray *words);
+void empathy_launch_program (const gchar *dir,
+ const gchar *name,
+ const gchar *args);
+
G_END_DECLS
#endif /* __EMPATHY_UI_UTILS_H__ */
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 3d80d40b7..3b5221eb8 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -34,6 +34,7 @@
struct _EmpathyCameraMonitorPrivate
{
CheeseCameraDeviceMonitor *cheese_monitor;
+ GQueue *cameras;
gint num_cameras;
};
@@ -43,10 +44,69 @@ enum
PROP_AVAILABLE,
};
+enum
+{
+ CAMERA_ADDED,
+ CAMERA_REMOVED,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
G_DEFINE_TYPE (EmpathyCameraMonitor, empathy_camera_monitor, G_TYPE_OBJECT);
static EmpathyCameraMonitor *manager_singleton = NULL;
+static EmpathyCamera *
+empathy_camera_new (const gchar *id,
+ const gchar *device,
+ const gchar *name)
+{
+ EmpathyCamera *camera = g_slice_new (EmpathyCamera);
+
+ camera->id = g_strdup (id);
+ camera->device = g_strdup (device);
+ camera->name = g_strdup (name);
+
+ return camera;
+}
+
+static EmpathyCamera *
+empathy_camera_copy (EmpathyCamera *camera)
+{
+ return empathy_camera_new (camera->id, camera->device, camera->name);
+}
+
+static void
+empathy_camera_free (EmpathyCamera *camera)
+{
+ g_free (camera->id);
+ g_free (camera->device);
+ g_free (camera->name);
+
+ g_slice_free (EmpathyCamera, camera);
+}
+
+G_DEFINE_BOXED_TYPE (EmpathyCamera, empathy_camera,
+ empathy_camera_copy, empathy_camera_free)
+
+static gint
+empathy_camera_find (gconstpointer a,
+ gconstpointer b)
+{
+ const EmpathyCamera *camera = a;
+ const gchar *id = b;
+
+ return g_strcmp0 (camera->id, id);
+}
+
+static void
+empathy_camera_monitor_free_camera_foreach (gpointer data,
+ gpointer user_data)
+{
+ empathy_camera_free (data);
+}
+
static void
on_camera_added (CheeseCameraDeviceMonitor *device,
gchar *id,
@@ -55,10 +115,19 @@ on_camera_added (CheeseCameraDeviceMonitor *device,
gint api_version,
EmpathyCameraMonitor *self)
{
+ EmpathyCamera *camera = empathy_camera_new (id, filename, product_name);
+
+ if (self->priv->cameras == NULL)
+ return;
+
+ g_queue_push_tail (self->priv->cameras, camera);
+
self->priv->num_cameras++;
if (self->priv->num_cameras == 1)
g_object_notify (G_OBJECT (self), "available");
+
+ g_signal_emit (self, signals[CAMERA_ADDED], 0, camera);
}
static void
@@ -66,10 +135,37 @@ on_camera_removed (CheeseCameraDeviceMonitor *device,
gchar *id,
EmpathyCameraMonitor *self)
{
+ EmpathyCamera *camera;
+ GList *l;
+
+ if (self->priv->cameras == NULL)
+ return;
+
+ l = g_queue_find_custom (self->priv->cameras, id, empathy_camera_find);
+
+ g_return_if_fail (l != NULL);
+
+ camera = l->data;
+
+ g_queue_delete_link (self->priv->cameras, l);
+
self->priv->num_cameras--;
if (self->priv->num_cameras == 0)
g_object_notify (G_OBJECT (self), "available");
+
+ g_signal_emit (self, signals[CAMERA_REMOVED], 0, camera);
+
+ empathy_camera_free (camera);
+}
+
+const GList *
+empathy_camera_monitor_get_cameras (EmpathyCameraMonitor *self)
+{
+ if (self->priv->cameras != NULL)
+ return self->priv->cameras->head;
+ else
+ return NULL;
}
static void
@@ -98,31 +194,11 @@ empathy_camera_monitor_dispose (GObject *object)
tp_clear_object (&self->priv->cheese_monitor);
- G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->dispose (object);
-}
-
-static GObject *
-empathy_camera_monitor_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
-{
- GObject *retval;
-
- if (manager_singleton)
- {
- retval = g_object_ref (manager_singleton);
- }
- else
- {
- retval =
- G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->
- constructor (type, n_props, props);
+ g_queue_foreach (self->priv->cameras,
+ empathy_camera_monitor_free_camera_foreach, NULL);
+ tp_clear_pointer (&self->priv->cameras, g_queue_free);
- manager_singleton = EMPATHY_CAMERA_MONITOR (retval);
- g_object_add_weak_pointer (retval, (gpointer) & manager_singleton);
- }
-
- return retval;
+ G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->dispose (object);
}
static void
@@ -141,7 +217,6 @@ empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = empathy_camera_monitor_dispose;
- object_class->constructor = empathy_camera_monitor_constructor;
object_class->constructed = empathy_camera_monitor_constructed;
object_class->get_property = empathy_camera_monitor_get_property;
@@ -149,6 +224,20 @@ empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass)
g_param_spec_boolean ("available", "Available",
"Camera available", TRUE, G_PARAM_READABLE));
+ signals[CAMERA_ADDED] =
+ g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
+
+ signals[CAMERA_REMOVED] =
+ g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
+
g_type_class_add_private (object_class,
sizeof (EmpathyCameraMonitorPrivate));
}
@@ -159,6 +248,8 @@ empathy_camera_monitor_init (EmpathyCameraMonitor *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_CAMERA_MONITOR, EmpathyCameraMonitorPrivate);
+ self->priv->cameras = g_queue_new ();
+
self->priv->cheese_monitor = cheese_camera_device_monitor_new ();
g_signal_connect (self->priv->cheese_monitor, "added",
@@ -175,7 +266,28 @@ empathy_camera_monitor_init (EmpathyCameraMonitor *self)
EmpathyCameraMonitor *
empathy_camera_monitor_dup_singleton (void)
{
- return g_object_new (EMPATHY_TYPE_CAMERA_MONITOR, NULL);
+ GObject *retval;
+
+ if (manager_singleton)
+ {
+ retval = g_object_ref (manager_singleton);
+ }
+ else
+ {
+ retval = g_object_new (EMPATHY_TYPE_CAMERA_MONITOR, NULL);
+
+ manager_singleton = EMPATHY_CAMERA_MONITOR (retval);
+ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+ }
+
+ return EMPATHY_CAMERA_MONITOR (retval);
+}
+
+EmpathyCameraMonitor *
+empathy_camera_monitor_new (void)
+{
+ return EMPATHY_CAMERA_MONITOR (
+ g_object_new (EMPATHY_TYPE_CAMERA_MONITOR, NULL));
}
gboolean empathy_camera_monitor_get_available (EmpathyCameraMonitor *self)
diff --git a/libempathy/empathy-camera-monitor.h b/libempathy/empathy-camera-monitor.h
index d2d9bb89e..f627f7b58 100644
--- a/libempathy/empathy-camera-monitor.h
+++ b/libempathy/empathy-camera-monitor.h
@@ -46,11 +46,24 @@ struct _EmpathyCameraMonitorClass
GObjectClass parent_class;
};
+typedef struct
+{
+ gchar *id;
+ gchar *device;
+ gchar *name;
+} EmpathyCamera;
+
+#define EMPATHY_TYPE_CAMERA (empathy_camera_get_type ())
+GType empathy_camera_get_type (void) G_GNUC_CONST;
+
GType empathy_camera_monitor_get_type (void) G_GNUC_CONST;
EmpathyCameraMonitor *empathy_camera_monitor_dup_singleton (void);
+EmpathyCameraMonitor *empathy_camera_monitor_new (void);
gboolean empathy_camera_monitor_get_available (EmpathyCameraMonitor *self);
+const GList * empathy_camera_monitor_get_cameras (EmpathyCameraMonitor *self);
+
G_END_DECLS
#endif /* __EMPATHY_CAMERA_MONITOR_H__ */
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 9c7efb35b..d326981d4 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -51,6 +51,11 @@ G_BEGIN_DECLS
#define EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN "sounds-contact-login"
#define EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT "sounds-contact-logout"
+#define EMPATHY_PREFS_CALL_SCHEMA EMPATHY_PREFS_SCHEMA ".call"
+#define EMPATHY_PREFS_CALL_SOUND_VOLUME "volume"
+#define EMPATHY_PREFS_CALL_CAMERA_DEVICE "camera-device"
+#define EMPATHY_PREFS_CALL_ECHO_CANCELLATION "echo-cancellation"
+
#define EMPATHY_PREFS_CHAT_SCHEMA EMPATHY_PREFS_SCHEMA ".conversation"
#define EMPATHY_PREFS_CHAT_SHOW_SMILEYS "graphical-smileys"
#define EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS "show-contacts-in-rooms"
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 1c18cf53c..06b3308c5 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -787,6 +787,7 @@ empathy_message_new_from_tp_message (TpMessage *tp_msg,
gint64 timestamp;
gint64 original_timestamp;
const GHashTable *part = tp_message_peek (tp_msg, 0);
+ gboolean is_backlog;
g_return_val_if_fail (TP_IS_MESSAGE (tp_msg), NULL);
@@ -799,6 +800,9 @@ empathy_message_new_from_tp_message (TpMessage *tp_msg,
original_timestamp = tp_asv_get_int64 (part,
"original-message-received", NULL);
+ is_backlog = (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) ==
+ TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK;
+
message = g_object_new (EMPATHY_TYPE_MESSAGE,
"body", body,
"token", tp_message_get_token (tp_msg),
@@ -807,7 +811,7 @@ empathy_message_new_from_tp_message (TpMessage *tp_msg,
"timestamp", timestamp,
"original-timestamp", original_timestamp,
"flags", flags,
- "is-backlog", flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK,
+ "is-backlog", is_backlog,
"incoming", incoming,
"tp-message", tp_msg,
NULL);
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 8c7fe8847..b06d7bf4c 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -288,7 +288,7 @@ empathy_server_sasl_handler_class_init (EmpathyServerSASLHandlerClass *klass)
oclass->get_property = empathy_server_sasl_handler_get_property;
oclass->set_property = empathy_server_sasl_handler_set_property;
oclass->dispose = empathy_server_sasl_handler_dispose;
- oclass->dispose = empathy_server_sasl_handler_finalize;
+ oclass->finalize = empathy_server_sasl_handler_finalize;
g_type_class_add_private (klass, sizeof (EmpathyServerSASLHandlerPriv));
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index d947e7284..11990a9a2 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -821,7 +821,19 @@ list_get_contact_blocking_capabilities_cb (TpProxy *conn,
EmpathyTpContactListPriv *priv = GET_PRIV (list);
TpContactBlockingCapabilities caps;
- g_return_if_fail (G_VALUE_HOLDS_UINT (value));
+ if (in_error != NULL) {
+ DEBUG ("Get(Blocking, ContactBlockingCapabilities) on %s failed: %s",
+ tp_proxy_get_object_path (conn),
+ in_error->message);
+ return;
+ }
+
+ if (!G_VALUE_HOLDS_UINT (value)) {
+ DEBUG ("Get(Blocking, ContactBlockingCapabilities) on %s returned a %s, not a uint",
+ tp_proxy_get_object_path (conn),
+ G_VALUE_TYPE_NAME (value));
+ return;
+ }
caps = g_value_get_uint (value);
diff --git a/po/cs.po b/po/cs.po
index f44cf1a9f..924d7182a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,20 +12,21 @@
# Jiri Eischmann <jiri@eischmann.cz>, 2010.
# Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010.
# Marek Černocký <marek@manet.cz>, 2010, 2011.
+# Pavel Šefránek <pavel@sefranek2.cz>, 2011.
#
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: 2011-04-26 12:21+0000\n"
-"PO-Revision-Date: 2011-04-30 13:02+0200\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-07-25 11:44+0000\n"
+"PO-Revision-Date: 2011-07-28 09:10+0200\n"
+"Last-Translator: Pavel Šefránek <pavel@sefranek2.cz>\n"
"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Lokalize 1.0\n"
@@ -62,41 +63,45 @@ msgid "Chat window theme"
msgstr "Motiv okna diskuze"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Chat window theme variant"
+msgstr "Motiv okna diskuze"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Čárkami oddělený seznam jazyků používaných ke kontrole pravopisu (např. „en, "
"fr, nl“)."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Compact contact list"
msgstr "Kompaktní seznam kontaktů"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Connection managers should be used"
msgstr "Měli byste používat správce připojení"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Contact list sort criterion"
msgstr "Kritérium pro řazení seznamu kontaktů"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Default directory to select an avatar image from"
msgstr "Výchozí adresář pro výběr obrázku avataru"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable popup notifications when away"
msgstr "Zakázat vyskakující upozornění v případě mé nepřítomnosti"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Disable sounds when away"
msgstr "Zakázat zvuky v případě mé nepřítomnosti"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Display incoming events in the status area"
msgstr "Zobrazovat příchozí události ve stavové oblasti"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -104,231 +109,240 @@ msgstr ""
"Zobrazovat příchozí události ve stavové oblasti. Když je něco špatně, tak se "
"to uživatel ihned dozví."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can publish the user's location"
msgstr "Empathy může zveřejnit polohu uživatele"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy se může pokusit určit vaši polohu pomocí GPS"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy se může pokusit určit vaši polohu pomocí mobilní sítě"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the network to guess the location"
msgstr "Empathy se může pokusit určit vaši polohu pomocí sítě"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy default download folder"
msgstr "Výchozí adresář pro stahování aplikace Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy migrovala záznamy butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
msgstr "Empathy by měl při nečinnosti automaticky nastavit na nepřítomen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Automaticky připojovat Empathy po spuštění"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Přesnost plohy by měla být omezena"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Používat avatar kontaktu jako ikonku okna diskuze"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Povolit vývojové nástroje pro WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Povolit vyskakující upozornění na nové zprávy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Povolit kontrolu pravopisu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Skrýt hlavní okno"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Skrýt hlavní okno."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Znak doplňování přezdívek"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "Otevírat nové diskuze v oddělených oknech"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Cesta k požadovanému motivu Adium"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Cesta k motivu Adium, který bude v případě, že Adium používáte, vybrán."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Přehrávat zvuk pro příchozí zprávy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Přehrát zvuk při nové konverzaci"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Přehrávat zvuk pro odchozí zprávy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Přehrávat zvuk, když se kontakt přihlásí"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Přehrát zvuk, pokud se kontakt odhlásí"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Přehrávat zvuk, když se přihlásím"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Přehrávat zvuk, když se odhlásím"
# is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "Vyskakující upozornění, pokud není vybrána diskuze"
# is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Vyskakující upozornění při přihlášení kontaktu"
# is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Vyskakující upozornění při odhlášení kontaktu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Show Balance in contact list"
+msgstr "Zobrazovat zůstatek kreditu v seznamu kontaktů"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show avatars"
msgstr "Zobrazovat avatary"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show contact list in rooms"
msgstr "Zobrazit seznam kontaktů v diskuzních místnostech"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show hint about closing the main window"
msgstr "Zobrazovat nápovědu, pokud se chystáte zavřít hlavní okno"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show offline contacts"
msgstr "Zobrazovat odpojené kontakty"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show protocols"
msgstr "Zobrazovat protokoly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Spell checking languages"
msgstr "Jazyky s kontrolovaným pravopisem"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The default folder to save file transfers in."
msgstr "Výchozí adresář pro ukládání přenášených souborů."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The last directory that an avatar image was chosen from."
msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The position for the chat window side pane"
msgstr "Poloha pro postranní panel diskuzního okna"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Uložená poloha (v pixelech) postranního panelu diskuzního okna"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Motiv, který je používán pro zobrazení konverzací v oknech diskuzí."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Motiv, který je používán pro zobrazení konverzací v oknech diskuzí."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use graphical smileys"
msgstr "Používat grafické smajlíky"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Use notification sounds"
msgstr "Používat zvuková upozornění"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use theme for chat rooms"
msgstr "Používat motiv pro diskuzní místnosti"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Jestli může Empathy zveřejňovat kontaktům vaši polohu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Jestli může Empathy používat GPS k určení polohy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Jestli může Empathy použít mobilní síť k určení polohy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the network to guess the location."
msgstr "Zda může Empathy použít sít k určení polohy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Jestli aplikace Empathy migrovala záznamy butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Jestli se má Empathy po spuštění automaticky připojovat k vašim účtům."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Zda by měla aplikace Empathy při nečinnosti uživatele přepínat na stav "
"nepřítomen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Jestli má Empathy omezit přesnost polohy pro lepší ochranu vašeho soukromí."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Zda má Empathy používat avatar kontaktu jako ikonu okna diskuze."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Zda mají být povoleny vývojové nástroje pro Webkit, například Web Inspektor."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -336,65 +350,65 @@ msgstr ""
"Jestli má být používán správce připojení k automatickému připojování a "
"odpojování."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Jestli u zadávaných slov kontrolovat pravopis."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Jestli v konverzacích převádět smajlíky na obrázky."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Jestli přehrávat zvuky jako upozornění na přihlašování kontaktu k síti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Jestli přehrávat zvuky jako upozornění na odhlašování kontaktu od sítě."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of events."
msgstr "Jestli přehrávat zvuky jako upozornění na události."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Jestli přehrávat zvuk jako upozornění na příchozí zprávy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of new conversations."
msgstr "Jestli přehrávat zvuk jako upozornění na novou konverzaci."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Jestli přehrávat zvuk jako upozornění na odchozí zprávy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging into a network."
msgstr "Jestli přehrávat zvuk, když se přihlašuji do sítě."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound when logging out of a network."
msgstr "Zda přehrávat zvuk, když se odhlašuji ze sítě."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Zda přehrávat zvuková upozornění v případě mé nepřítomnosti nebo "
"zaneprázdněnosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Jestli zobrazovat vyskakující upozornění při odpojení uživatele."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Jestli zobrazovat vyskakující upozornění při přihlášení kontaktu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -402,51 +416,55 @@ msgstr ""
"Zdali zobrazovat vyskakující upozornění na novou zprávu, i když diskuze byla "
"již otevřena, ale není vybrána."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Zdali zobrazovat vyskakující upozornění při přijetí nové zprávy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show account balances in the contact list."
+msgstr "Jestli zobrazovat zůstatek kreditu v seznamu kontaktů."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Zda zobrazovat avatary kontaktů v seznamu kontaktů a oknech s konverzacemi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Zda v seznamu kontaktů zobrazovat odpojené kontakty."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Zda zobrazovat vyskakující upozornění v případě mé nepřítomnosti nebo "
"zaneprázdněnosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Jestli zobrazovat protokoly kontaktů v seznamu kontaktů."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show the contact list in chat rooms."
msgstr "Jestli zobrazovat seznam kontaktů v diskuzních místnostech."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show the contact list in compact mode."
msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr ""
"Zda zobrazovat varování při uzavírání hlavního okna prostřednictvím tlačítka "
-"'x' (křížek) v záhlaví okna."
+"„x“ (křížek) v záhlaví okna."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to use the theme for chat rooms."
msgstr "Zda používat motiv pro diskuzní místnosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -462,7 +480,7 @@ msgstr "Spravovat účty IM a VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2340
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "Účty IM a VoIP"
@@ -482,6 +500,22 @@ msgstr "Vybraný soubor není běžným souborem"
msgid "The selected file is empty"
msgstr "Vybraný soubor je prázdný"
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Zmeškaný hovor od kontaktu %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Hovor s kontaktem %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Příchozí hovor od kontaktu %s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Typ soketu není podporován"
@@ -510,142 +544,142 @@ msgstr "Chyba při pokusu o odeslání souboru"
msgid "The other participant is unable to transfer the file"
msgstr "Protistrana není schopna přenosu souborů"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Neznámý důvod"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Přítomen"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Zaneprázdněn"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Nepřítomen"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Neviditelný"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "Odpojen"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:316
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:224
msgctxt "presence"
msgid "Unknown"
msgstr "Neznámo"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Neudán žádný důvod"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "Stav nastaven na „Odhlášen“"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "Chyba sítě"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "Ověření selhalo"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Chyba šifrování"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "Jméno používáno"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Certifikát nebyl poskytnut"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "Nedůvěryhodný certifikát"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "Platnost certifikátu vypršela"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Certifikát není aktivován"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Certifikát názvu počítače nesouhlasí"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Certifikát otisku prstu nesouhlasí"
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Certifikát je podepsán sám sebou"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "Chyba certifikátu"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "Šifrování není dostupné"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "Certifikát je neplatný"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "Spojení bylo odmítnuto"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "Spojení bylo navázáno"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "Spojení bylo ztraceno"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "Zdroj je již připojen k serveru"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "Takový účet již na serveru existuje"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "Certifikát byl odvolán"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Certifikát používá nepříliš bezpečný šifrovací algoritmus nebo je z "
"kryptografického hlediska slabý"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:348
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -653,24 +687,24 @@ msgstr ""
"Délka certifikátu serveru, nebo délka zřetězených certifikátů serveru, "
"přesáhla omezení dané kryptografickou knihovnou"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Lidé v okolí"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "Facebook Chat"
-#: ../libempathy/empathy-time.c:100
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
@@ -678,7 +712,7 @@ msgstr[0] "před %d sekundou"
msgstr[1] "před %d sekundami"
msgstr[2] "před %d sekundami"
-#: ../libempathy/empathy-time.c:105
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
@@ -686,7 +720,7 @@ msgstr[0] "před minutou"
msgstr[1] "před %d minutami"
msgstr[2] "před %d minutami"
-#: ../libempathy/empathy-time.c:110
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
@@ -694,7 +728,7 @@ msgstr[0] "před hodinou"
msgstr[1] "před %d hodinami"
msgstr[2] "před %d hodinami"
-#: ../libempathy/empathy-time.c:115
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -702,7 +736,7 @@ msgstr[0] "včera"
msgstr[1] "před %d dny"
msgstr[2] "před %d dny"
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
@@ -710,7 +744,7 @@ msgstr[0] "před týdnem"
msgstr[1] "před %d týdny"
msgstr[2] "před %d týdny"
-#: ../libempathy/empathy-time.c:125
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
@@ -718,75 +752,75 @@ msgstr[0] "před měsícem"
msgstr[1] "před %d měsíci"
msgstr[2] "před %d měsíci"
-#: ../libempathy/empathy-time.c:130
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "v budoucnosti"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Všechny"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Všechny účty"
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Účet"
-#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "Heslo"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:753
-#: ../libempathy-gtk/empathy-account-widget.c:810
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1151
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Účet %s je upravován přes My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1157
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Účet %s nelze upravovat v aplikaci Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1177
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "Spustit My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1515
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Uživatelské jméno:"
-#: ../libempathy-gtk/empathy-account-widget.c:1833
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "_Použít"
-#: ../libempathy-gtk/empathy-account-widget.c:1863
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "Přip_ojit"
-#: ../libempathy-gtk/empathy-account-widget.c:1937
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "Takový účet již existuje"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "Vytvořit nový účet na serveru"
-#: ../libempathy-gtk/empathy-account-widget.c:2132
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "_Zrušit"
@@ -795,19 +829,19 @@ msgstr "_Zrušit"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "Účet služby %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "Nový účet"
@@ -819,6 +853,7 @@ msgstr "<b>Například:</b> MojeZobrazovanéJméno"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -832,7 +867,7 @@ msgstr "Pokročilé"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Heslo:"
@@ -842,7 +877,7 @@ msgstr "_Heslo:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Zapamatovat heslo"
@@ -852,7 +887,7 @@ msgstr "Zapamatovat heslo"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -928,76 +963,84 @@ msgstr "Jaké je váš UIN pro ICQ?"
msgid "What is your ICQ password?"
msgstr "Jaké je vaše heslo k ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Automaticky"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Zaregistrovat"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Volby"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Žádný"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Znaková sada:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Většina serverů IRC heslo nepotřebuje, takže pokud si nejste jisti, žádné "
+"heslo nezadávejte."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Síť"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Síť:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Přezdívka:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Heslo:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Zpráva loučení:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Pravé jméno:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Servery"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Jaká je vaše přezdívka v IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Kterou síť IRC?"
@@ -1132,58 +1175,63 @@ msgid "Discover the STUN server automatically"
msgstr "Automaticky najít server STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Nedbat chyb TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Interval (v sekundách)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Volby (udržovat spojení)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "Volné směrování"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Mechanismus:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "Růžné volby"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "Volby NAT průchodů"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Port:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "Nastavení proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Server STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Přenos:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Jaké je heslo k vašemu účtu SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "Jaké je vaše přihlašovací ID pro SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "_Uživatelské jméno:"
@@ -1207,28 +1255,36 @@ msgstr "Yahoo! I_D:"
msgid "_Room List locale:"
msgstr "Ná_rodní prostředí seznamu místností:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "Nelze konvertovat obrázek"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "Váš systém neobsahuje žádný z podporovaných formátů obrázku"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Nepodařilo se uložit pixbuf do formátu PNG"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "Vyberte si obrázek avataru"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Vyfotografovat…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "Žádný obrázek"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Obrázky"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Všechny soubory"
@@ -1236,35 +1292,61 @@ msgstr "Všechny soubory"
msgid "Click to enlarge"
msgstr "Kliknutím zvětšíte"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "Nepodařilo se navázat spojení"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "Tento kontakt nepodporuje volání"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "Vybraný kontakt je odpojen"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "Vybraný kontakt není platný"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Tento protokol nepodporuje tísňová volání"
+
+#: ../libempathy-gtk/empathy-chat.c:697
msgid "Failed to open private chat"
msgstr "Nepovedlo se otevřít soukromou konverzaci"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:758
msgid "Topic not supported on this conversation"
msgstr "Tato konverzace toto téma nepodporuje"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "You are not allowed to change the topic"
msgstr "Nemáte oprávnění potřebná pro změnu tématu"
-#: ../libempathy-gtk/empathy-chat.c:932
+#: ../libempathy-gtk/empathy-chat.c:968
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "„%s“ není platné ID kontaktu"
+
+#: ../libempathy-gtk/empathy-chat.c:1025
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: vymazat všechny zprávy z této konverzace"
-#: ../libempathy-gtk/empathy-chat.c:935
+#: ../libempathy-gtk/empathy-chat.c:1028
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <téma>: nastavit téma aktuální konverzace"
-#: ../libempathy-gtk/empathy-chat.c:938
+#: ../libempathy-gtk/empathy-chat.c:1031
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID místnosti>: vstoupit do nové místnosti"
-#: ../libempathy-gtk/empathy-chat.c:941
+#: ../libempathy-gtk/empathy-chat.c:1034
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID místnosti>: vstoupit do nové místnosti"
-#: ../libempathy-gtk/empathy-chat.c:946
+#: ../libempathy-gtk/empathy-chat.c:1038
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1272,23 +1354,23 @@ msgstr ""
"/part [<ID místnosti>] [<důvod>]: opustit místnost, bez udání tu právě "
"aktuální"
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:1042
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID kontaktu> [<zpráva>]: otevřít novou soukromou konverzaci"
-#: ../libempathy-gtk/empathy-chat.c:954
+#: ../libempathy-gtk/empathy-chat.c:1045
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID kontaktu> <zpráva>: otevřít novou soukromou konverzaci"
-#: ../libempathy-gtk/empathy-chat.c:957
+#: ../libempathy-gtk/empathy-chat.c:1048
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <přezdívka>: změnit svoji přezdívku na aktuálním serveru"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:1051
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <zpráva>: zaslat zprávu AKCE do aktuální konverzace"
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:1054
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 "
@@ -1298,7 +1380,11 @@ msgstr ""
"posílání zpráv začínajících s „/“. Například: „/say /join je použito pro "
"připojení do místnosti“"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:1059
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID kontaktu>: zobrazit informace o kontaktu"
+
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1306,104 +1392,113 @@ msgstr ""
"/help [<příkaz>]: vypsat seznam podporovaných příkazů. Pokud je zadán "
"<příkaz>, vypsat jeho použití."
-#: ../libempathy-gtk/empathy-chat.c:978
+#: ../libempathy-gtk/empathy-chat.c:1072
#, c-format
msgid "Usage: %s"
msgstr "Použití: %s"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1111
msgid "Unknown command"
msgstr "Neznámý příkaz"
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1237
msgid "Unknown command; see /help for the available commands"
msgstr "Neznámý příkaz, pro výpis dostupných příkazů použijte /help"
-#: ../libempathy-gtk/empathy-chat.c:1281
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1407
+msgid "insufficient balance to send message"
+msgstr "Nemáte dostatečný kredit k poslání zprávy"
+
+#: ../libempathy-gtk/empathy-chat.c:1409
+msgid "not capable"
+msgstr "není k dispozici"
+
+#: ../libempathy-gtk/empathy-chat.c:1416
msgid "offline"
msgstr "odpojen"
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1419
msgid "invalid contact"
msgstr "neplatný kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1422
msgid "permission denied"
msgstr "oprávnění odepřeno"
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1425
msgid "too long message"
msgstr "příliš dlouhá zpráva"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1428
msgid "not implemented"
msgstr "neimplementováno"
-#: ../libempathy-gtk/empathy-chat.c:1297
+#: ../libempathy-gtk/empathy-chat.c:1432
msgid "unknown"
msgstr "neznámý"
-#: ../libempathy-gtk/empathy-chat.c:1302
+#: ../libempathy-gtk/empathy-chat.c:1438
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Chyba při odesílání zprávy „%s“: %s"
-#: ../libempathy-gtk/empathy-chat.c:1306
+#: ../libempathy-gtk/empathy-chat.c:1442
#, c-format
-#| msgid "Error sending message '%s': %s"
msgid "Error sending message: %s"
msgstr "Chyba při odesílání zprávy: %s"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Téma:"
-#: ../libempathy-gtk/empathy-chat.c:1379
+#: ../libempathy-gtk/empathy-chat.c:1515
#, c-format
msgid "Topic set to: %s"
msgstr "Nastavit téma na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1381
+#: ../libempathy-gtk/empathy-chat.c:1517
msgid "No topic defined"
msgstr "Nestanoveno žádné téma"
-#: ../libempathy-gtk/empathy-chat.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2024
msgid "(No Suggestions)"
msgstr "(Žádné návrhy)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1948
+#: ../libempathy-gtk/empathy-chat.c:2092
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Přidat „%s“ do slovníku"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2129
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Přidat „%s“ do slovníku %s"
-#: ../libempathy-gtk/empathy-chat.c:2042
+#: ../libempathy-gtk/empathy-chat.c:2186
msgid "Insert Smiley"
msgstr "Vložit smajlíka"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2060
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Odeslat"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2239
msgid "_Spelling Suggestions"
msgstr "Návrhy pravopi_sných oprav"
-#: ../libempathy-gtk/empathy-chat.c:2184
+#: ../libempathy-gtk/empathy-chat.c:2328
msgid "Failed to retrieve recent logs"
msgstr "Nepovedlo se získat záznam nedávné historie"
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2465
#, c-format
msgid "%s has disconnected"
msgstr "%s se odpojil"
@@ -1411,12 +1506,12 @@ msgstr "%s se odpojil"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2302
+#: ../libempathy-gtk/empathy-chat.c:2472
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s byl vyhozen uživatelem %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2475
#, c-format
msgid "%s was kicked"
msgstr "%s byl vyhozen"
@@ -1424,17 +1519,17 @@ msgstr "%s byl vyhozen"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2483
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s byl zakázán uživatelem %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2316
+#: ../libempathy-gtk/empathy-chat.c:2486
#, c-format
msgid "%s was banned"
msgstr "%s byl zakázán"
-#: ../libempathy-gtk/empathy-chat.c:2320
+#: ../libempathy-gtk/empathy-chat.c:2490
#, c-format
msgid "%s has left the room"
msgstr "%s opustil místnost"
@@ -1444,110 +1539,121 @@ msgstr "%s opustil místnost"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2329
+#: ../libempathy-gtk/empathy-chat.c:2499
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2354
+#: ../libempathy-gtk/empathy-chat.c:2524
#, c-format
msgid "%s has joined the room"
msgstr "%s se připojil do místnosti"
-#: ../libempathy-gtk/empathy-chat.c:2379
+#: ../libempathy-gtk/empathy-chat.c:2549
#, c-format
msgid "%s is now known as %s"
msgstr "%s je teď znám jako %s"
-#: ../libempathy-gtk/empathy-chat.c:2518
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1126
+#: ../libempathy-gtk/empathy-chat.c:2688
+#: ../src/empathy-streamed-media-window.c:1939
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1845
msgid "Disconnected"
msgstr "Odpojen"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3148
+#: ../libempathy-gtk/empathy-chat.c:3332
msgid "Would you like to store this password?"
msgstr "Přejete si uchovat toto heslo?"
-#: ../libempathy-gtk/empathy-chat.c:3154
+#: ../libempathy-gtk/empathy-chat.c:3338
msgid "Remember"
msgstr "Zapamatovat"
-#: ../libempathy-gtk/empathy-chat.c:3164
+#: ../libempathy-gtk/empathy-chat.c:3348
msgid "Not now"
msgstr "Nyní ne"
-#: ../libempathy-gtk/empathy-chat.c:3208
+#: ../libempathy-gtk/empathy-chat.c:3392
msgid "Retry"
msgstr "Opakovat"
-#: ../libempathy-gtk/empathy-chat.c:3212
+#: ../libempathy-gtk/empathy-chat.c:3396
msgid "Wrong password; please try again:"
msgstr "Špatné heslo, zkuste to prosím znovu:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3329
+#: ../libempathy-gtk/empathy-chat.c:3526
msgid "This room is protected by a password:"
msgstr "Tato místnost je chráněna heslem:"
-#: ../libempathy-gtk/empathy-chat.c:3356
+#: ../libempathy-gtk/empathy-chat.c:3553
msgid "Join"
msgstr "Připojit"
-#: ../libempathy-gtk/empathy-chat.c:3526 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:2092
msgid "Connected"
msgstr "Připojen"
-#: ../libempathy-gtk/empathy-chat.c:3579
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3810
msgid "Conversation"
msgstr "Konverzace"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3815
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "Neznámý nebo neplatný identifikátor"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "Blokování kontaktů není dočasně k dispozici"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "Blokování kontaktů není k dispozici"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "Oprávnění odepřeno"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "Nelze blokovat kontakt"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "Upravit blokované kontakty"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Účet:"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokované kontakty"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Kopírovat adresu odkazu"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Otevřít odkaz"
@@ -1572,24 +1678,24 @@ msgid "New Contact"
msgstr "Nový kontakt"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "Blokovat %s?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "_Blokovat"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "Na_hlásit tento kontakt jako obtěžující"
@@ -1616,122 +1722,121 @@ msgstr "Nezařazené do skupiny"
msgid "Favorite People"
msgstr "Oblíbení lidé"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Opravdu chcete odstranit skupinu „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "Skupina se odstraňuje"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2594
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_Odstranit"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Opravdu chcete odstranit kontakt „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "Kontakt se odstraňuje"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Přidat kontakt…"
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "_Blokovat kontakt"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Diskuze"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audiohovor"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videohovor"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "_Předchozí konverzace"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Odeslat soubor"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Sdílet moji plochu"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1761
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Oblíbený"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Infor_mace"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Upravit"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Pozvání do místnosti"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "Pozvat do diskuzní místnost_i"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "Hledat kontakty"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "Hledat: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "Přid_at kontakt"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "Nenalezen žádný kontakt"
@@ -1739,178 +1844,201 @@ msgstr "Nenalezen žádný kontakt"
msgid "Select a contact"
msgstr "Vybrat kontakt"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Celé jméno:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefonní číslo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "E-mailová adresa nenalezena: "
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Webová stránka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Narozeniny:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Naposledy spatřen:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Připojen z:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Zpráva v nepřítomnosti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanály:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "Kód země ISO:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "Země:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Kraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Město:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Oblast:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "PSČ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Ulice:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Budova:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Podlaží:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Místnost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Popis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Úroveň přesnosti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Chyba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Vertikální chyba (v metrech):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Horizontální chyba (v metrech):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Rychlost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Azimut:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Rychlost stoupání:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Poslední aktualizace:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Zeměpisná délka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Zeměpisná šířka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Nadmořská výška:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:886
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Poloha"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:940
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y v %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1022
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Uložit avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:1078
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Nelze uložit avatar"
@@ -1920,7 +2048,7 @@ msgstr "<b>Poloha</b> (dne)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Alias:"
@@ -1940,7 +2068,7 @@ msgstr "Podrobnosti o kontaktu"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Identifikátor:"
@@ -1957,11 +2085,11 @@ msgstr "OS:"
msgid "Version:"
msgstr "Verze:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Skupiny"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1969,28 +2097,28 @@ msgstr ""
"Vyberte skupiny, do kterých má kontakt patřit. Můžete vybrat více než jednu "
"skupinu, ale také nevybrat žádnou skupinu."
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_Přidat skupinu"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Vybrat"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Skupina"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "Následující identita bude blokována:"
msgstr[1] "Následující identity budou blokovány:"
msgstr[2] "Následující identity budou blokovány:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "Následující identitu nelze blokovat:"
@@ -1998,47 +2126,53 @@ msgstr[1] "Následující identity nelze blokovat:"
msgstr[2] "Následující identity nelze blokovat:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "Pospojované kontakty"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "Vyberte kontakty, které se mají pospojovat"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "Náhled nového kontaktu"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
msgstr "Kontakty vybrané v seznamu na levé straně budou pospojovány dohromady."
#. 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Upravit"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "Po_spojovat kontakty…"
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "Smazat a _blokovat"
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2047,7 +2181,7 @@ msgstr ""
"Opravdu chcete odstranit pospojovaný kontakt „%s“? Uvědomte si, že tím se "
"odstraní všechny kontakty, které tento pospojovaný kontakt tvoří."
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2131,65 +2265,199 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Rozpojit"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Datum"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Historie"
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Zobrazit"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Hledat"
+
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Konverzace v místnosti %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Konverzace s kontaktem %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Hovor trval %s, skončil %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Dnes"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Včera"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e. %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Kdykoli"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Kdokoli"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Kdo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Kdy"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Cokoli"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
msgstr "Konverzace"
+#: ../libempathy-gtk/empathy-log-window.c:2775
+msgid "Calls"
+msgstr "Hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Příchozí hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Odchozí hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Zmeškané hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "Co"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Opravdu chcete vymazat všechny předchozí konverzace?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "Vymazat vše"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Smazat z:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Načítá se…</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1344
+msgid "Call"
+msgstr "Hovor"
+
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Najít následující"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Diskuze"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Najít předchozí"
+msgid "Delete All History..."
+msgstr "Vymazat historii"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Předchozí konverzace"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Hledat"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_Upravit"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Soubor"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Co:"
+msgid "page 2"
+msgstr "strana 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "ID kontaktu:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "_Diskuze"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Nová konverzace"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Odeslat _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "Vol_at"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Nový hovor"
@@ -2208,34 +2476,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Vlastní zpráva…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Upravit vlastní zprávy…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "Kliknutím odstraníte stav z oblíbených"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "Kliknutím přidáte stav do oblíbených"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Nastavit stav"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "Nastavit přítomnost a aktuální stav"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Vlastní zprávy…"
@@ -2248,6 +2516,14 @@ msgstr "Vlastní zprávy…"
msgid "New %s account"
msgstr "Nový účet %s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Najít následující"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Najít předchozí"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Najít:"
@@ -2300,35 +2576,38 @@ msgstr "Odchozí hovor"
msgid "Voice call ended"
msgstr "Hovor ukončen"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Zadejte vlastní zprávu"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "Upravit vlastní zprávy"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Uložit _novou stavovou zprávu"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Zpráva upravena %s"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Uložené stavové zprávy"
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+msgid "Normal"
+msgstr "Normální"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Klasický"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Jednoduchý"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Čistý"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Modrý"
@@ -2403,19 +2682,19 @@ msgstr "Zapamatovat tuto volbu pro budoucí připojení"
msgid "Certificate Details"
msgstr "Podrobnosti certifikátu"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "Nelze otevřít URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1748
msgid "Select a file"
msgstr "Vybrat soubor"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1820
msgid "Insufficient free space to save file"
msgstr "Nedostatek volného místa pro uložení souboru"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1828
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2424,7 +2703,7 @@ msgstr ""
"Pro uložení tohoto souboru je zapotřebí %s volného místa, ale k dispozici je "
"jen %s. Zvolte prosím jiné umístění."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Příchozí soubor od %s"
@@ -2612,23 +2891,23 @@ msgstr "Není dostupné chybové hlášení"
msgid "Instant Message (Empathy)"
msgstr "Rychlá zpráva (Empathy)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Nepřipojovat se po spuštění"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuštění"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "– komunikátor Empathy"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Chyba při kontaktování správce účtu"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2785,8 +3064,8 @@ msgid "Select the accounts you want to import:"
msgstr "Vyberte účty, které mají být importovány:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Ano"
@@ -2861,7 +3140,7 @@ msgid "Your new account has not been saved yet."
msgstr "Váš nový účet ještě není uložen."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:875
msgid "Connecting…"
msgstr "Probíhá připojování…"
@@ -2904,7 +3183,7 @@ msgstr "Opravdu chcete odstranit z vašeho počítače „%s“?"
msgid "This will not remove your account on the server."
msgstr "Toto neodstraní váš účet na serveru."
-#: ../src/empathy-accounts-dialog.c:1434
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2913,15 +3192,15 @@ msgstr ""
"provedené změny. Jste si jisti, že chcete pokračovat?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1652
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Povolit"
-#: ../src/empathy-accounts-dialog.c:1653
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "_Zakázat"
-#: ../src/empathy-accounts-dialog.c:2174
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2930,18 +3209,22 @@ msgstr ""
"provedené změny. Jste si jisti, že chcete pokračovat?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Přidat…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Načítají se informace o účtu"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Nenainstalován žádný protokol"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Protokol:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2949,19 +3232,15 @@ msgstr ""
"Chcete-li přidat nový účet, musíte nejdříve nainstalovat podpůrnou vrstvu "
"každého protokolu, který chcete používat."
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Přidat…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_Import…"
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr "– klient Empathy na ověření totožnosti"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Klient Empathy na ověření totožnosti"
@@ -2969,118 +3248,121 @@ msgstr "Klient Empathy na ověření totožnosti"
msgid "People nearby"
msgstr "Lidé v okolí"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "– audio/videoklient Empathy"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Audio/videoklient Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Jas"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:564
msgid "Volume"
msgstr "Hlasitost"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1157
+#: ../src/empathy-call-window.ui.h:22
msgid "_Sidebar"
msgstr "Po_straní lišta"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1177
+#: ../src/empathy-call-window.c:1136
msgid "Audio input"
msgstr "Vstup zvuku"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1181
+#: ../src/empathy-call-window.c:1140
msgid "Video input"
msgstr "Vstup videa"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-call-window.c:1144
msgid "Dialpad"
msgstr "Tlačítka vytáčení"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1196
+#: ../src/empathy-call-window.c:1154
msgid "Details"
msgstr "Podrobnosti"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1265
+#: ../src/empathy-call-window.c:1237
#, c-format
msgid "Call with %s"
msgstr "Hovor s %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Hovor"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1498
+#: ../src/empathy-call-window.c:1434
msgid "The IP address as seen by the machine"
msgstr "Adresa IP, jak ji vidí počítač"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-call-window.c:1436
msgid "The IP address as seen by a server on the Internet"
msgstr "Adresa IP, jak ji vidí server v Internetu"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-call-window.c:1438
msgid "The IP address of the peer as seen by the other side"
msgstr "Adresa IP vzájemného spojení, jak ji vidí druhá strana"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-call-window.c:1440
msgid "The IP address of a relay server"
msgstr "Adresa IP přenosového serveru"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-call-window.c:1442
msgid "The IP address of the multicast group"
msgstr "Adresa IP vysílací skupiny"
-#: ../src/empathy-streamed-media-window.c:1906
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1888
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Neznámý"
-#: ../src/empathy-streamed-media-window.c:1909
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1891
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Neznámý"
-#: ../src/empathy-streamed-media-window.c:1912
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1894
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Neznámý"
-#: ../src/empathy-streamed-media-window.c:1915
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1897
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Neznámý"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2189
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Připojeno — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2250
+#: ../src/empathy-call-window.c:2154
msgid "Technical Details"
msgstr "Technické podrobnosti"
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2192
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3089,7 +3371,8 @@ msgstr ""
"Software používaný kontaktem „%s“ nerozumí žádnému z formátů zvuku, který je "
"podporován na vašem počítači"
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2293
+#: ../src/empathy-call-window.c:2197
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3098,7 +3381,8 @@ msgstr ""
"Software používaný kontaktem „%s“ nerozumí žádnému z formátů videa, který je "
"podporován na vašem počítači"
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2299
+#: ../src/empathy-call-window.c:2203
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3107,25 +3391,29 @@ msgstr ""
"Nelze navázat spojení s %s. Někdo z vás není nejspíš v síti, která podporuje "
"přímá spojení."
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2305
+#: ../src/empathy-call-window.c:2209
msgid "There was a failure on the network"
msgstr "Někde na síti došlo k selhání"
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2309
+#: ../src/empathy-call-window.c:2213
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Nemáte nainstalovánu podporu žádného z formátů zvuku potřebného pro tento "
"hovor"
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2312
+#: ../src/empathy-call-window.c:2216
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Nemáte nainstalovánu podporu žádného z formátů videa potřebného pro tento "
"hovor"
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:2228
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3136,123 +3424,127 @@ msgstr ""
"prosím tuto chybu</a> a přiložte chybové zprávy získané z odlaďovacího okna "
"v nabídce „Nápověda“."
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:2237
msgid "There was a failure in the call engine"
msgstr "Selhala funkce pro volání"
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:2240
msgid "The end of the stream was reached"
msgstr "Byl dosažen konec proudu"
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-call-window.c:2280
msgid "Can't establish audio stream"
msgstr "Nelze navázat spojení pro přenos zvuku"
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2383
+#: ../src/empathy-call-window.c:2290
msgid "Can't establish video stream"
msgstr "Nelze navázat spojení pro přenos obrazu"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Zvuk"
#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:2
msgid "Call the contact again"
msgstr "Znovu zavolat"
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera vypnuta"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Kodek pro dekódování:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera zapnuta"
+msgid "Disable camera"
+msgstr "Zakázat videokameru"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek pro dekódování:"
+msgid "Display the dialpad"
+msgstr "Zobrazit číselník"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Vypnout kameru a přestat vysílat obraz"
-
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Zapnout kameru a povolit vysílání obrazu"
-
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Zapnout kameru ale nepovolovat vysílání obrazu"
-
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "Kodek pro kódování:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "Zavěsit"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "Zavěsit současný hovor"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "Místní účastník:"
-#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Náhled"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Maximalizovat"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimalizovat"
+
+#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:14
msgid "Redial"
msgstr "Vytočit znovu"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Vzdálený účastník:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
-msgstr "Odeslat zvuk"
+msgstr "Vysílat zvuk"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Send Video"
+msgstr "Vysílat obraz"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Show dialpad"
+msgstr "Zobrazit číselník"
#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
-msgstr "Přepnout vysílání zvuku"
+msgstr "Přepnout přenos zvuku"
#: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Neznámo"
+msgid "Toggle video transmission"
+msgstr "Přepnout vysílání obrazu"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
-
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1800 ../src/empathy-call-window.c:1801
+#: ../src/empathy-call-window.c:1802 ../src/empathy-call-window.c:1803
+msgid "Unknown"
+msgstr "Neznámo"
#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video zakázáno"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video povoleno"
-
-#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Náhled videa"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Hovor"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Zobrazit"
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3260,7 +3552,7 @@ msgstr[0] "%s (%d nepřečtena)"
msgstr[1] "%s (%d nepřečtené)"
msgstr[2] "%s (%d nepřečtených)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3268,7 +3560,7 @@ msgstr[0] "%s (a %u další)"
msgstr[1] "%s (a %u další)"
msgstr[2] "%s (a %u dalších)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3276,7 +3568,7 @@ msgstr[0] "%s (%d nepřečtená od ostatních)"
msgstr[1] "%s (%d nepřečtené od ostatních)"
msgstr[2] "%s (%d nepřečtených od ostatních)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3284,7 +3576,19 @@ msgstr[0] "%s (%d nepřečtená ode všech)"
msgstr[1] "%s (%d nepřečtené ode všech)"
msgstr[2] "%s (%d nepřečtených ode všech)"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Odesílá se zpráva"
+msgstr[1] "Odesílají se %d zprávy"
+msgstr[2] "Odesílá se %d zpráv"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Píše zprávu."
@@ -3296,10 +3600,6 @@ msgstr "_Vymazat"
msgid "C_ontact"
msgstr "K_ontakt"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Diskuze"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Vložit _smajlíka"
@@ -3320,7 +3620,7 @@ msgstr "Posunout kartu do_prava"
msgid "Notify for All Messages"
msgstr "Upozorňovat na všechny zprávy"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "_Obsah"
@@ -3332,15 +3632,11 @@ msgstr "_Konverzace"
msgid "_Detach Tab"
msgstr "_Oddělit kartu"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Upravit"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Oblíbená diskuzní místnost"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "_Nápověda"
@@ -3364,15 +3660,15 @@ msgstr "_Karty"
msgid "_Undo Close Tab"
msgstr "_Znovu otevřít zavřenou záložku"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Jméno"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Místnost"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Automaticky připojit"
@@ -3380,90 +3676,95 @@ msgstr "Automaticky připojit"
msgid "Manage Favorite Rooms"
msgstr "Spravovat oblíbené místnosti"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "Příchozí videohovor"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Příchozí hovor"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "Volá vám %s, chcete to zvednout?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "Volá vám %s, chcete to zvednout?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Příchozí hovor od %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "O_dmítnout"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_Zvednout"
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_Videohovor"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "Příchozí videohovor od %s"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Pozvání do místnosti"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Pozvánka na připojení %s"
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vás zve do %s"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "O_dmítnout"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "Připo_jit"
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vás pozval do %s"
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Byli jste pozváni do %s"
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Příchozí přenos souboru od %s"
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Požadováno heslo"
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s by chtěl oprávnění vidět, když jste dostupný"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3549,7 +3850,7 @@ msgstr "„%s“ odeslán kontaktu %s"
msgid "File transfer completed"
msgstr "Přenos souboru byl dokončen"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Čeká se na odpověď ostatních účastníků"
@@ -3563,15 +3864,11 @@ msgstr "Ověřuje se neporušenost „%s“"
msgid "Hashing \"%s\""
msgstr "Vytváří se kontrolní součet „%s“"
-#: ../src/empathy-ft-manager.c:1029
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Soubor"
-#: ../src/empathy-ft-manager.c:1063
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Zbývá"
@@ -3608,39 +3905,55 @@ msgstr "Protokol"
msgid "Source"
msgstr "Zdroj"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "Poskytnout heslo"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Odpojit"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Nic nenalezeno"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Znovu připojit"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Upravit účet"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Zavřít"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Dobít kredit %s (%s)…"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Dobít kredit účtu"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "Dobít kredit…"
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
msgstr "Seznam kontaktů"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "Zobrazit a upravit účty"
@@ -3649,86 +3962,90 @@ msgid "Contacts on a _Map"
msgstr "Kontakty na _mapě"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "Zůstatek kreditu"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "Najít v seznamu _kontaktů"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Připojit se do _oblíbených"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Spravovat oblíbené"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "N_ormální velikost"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nový _hovor…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normální velikost, s _avatary"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "_Nastavení"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Vypsat p_rotokoly"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Řadit podle jmé_na"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Řadit podle s_tavu"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "Úč_ty"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "_Blokované kontakty"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "_Kompaktní velikost"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "La_dit"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Přenosy _souborů"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "Připo_jit…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nová konverzace…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "_Odpojené kontakty"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "_O mně"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Místnost"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "_Hledat kontakty…"
@@ -3742,7 +4059,7 @@ msgstr "Členové"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3755,16 +4072,16 @@ msgstr ""
"Je vyžadováno heslo: %s\n"
"Členové: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Nelze začít s výpisem místností"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "Nelze skončit s výpisem místností"
@@ -3799,39 +4116,79 @@ msgstr "Seznam místností"
msgid "_Room:"
msgstr "_Místnost:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:156
msgid "Message received"
msgstr "Zpráva přijata"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:157
msgid "Message sent"
msgstr "Zpráva odeslána"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:158
msgid "New conversation"
msgstr "Nová konverzace"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:159
msgid "Contact goes online"
msgstr "Kontakt se připojil"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:160
msgid "Contact goes offline"
msgstr "Kontakt se odpojil"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:161
msgid "Account connected"
msgstr "Účet připojen"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:162
msgid "Account disconnected"
msgstr "Účet odpojen"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:459
msgid "Language"
msgstr "Jazyk"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:709
+msgid "Juliet"
+msgstr "Julie"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:716
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:722
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ach Romeo, Romeo! Proč jsi Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:725
+msgid "Deny thy father and refuse thy name;"
+msgstr "Své jméno zapři, odřekni se otce,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:728
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "anebo, nechceš-li, zasvěť se mně,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:731
+msgid "And I'll no longer be a Capulet."
+msgstr "a přestanu být Kapuletová."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Mám ještě poslouchat? Či odpovím?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:737
+msgid "Juliet has disconnected"
+msgstr "Julie se odpojila"
+
+#: ../src/empathy-preferences.c:1135
msgid "Preferences"
msgstr "Nastavení"
@@ -3937,39 +4294,43 @@ msgid "Themes"
msgstr "Motivy"
#: ../src/empathy-preferences.ui.h:25
+msgid "Variant:"
+msgstr "Varianta:"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Automatically connect on startup"
msgstr "Připojovat se _automaticky po spuštění "
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Cellphone"
msgstr "_Mobil"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
msgstr "P_ovolit bublinová upozornění"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
msgstr "_Povolit zvuková upozornění"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Network (IP, Wi-Fi)"
msgstr "_Síť (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Open new chats in separate windows"
msgstr "_Otevírat nové diskuze v oddělených oknech"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Publish location to my contacts"
msgstr "Zveřejnit _kontaktům polohu"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Reduce location accuracy"
msgstr "O_mezit přesnost polohy"
@@ -3981,6 +4342,46 @@ msgstr "Stav"
msgid "_Quit"
msgstr "U_končit"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera vypnuta"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera zapnuta"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Vypnout kameru a přestat vysílat obraz"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Zapnout kameru a povolit vysílání obrazu"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Zapnout kameru ale nepovolovat vysílání obrazu"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Náhled"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video zakázáno"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video povoleno"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Náhled videa"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Zobrazení kontaktů na mapě"
@@ -4047,16 +4448,16 @@ msgid ""
"extension."
msgstr "Vybraný správce připojení nepodporuje rozšíření pro vzdálené ladění."
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "Přizvat účastníka"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
msgstr "Zvolte kontakt, který chcete přizvat do konverzace: "
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "Pozvat"
@@ -4097,45 +4498,63 @@ msgstr "Ladění Empathy"
msgid "- Empathy Chat Client"
msgstr "– komunikační klient Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "Odpovědět"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Odmítnout"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Zvednout"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Videohovor"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Odmítnout"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Přijmout"
-#: ../src/empathy-notifications-approver.c:223
-#| msgid "Preview"
+#: ../src/empathy-notifications-approver.c:260
msgid "Provide"
msgstr "Poskytnout"
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Zmeškaný hovor od %s"
-
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s vám právě zkouší volat, ale vy máte jiný hovor."
-#~ msgid "_Enabled"
-#~ msgstr "Povol_en"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:782 ../src/empathy-call-window.c:796
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1244
+#, c-format
+msgid "Call with %d participants"
+msgstr "Hovor s %d účastníky"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2091
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:2092
+msgid "On hold"
+msgstr "Čeká na lince"
-#~ msgid "Context"
-#~ msgstr "Kontext"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Rozlišovat velikost _znaků"
diff --git a/po/es.po b/po/es.po
index 1aef074cf..a65995665 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,23 @@
# translation of empathy.master.po to Español
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the Gossip package.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
#
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: 2011-07-25 11:44+0000\n"
-"PO-Revision-Date: 2011-07-25 21:30+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-08-15 13:23+0000\n"
+"PO-Revision-Date: 2011-08-17 01:41+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: Español <gnome-es-list@gnome.org>\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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -40,6 +40,19 @@ msgid "Always open a separate chat window for new chats."
msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volumen de la llamada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volumen de la llamada, como porcentaje"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "Dispositivo de cámara"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -47,50 +60,56 @@ msgstr ""
"Carácter que añadir después del apodo cuando se usa el completado de apodos "
"(tab) en salas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme"
msgstr "Tema de la ventana de charla"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Chat window theme variant"
msgstr "Variante del tema de la ventana de charla"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
"(ej. «es, en, fr»)."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Compact contact list"
msgstr "Lista compacta de contactos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Connection managers should be used"
msgstr "Se deberían usar gestores de conexión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Contact list sort criterion"
msgstr "Criterio de ordenación de la lista de contactos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
+"ej. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Default directory to select an avatar image from"
msgstr "Carpeta predeterminada para seleccionar un avatar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Disable popup notifications when away"
msgstr "Desactivar las notificaciones emergentes al estar ausente"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable sounds when away"
msgstr "Desactivar los sonidos al ausentarse"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Display incoming events in the status area"
msgstr "Mostrar los eventos entrantes en el área de estado"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -98,252 +117,256 @@ msgstr ""
"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
"directamente al usuario."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "Soporte de cancelación de eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can publish the user's location"
msgstr "Empathy puede publicar la ubicación del usuario"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy puede usar el GPS para deducir la ubicación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the network to guess the location"
msgstr "Empathy puede usar la red para deducir la ubicación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy default download folder"
msgstr "Carpeta de descargas predeterminada de Epiphany"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy ha migrado los registros de butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should auto-away when idle"
msgstr "Empathy debería mostrar ausencia en inactividad"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-connect on startup"
msgstr "Empathy se debería autoconectar al inicio"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy debería reducir la precisión de la ubicación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Enable WebKit Developer Tools"
msgstr "Activar las herramientas de desarrollo de WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable popup notifications for new messages"
msgstr "Activar notificaciones emergentes para mensajes nuevos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Enable spell checker"
msgstr "Activar revisor ortográfico"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Hide main window"
msgstr "Ocultar la ventana principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Hide the main window."
msgstr "Ocultar la ventana principal."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Nick completed character"
msgstr "Carácter de completado de apodo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Open new chats in separate windows"
msgstr "Abrir chats nuevos en ventanas separadas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Path of the Adium theme to use"
msgstr "Ruta del tema Adium que usar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound for incoming messages"
msgstr "Reproducir un sonido cuando lleguen mensajes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for new conversations"
msgstr "Reproducir un sonido para conversaciones nuevas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for outgoing messages"
msgstr "Reproducir un sonido al enviar mensajes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when a contact logs in"
msgstr "Reproducir un sonido cuando un contacto inicie sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound when a contact logs out"
msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when we log in"
msgstr "Reproducir un sonido cuando inicio sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when we log out"
msgstr "Reproducir un sonido al finalizar una sesión"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Pop up notifications if the chat isn't focused"
msgstr ""
"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Pop up notifications when a contact logs in"
msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications when a contact logs out"
msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show Balance in contact list"
msgstr "Mostrar crédito en la lista de contactos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show avatars"
msgstr "Mostrar avatares"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show contact list in rooms"
msgstr "Mostrar lista de contactos en salas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show hint about closing the main window"
msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show offline contacts"
msgstr "Mostrar contactos no conectados"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show protocols"
msgstr "Mostrar protocolos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Spell checking languages"
msgstr "Idiomas para revisión ortográfica"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The default folder to save file transfers in."
msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The last directory that an avatar image was chosen from."
msgstr "Última carpeta de la que se eligió un avatar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The position for the chat window side pane"
msgstr "La posición para el panel lateral de la ventana de charla"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
"La posición almacenada (en píxeles) del panel lateral de la ventana de "
"charla."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"El tema que se usará para mostrar la conversación en las ventanas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr ""
"La variante del tema que se usará para mostrar la conversación en las "
"ventanas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Use graphical smileys"
msgstr "Usar emoticonos gráficos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Use notification sounds"
msgstr "Usar sonidos de notificación"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use theme for chat rooms"
msgstr "Usar tema para salas de chat"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indica si Empathy puede usar la red telefónica móvil para deducir la "
"ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the network to guess the location."
msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Indica si Empathy ha migrado los registros de butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
"inicio."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
"usuario está inactivo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
"de privacidad."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Indica si Empathy debería usar el avatar del contacto como el icono de la "
"ventana de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
"web, den activarse."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -351,78 +374,83 @@ msgstr ""
"Indica si se debe usan usar gestores de conectividad para desconectarse/"
"reconectarse automáticamente."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
"con los que quiere comprobarlo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
"conversaciones."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
"de los contactos en la red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
"sesión de los contactos en la red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound to notify of events."
msgstr "Indica si se debe reproducir un sonido para notificar eventos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes salientes."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to play a sound when logging into a network."
msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to play a sound when logging out of a network."
msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
"ausente u ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
"se desconecta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
"se conecta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -430,50 +458,50 @@ msgstr ""
"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show account balances in the contact list."
msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Indica si se debe mostrar los contactos que están desconectados en la lista "
"de contactos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
"ausente u ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
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."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Whether to show the contact list in chat rooms."
msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
msgid "Whether to show the contact list in compact mode."
msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -481,11 +509,11 @@ msgstr ""
"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
"principal con el botón «x» en la barra de título."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
msgid "Whether to use the theme for chat rooms."
msgstr "Indica si se debe usar el tema para salas de chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -604,7 +632,7 @@ msgid "Status is set to offline"
msgstr "El estado se ha establecido a desconectado"
#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Network error"
msgstr "Error de red"
@@ -778,67 +806,67 @@ msgstr "en el futuro"
msgid "All accounts"
msgstr "Todas las cuentas"
-#: ../libempathy-gtk/empathy-account-widget.c:691
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Cuenta"
-#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "Contraseña"
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Puerto"
-#: ../libempathy-gtk/empathy-account-widget.c:766
-#: ../libempathy-gtk/empathy-account-widget.c:823
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1164
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "La vuenta %s se edita a través de My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1170
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "No se puede editar la cuenta %s en Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1190
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "Lanzar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1532
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1848
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "_Aplicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1878
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "Iniciar _sesión"
-#: ../libempathy-gtk/empathy-account-widget.c:1952
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2147
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -847,19 +875,19 @@ msgstr "Ca_ncelar"
#. * 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:2425
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s en %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2451
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2455
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "Cuenta nueva"
@@ -1309,61 +1337,61 @@ msgstr "Todos los archivos"
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
msgid "There was an error starting the call"
msgstr "Hubo un error al iniciar la llamada"
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "The specified contact doesn't support calls"
msgstr "El contacto especificado no soporta llamadas"
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
msgid "The specified contact is offline"
msgstr "El contacto especificado está desconectado"
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
msgid "The specified contact is not valid"
msgstr "El contacto especificado no es válido"
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
msgid "Emergency calls are not supported on this protocol"
msgstr "Este protocolo no soporta llamadas de emergencia"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "%s no es un identificador de contacto válido"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: limpiar todos los mensajes de la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: establecer el tema para la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1371,23 +1399,23 @@ msgstr ""
"/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
"actual de manera predeterminada"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1397,11 +1425,11 @@ msgstr ""
"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:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1409,113 +1437,113 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "no tiene balance suficiente para enviar el mensaje"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "no es posible"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Error al enviar el mensaje: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Añadir «%s» al diccionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Añadir «%s» al diccionario de «%s»"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
msgid "_Send"
msgstr "E_nviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1523,12 +1551,12 @@ msgstr "%s se ha desconectado"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1536,17 +1564,17 @@ msgstr "%s fue expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1556,69 +1584,68 @@ msgstr "%s ha dejado la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1845
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2264
msgid "Disconnected"
msgstr "Desconectado"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "¿Quiere guardar esta contraseña?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Recordar"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Ahora no"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2092
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Conversación"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -2033,7 +2060,7 @@ msgstr "Altitud:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Ubicación geográfica"
@@ -2376,6 +2403,7 @@ msgid "Text chats"
msgstr "Chats de texto"
#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "Llamadas"
@@ -2416,7 +2444,8 @@ msgstr "<span size=\"x-large\">Cargando…</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "Llamar"
@@ -2434,13 +2463,14 @@ msgid "Profile"
msgstr "Perfil"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "Vídeo"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "_Editar"
@@ -2709,15 +2739,15 @@ msgstr "Detalles del certificado"
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
msgid "Insufficient free space to save file"
msgstr "No hay espacio suficiente para guardar el archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2726,7 +2756,7 @@ msgstr ""
"Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s "
"disponible. Elija otra ubicación."
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
#, c-format
msgid "Incoming file from %s"
msgstr "Archivo entrante de %s"
@@ -2914,23 +2944,23 @@ msgstr "Sin mensaje de eeror"
msgid "Instant Message (Empathy)"
msgstr "Mensaje instantáneo (Empathy)"
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "No conectarse automáticamente al inicio"
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- Cliente de mensajería instantánea Empathy"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "Error al contactar con el Gestor de cuentas"
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3159,7 +3189,8 @@ msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:875
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1098
msgid "Connecting…"
msgstr "Conectando…"
@@ -3267,121 +3298,116 @@ msgstr "Cliente de autenticación de Empathy"
msgid "People nearby"
msgstr "Gente cerca"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
msgid "- Empathy Audio/Video Client"
msgstr ": Cliente de sonido/vídeo Empathy"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
msgid "Empathy Audio/Video Client"
msgstr "Cliente de sonido/vídeo Empathy"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:453
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:456
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:459
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:564
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Entrada de voz"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1144
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Teclado de llamada"
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1154
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Detalles"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1237
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1599
#, c-format
msgid "Call with %s"
msgstr "Llamada con %s"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1434
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1843
msgid "The IP address as seen by the machine"
msgstr "La dirección IP como la ve la máquina"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1436
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1845
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-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1438
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1847
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-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1440
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1849
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1442
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1851
msgid "The IP address of the multicast group"
msgstr "La dirección IP del grupo multicast"
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Desconocido"
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Desconocido"
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Desconocido"
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Desconocido"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2154
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2583
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2621
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3390,8 +3416,8 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2197
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2626
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3400,8 +3426,8 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2203
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2632
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3410,29 +3436,29 @@ 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-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2209
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2638
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2213
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2642
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-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2645
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-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2228
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2657
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3443,36 +3469,31 @@ 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-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2666
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2240
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2669
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2280
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2709
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2290
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2719
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Sonido"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Llamar de nuevo al contacto"
-
#: ../src/empathy-call-window.ui.h:3
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
@@ -3515,50 +3536,89 @@ msgid "Minimise me"
msgstr "Minimizarme"
#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Volver a llamar"
-
-#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Candidato remoto:"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Enviar voz"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
msgid "Send Video"
msgstr "Enviar vídeo"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
msgid "Show dialpad"
msgstr "Mostrar teclado de llamada"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Iniciar una llamada de vídeo"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Iniciar una llamada de voz"
+
+#: ../src/empathy-call-window.ui.h:18
+#| msgid "Disable camera"
+msgid "Swap camera"
+msgstr "Intercambiar cámara"
+
+#: ../src/empathy-call-window.ui.h:19
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Conmutar la transmisión de voz"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Toggle video transmission"
msgstr "Conmutar la transmisión de vídeo"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1800 ../src/empathy-call-window.c:1801
-#: ../src/empathy-call-window.c:1802 ../src/empathy-call-window.c:1803
+#: ../src/empathy-call-window.c:2219 ../src/empathy-call-window.c:2220
+#: ../src/empathy-call-window.c:2221 ../src/empathy-call-window.c:2222
msgid "Unknown"
msgstr "Desconocido"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video call"
+msgstr "Llamada de vídeo"
+
+#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Llamar"
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "_Cámara"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "Índ_ice"
+
+#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_Depurar"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Micrófono"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Configuración"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Ver"
@@ -3634,10 +3694,6 @@ msgstr "Mover pestaña a la _derecha"
msgid "Notify for All Messages"
msgstr "Notificar para todos los mensajes"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "Índ_ice"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Conversación"
@@ -3650,10 +3706,6 @@ msgstr "_Desacoplar pestaña"
msgid "_Favorite Chat Room"
msgstr "Sala de chat _favorita"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "Ay_uda"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "Pestaña _siguiente"
@@ -3965,11 +4017,11 @@ msgstr "Recargar…"
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "Lista de contactos"
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
@@ -4033,10 +4085,6 @@ msgstr "Contactos _bloqueados"
msgid "_Compact Size"
msgstr "Tamaño _compacto"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Depurar"
-
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "_Transferencias de archivos"
@@ -4132,79 +4180,79 @@ msgstr "Lista de salas"
msgid "_Room:"
msgstr "_Sala:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:172
msgid "Message received"
msgstr "Mensaje recibido"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:173
msgid "Message sent"
msgstr "Mensaje enviado"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:174
msgid "New conversation"
msgstr "Conversación nueva"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:175
msgid "Contact goes online"
msgstr "El contacto se conecta"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:176
msgid "Contact goes offline"
msgstr "El contacto se desconecta"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:177
msgid "Account connected"
msgstr "Cuenta conectada"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:178
msgid "Account disconnected"
msgstr "Cuenta desconectada"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:487
msgid "Language"
msgstr "Idioma"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:737
msgid "Juliet"
msgstr "Julieta"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:744
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:750
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:753
msgid "Deny thy father and refuse thy name;"
msgstr "Niega a tu padre y rehúsa tu nombre;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:756
msgid "Or if thou wilt not, be but sworn my love"
msgstr "O, si no quieres, júrame tan sólo que me amas"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:759
msgid "And I'll no longer be a Capulet."
msgstr "Y dejaré yo de ser una Capuleto"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:762
msgid "Shall I hear more, or shall I speak at this?"
msgstr "¿Debo oír más o contestar a lo dicho?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:765
msgid "Juliet has disconnected"
msgstr "Julieta se ha desconectado"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1171
msgid "Preferences"
msgstr "Preferencias"
@@ -4212,67 +4260,75 @@ msgstr "Preferencias"
msgid "Appearance"
msgstr "Apariencia"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Comportamiento"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "_Tema del chat:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Mostrar los eventos entrantes en el área de notificación"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Activar notificaciones cuando un contacto se conecta"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Activar notificaciones cuando un contacto se desconecta"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Activar notificaciones cuando el _chat no tenga el foco"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Activar la revisión ortográfica para idiomas:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "General"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Nivel de entrada"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Volumen de entrada"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Orígenes de las ubicaciones:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Registrar conversaciones"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notificaciones"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Reproducir sonido para eventos"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Privacidad"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4282,23 +4338,23 @@ msgstr ""
"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
"aleatorio añadido 1 lugar decimal."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "Mostrar los _emoticonos como imágenes"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Mostrar _lista de contactos en salas"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Sonidos"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Revisión ortográfica"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -4306,48 +4362,48 @@ msgstr ""
"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
"diccionario instalado."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "Variante:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "C_onectarse automáticamente al inicio"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "Teléfono _móvil"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Activar notificaciones de burbuja"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Activar notificaciones de sonido"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Red (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_Abrir charlas nuevas en ventanas separadas"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publicar mi ubicación a mis contactos"
#. 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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Reducir la precisión de la ubicación"
@@ -4359,6 +4415,10 @@ msgstr "Estado"
msgid "_Quit"
msgstr "_Salir"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Llamar de nuevo al contacto"
+
#: ../src/empathy-streamed-media-window.ui.h:3
msgid "Camera Off"
msgstr "Cámara apagada"
@@ -4383,6 +4443,10 @@ msgstr "Activar la cámara pero no enviar vídeo"
msgid "Preview"
msgstr "Vista previa"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Volver a llamar"
+
#: ../src/empathy-streamed-media-window.ui.h:19
msgid "V_ideo"
msgstr "Ví_deo"
@@ -4403,63 +4467,63 @@ msgstr "Vista preliminar del vídeo"
msgid "Contact Map View"
msgstr "Vista del mapa de contactos"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "Guardar"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "Depurar ventana"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "Pausar"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "Depurar"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "Mensaje"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "Advertencia"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4467,16 +4531,16 @@ msgstr ""
"El gestor de conexiones seleccionado no soporta la extensión de depuración "
"remota."
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "Invitar participante"
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "Elegir un contacto para invitar a la conversación:"
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "Invitar"
@@ -4508,7 +4572,15 @@ msgstr ": Cuentas en Empathy"
msgid "Empathy Accounts"
msgstr "Cuentas en Empathy"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Mostrar un servicio en particular"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador de Empathy"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
@@ -4554,29 +4626,35 @@ 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:782 ../src/empathy-call-window.c:796
+#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1000
msgid "i"
msgstr "Información"
-#: ../src/empathy-call-window.c:1244
-#, c-format
-msgid "Call with %d participants"
-msgstr "Llamada con %d participantes"
+#: ../src/empathy-call-window.c:2512
+msgid "On hold"
+msgstr "En espera"
+
+#: ../src/empathy-call-window.c:2515
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2517
+msgid "Duration"
+msgstr "Duración"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2091
+#: ../src/empathy-call-window.c:2520
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s: %d:%02dm"
-#: ../src/empathy-call-window.c:2092
-msgid "On hold"
-msgstr "En espera"
-
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "_Coincidir con capitalización"
+#~ msgid "Call with %d participants"
+#~ msgstr "Llamada con %d participantes"
+
#~ msgid "_Dialpad"
#~ msgstr "_Teclado de llamada"
@@ -4867,9 +4945,6 @@ msgstr "_Coincidir con capitalización"
#~ msgstr ""
#~ "El avatar del contacto. Si se deja vacío no se mostrará ningún avatar."
-#~ msgid "Megaphone"
-#~ msgstr "Megáfono"
-
#~ msgid "Talk!"
#~ msgstr "Hablar"
@@ -4912,9 +4987,6 @@ msgstr "_Coincidir con capitalización"
#~ msgid "Import Accounts..."
#~ msgstr "Importar cuentas…"
-#~ msgid "Settings"
-#~ msgstr "Ajustes"
-
#~ msgid "Type:"
#~ msgstr "Tipo:"
diff --git a/po/fa.po b/po/fa.po
index f0beacaca..8625a0542 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy 2.28.1.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-21 09:08+0000\n"
-"PO-Revision-Date: 2011-04-22 01:05+0330\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-08-10 11:03+0000\n"
+"PO-Revision-Date: 2011-08-13 02:35+0330\n"
"Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
"Language-Team: Persian <translate@ifsug.org>\n"
-"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Poedit-Language: Persian\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
@@ -42,358 +42,386 @@ msgid "Always open a separate chat window for new chats."
msgstr "برای گپ‌های جدید، همیشه یک پنجره‌ی جدید گپ باز شود."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "بلندی صدای تماس"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "بلندی صدای تماس، بر اساس درصد"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid "Character to add after nickname when using nick completion (tab) in group chat."
msgstr "نویسه‌ای که هنگام کامل کردن اسم (با کلید جهش) در گپ گروهی، بعد از نام مستعار اضافه می‌شود."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "تم پنجره‌ی گپ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#| msgid "Chat window theme"
+msgid "Chat window theme variant"
+msgstr "گزینه‌های تم پنجره‌ی گپ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "فهرست فشرده‌ی آشناها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "از مدیرهای اتصال باید استفاده شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "معیارهای مرتب‌سازی فهرست آشناها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "شاخه‌ی پیش‌فرض برای انتخاب تصویر آواتار از آن"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "در حالت «غایب»، اطلاعیه‌های واشو از کار بیافتند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "در حالت «غایب»، صداها از کار بیافتند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "رویدادهای ورودی در منطقه‌ی وضعیت نمایش داده شوند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Display incoming events in the status area. If false, present them to the user immediately."
msgstr "رویدادهای ورودی در منطقه‌ی وضعیت نمایش داده شوند. اگر نادرست باشد، مستقیما به کاربر نمایش داده شوند."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "امپاتی می‌تواند مکان کاربر را منتشر کند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "امپاتی می‌تواند از مکان‌یاب جغرافیایی (جی‌پی‌اس) استفاده کند تا مکان کاربر را حدس بزند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "امپاتی می‌تواند از شبکه‌ی سلولی برای حدس مکان استفاده کند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "امپاتی می‌تواند از شبکه برای حدس مکان استفاده کند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "پوشه‌ی پیش‌فرض بارگیری امپاتی"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "امپاتی ثبت وقایع پروانه‌ای (butterfly) را منتقل کرده است"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "امپاتی در صورت بی‌کار بودن کاربر، خودکار به حالت «غایب» برود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "امپاتی در زمان راه‌اندازی به طور خودکار متصل شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "امپاتی دقت مکان را کاهش دهد"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "امپاتی از آواتار برای شمایل پنجره‌ی گپ استفاده کند"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "فعال‌سازی ابزارهای توسعه‌ی WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "فعال‌سازی اطلاعیه‌های واشو برای پیام‌های جدید"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "به کار انداختن غلط‌یابی املایی"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "مخفی کردن پنجره‌ی اصلی"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "مخفی کردن پنجره‌ی اصلی."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "نویسه‌ی کامل شده لقب"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "گپ‌های جدید در پنجره‌ی مجزا باز شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "مسیر تم Adium برای استفاده"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "مسیر تم Adium برای استفاده چناچه تم مورد استفاده برای گپ Adium باشد."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "هنگام دریافت پیام، صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "برای مکالمه‌های جدید صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "برای پیام‌های خروجی صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "وقتی آشنایی وارد می‌شود صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "وقتی کاربری خارج می‌شود صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "وقتی وارد می‌شویم صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "وقتی خارج می‌شویم صدایی پخش شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "در صورتیکه پنجره‌ی گپ در مرکز توجه نیست، اطلاعیه‌های واشو انجام شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "وقتی آشنایی وارد می‌شود، اطلاعیه‌های واشو انجام شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "وقتی آشنایی خارج می‌شود، اطلاعیه‌های واشو انجام شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#| msgid "Show offline contacts"
+msgid "Show Balance in contact list"
+msgstr "نمایش اعتبار در فهرست آشناها"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "نشان دادن آواتارها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "نمایش فهرست افراد در اتاق‌ها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "هنگام بستن پنجره، راهنمایی نشان داده شود"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "نمایش آشنا‌های برون‌خط"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "نشان دادن پروتکل‌ها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "زبان‌ها برای غلط‌یابی املایی"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "پوشه‌ی پیش‌فرض برای ذخیره‌ی پرونده‌های انتقالی."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "آخرین شاخه‌ای که یک آواتار از آن انتخاب شده بود."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "مکان قاب کناری پنجره‌ی گپ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "مکان ذخیره شده‌ی (به نقطه) قاب کناری پنجره‌ی گپ."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "تمی که برای نشان دادن گفتگو در پنجره‌ی چت استفاده می‌شود."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#| msgid "The theme 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.in.h:58
msgid "Use graphical smileys"
msgstr "استفاده از صورتک‌های گرافیکی"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "به کار انداختن صداهای اخطارها"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "استفاده از تم برای اتاق‌های گپ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "این‌که امپاتی اجازه داشته باشد، مکان کاربر را برای آشنایان منتشر کنند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "این‌که امپاتی اجازه داشته باشد، از مکان‌یاب جغرافیایی (جی‌پی‌اس) برای حدس مکان استفاده کند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "این‌که امپاتی اجازه داشته باشد، از شبکه‌ی سلولی برای حدس مکان استفاده کند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "این‌که امپاتی اجازه داشته باشد، از شبکه برای حدس مکان استفاده کند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "این‌که امپاتی وقایع پروانه‌ای را منتقل کرده است یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "این‌که امپاتی در هنگام راه‌اندازی، خودکار به حساب شما وارد شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy should go into away mode automatically if the user is idle."
msgstr "این‌که امپاتی در صورت بی‌کار بودن کاربر، خودکار به حالت «غایب» برود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "این‌که امپاتی دقت مکان را به دلیل حریم خصوصی کاهش دهد یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "این‌که امپاتی از آواتار آشنا برای شمایل پنجره‌ی گپ استفاده کند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "این‌که ابزارهای توسعه‌ی WebKit، مانند Web Inspector، باید به کار بیافتد یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
msgstr "این‌که مدیر‌های اتصال برای قطع کردنِ/اتصال مجددِ خودکار استفاده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to check words typed against the languages you want to check with."
msgstr "این‌که کلماتی که تایپ می‌کنید براساس زبان‌هایی که می‌خواهید بررسی شود، یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "این‌که در گفتگوها، صورتک‌ها تبدیل به تصویر گرافیکی شوند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "این‌که برای اطلاع دادن از ورود آشناها به شبکه، صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "این‌که برای اطلاع دادن از خروج آشناها از شبکه، صدای پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "این که برای اطلاع رویدادها صدایی پخش بشود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "این‌که برای اطلاع از پیام‌های ورودی صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "این‌که برای اطلاع از گفتگوهای جدید صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "این‌که برای اطلاع از پیام‌های خروجی صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "این‌که هنگام ورود به شبکه صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "این‌که هنگام خروج از شبکه صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "این‌که هنگام تغییر حالت به «مشغول» یا «غایب» صدایی پخش شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "این‌که وقتی آشنایی برون‌خط می‌شود، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "این‌که وقتی آشنایی برخط می‌شود، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "این‌که هنگام دریافت یک پیام جدید، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#| msgid "Whether to show protocols for contacts in the contact list."
+msgid "Whether to show account balances in the contact list."
+msgstr "این‌که در فهرست آشناها، اعتبار حساب‌ها نمایش داده شود یا خیر."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr "این‌که آواتار برای آشناها در فهرست آشنایان و پنجره‌ی گپ نشان داده شوند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "این‌که آشناهایی که برون‌خط هستند در فهرست آشناها دیده شوند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "این‌که در حالت «غایب» یا «مشغول»، اطلاعیه‌های واشو نمایش داده شوند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "این‌که در فهرست آشناها، پروتکل‌های مورد استفاده برای آشناها هم دیده شوند یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "این‌که فهرست آشناها در اتاق‌های گپ دیده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "این‌که فهرست آشنا‌ها در حالت فشرده نمایش داده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
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.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "این که از تم برای اتاق‌های گپ استفاده شود یا خیر."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
msgstr "کدام معیار برای مرتب کردن فهرست آشناها استفاده شود. پیش فرض بر روی مرتب کردن بر اساس نام آشنا با مقدار «name». یک مقدار «state» بر اساس حالت مرتب می‌کند."
@@ -403,7 +431,7 @@ msgstr "مدیریت حساب‌های پیام‌رسانی و VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2340
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "حساب‌های پیام‌رسانی و VoIP"
@@ -423,6 +451,25 @@ msgstr "پرونده‌ی انتخاب شده، پرونده‌ی عادی‌ا
msgid "The selected file is empty"
msgstr "پرونده‌ی انتخاب شده خالی است"
+#: ../libempathy/empathy-message.c:413
+#: ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "تماس از دست رفته از %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+#| msgid "Call with %s"
+msgid "Called %s"
+msgstr "تماس به %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+#| msgid "Missed call from %s"
+msgid "Call from %s"
+msgstr "تماس از %s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "نوع سوکت پشتیبانی نمی‌شود"
@@ -452,279 +499,281 @@ msgid "The other participant is unable to transfer the file"
msgstr "مشترک طرف دیگر نمی‌تواند پرونده را منتقل کند"
#: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "دلیل ناشناخته"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "در دسترس"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "مشغول"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "غایب"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "مخفی"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "برون‌خط"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:224
msgctxt "presence"
msgid "Unknown"
msgstr "ناشناخته"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "هیچ دلیلی مشخص نشده است"
-#: ../libempathy/empathy-utils.c:357
-#: ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:266
+#: ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "وضعیت روی برون‌خط تنظیم شده است"
-#: ../libempathy/empathy-utils.c:359
-#: ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:268
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "خطای شبکه"
-#: ../libempathy/empathy-utils.c:361
-#: ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "تأیید هویت شکست خورد"
-#: ../libempathy/empathy-utils.c:363
-#: ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "خطای رمزنگاری"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "نام استفاده شده"
-#: ../libempathy/empathy-utils.c:367
-#: ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "گواهی فراهم نشده است"
-#: ../libempathy/empathy-utils.c:369
-#: ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "گواهی غیر قابل اعتماد"
-#: ../libempathy/empathy-utils.c:371
-#: ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "گواهی منقضی شده است"
-#: ../libempathy/empathy-utils.c:373
-#: ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "گواهی فعال نشده است"
-#: ../libempathy/empathy-utils.c:375
-#: ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "عدم تطابق گواهی در نام میزبان"
-#: ../libempathy/empathy-utils.c:377
-#: ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "عدم تطابق گواهی در اثر انگشت"
-#: ../libempathy/empathy-utils.c:379
-#: ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "گواهی خود امضا شده"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "خطای گواهی"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "رمزنگاری در دسترس نیست"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "گواهی نامعتبر است"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "اتصال رد شده است"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "اتصال برقرار نمی‌شود"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "اتصال از دست رفت"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "این منبع پیشاپیش به کارگزار متصل شده است"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:336
msgid "Connection has been replaced by a new connection using the same resource"
msgstr "اتصال با یک اتصال جدید با استفاده از همان منبع، جایگزین شده است"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "حساب پیشاپیش بر روی کارگزار وجود دارد"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "کارگزار فعلا خیلی مشغول است و نمی‌تواند اتصال را برقرار کند"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "گواهی لغو شده است"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:345
msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "گواهی از یک الگوریتم رمز نا‌امن استفاده می‌کند یا از نظر رمزنگاری ضعیف است"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:348
msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
msgstr "طول گواهی کارگزار، یا عمق زنجیر گواهی کارگزار از حد محدود شده توسط کتابخانه cryptography رد می‌شود"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "افراد دور و بر"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr " یاهو! ژاپن"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "گوگل تاک"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "گپ فیس‌بوک"
-#: ../libempathy/empathy-time.c:100
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%Id ثانیه قبل"
msgstr[1] "%Id ثانیه قبل"
-#: ../libempathy/empathy-time.c:105
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%Id دقیقه قبل"
msgstr[1] "%Id دقیقه قبل"
-#: ../libempathy/empathy-time.c:110
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%Id ساعت قبل"
msgstr[1] "%Id ساعت قبل"
-#: ../libempathy/empathy-time.c:115
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%Id روز قبل"
msgstr[1] "%Id روز قبل"
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%Id هفته قبل"
msgstr[1] "%Id هفته قبل"
-#: ../libempathy/empathy-time.c:125
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%Id ماه قبل"
msgstr[1] "%Id ماه قبل"
-#: ../libempathy/empathy-time.c:130
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "در آینده"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "همه"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+#| msgid "_Accounts"
+msgid "All accounts"
+msgstr "تمام حساب‌ها"
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "حساب"
-#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "گذرواژه"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "کارگزار"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "درگاه"
-#: ../libempathy-gtk/empathy-account-widget.c:753
-#: ../libempathy-gtk/empathy-account-widget.c:810
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1151
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "حساب %s از طریقِ «حسابهای وب من» ویرایش شده است."
-#: ../libempathy-gtk/empathy-account-widget.c:1157
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "حساب %s از طریق امپاتی قابل ویرایش نیست."
-#: ../libempathy-gtk/empathy-account-widget.c:1177
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "اجرای حساب‌های وب من"
-#: ../libempathy-gtk/empathy-account-widget.c:1515
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "نام کاربری:"
-#: ../libempathy-gtk/empathy-account-widget.c:1833
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "_اعمال"
-#: ../libempathy-gtk/empathy-account-widget.c:1863
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "_ورود به سیستم"
-#: ../libempathy-gtk/empathy-account-widget.c:1937
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "این حساب از قبل بر روی کارگزار وجود دارد"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "ایجاد یک حساب جدید بر روی کارگزار"
-#: ../libempathy-gtk/empathy-account-widget.c:2132
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "_لغو"
@@ -733,19 +782,19 @@ msgstr "_لغو"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s در %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "حساب %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "حساب جدید"
@@ -757,6 +806,7 @@ msgstr "<b>مثال:</b> MyScreenName"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -770,7 +820,7 @@ msgstr "پیشرفته"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_گذرواژه:"
@@ -780,7 +830,7 @@ msgstr "_گذرواژه:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "به خاطر سپردن گذرواژه"
@@ -790,7 +840,7 @@ msgstr "به خاطر سپردن گذرواژه"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -866,76 +916,80 @@ msgstr "نام کاربری (UIN) شما در ICQ چیست؟"
msgid "What is your ICQ password?"
msgstr "گذرواژه‌ی ICQ شما چیست؟"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "خودکار"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Register"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Options"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "هیچ‌کدام"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "‫نویسه‌گان‬:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "شبکه"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "شبکه:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "نام مستعار:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "گذرواژه:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "پیغام ترک:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "نام واقعی:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "کارگزارها"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "نام مستعار شما در IRC چیست؟"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "کدام شبکه IRC؟"
@@ -1067,58 +1121,63 @@ msgid "Discover the STUN server automatically"
msgstr "کارگزار STUN، خودکار پیدا شود"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "نادیده گرفتن خطاهای TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "بازه‌ی زمانی (بر حسب ثانیه)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "گزینه‌های زنده‌ماندن"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "مسیریابی سست"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "سازوکار:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "گزینه‌های متفرقه"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "گزینه‌های پیمایش NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "درگاه:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "گزینه‌های پیشکار"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "کارگزار STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "کارگزار:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "انتقال:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "گذرواژه‌ی حساب SIP شما چیست؟"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "شناسه‌ی ورود SIP شما چیست؟"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "نام _کاربری:"
@@ -1142,28 +1201,36 @@ msgstr "_شناسه‌ی یاهو!:"
msgid "_Room List locale:"
msgstr "کدبومی _فهرست اتاق:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "تصویر تبدیل نشد"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "هیچ‌کدام از قالب‌های تصویر پذیرفته در سیستم شما پشتیبانی نمی‌شوند"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "نمی‌توان pixbuf را به png ذخیره کرد"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "آواتار خود را انتخاب کنید"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "یک عکس بگیرید..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "بدون تصویر"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "تصویرها"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "همه‌ی پرونده‌ها"
@@ -1171,160 +1238,206 @@ msgstr "همه‌ی پرونده‌ها"
msgid "Click to enlarge"
msgstr "برای بزرگ کردن کلیک کنید"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+#| msgid "There was an error while creating the account."
+msgid "There was an error starting the call"
+msgstr "خطایی در هنگام شروع تماس بود"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "آشنای مشخص شده از تماس پشتیبانی نمی‌کند"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+#| msgid "The selected contact is offline."
+msgid "The specified contact is offline"
+msgstr "آشنای انتخاب شده برون‌خط است"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+#| msgid "The selected contact is offline."
+msgid "The specified contact is not valid"
+msgstr "آشنای انتخاب شده صحیح نیست"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+#| msgid "Topic not supported on this conversation"
+msgid "Emergency calls are not supported on this protocol"
+msgstr "تماس‌های اضطراری بر روی این پروتکل پشتیبانی نمی‌شوند"
+
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "شکست در باز کردن گپ خصوصی"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "در این گفتگو سرفصل پشتیبانی نمی‌شود"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "شما اجازه‌ی تغییرسرفصل را ندارید"
-#: ../libempathy-gtk/empathy-chat.c:932
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+#| msgid "invalid contact"
+msgid "“%s” is not a valid contact ID"
+msgstr "شناسه آشنای «%s» صحیح نیست"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: تمام پیام‌ها در گفتگوی جاری را پاک می‌کند"
-#: ../libempathy-gtk/empathy-chat.c:935
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: بدینوسیله سرفصل گفتگو مشخص می‌شود"
-#: ../libempathy-gtk/empathy-chat.c:938
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: پیوستن به یک اتاق گپ جدید"
-#: ../libempathy-gtk/empathy-chat.c:941
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: پیوستن به یک اتاق گپ جدید"
-#: ../libempathy-gtk/empathy-chat.c:946
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
msgstr "/part [<chat room ID>] [<reason>]: ترک اطاق گپ، به طور پیش‌فرض مورد فعلی"
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: باز کردن یک گپ خصوصی"
-#: ../libempathy-gtk/empathy-chat.c:954
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: باز کردن یک گپ خصوصی"
-#: ../libempathy-gtk/empathy-chat.c:957
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: تغییر لقب شما در کارگزار جاری"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: فرستادن یک پیام وضعیت به گفتگوی فعلی"
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:1059
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 <message>: فرستادن یک پیام به گفتگوی فعلی، از این می‌توان برای فرستادن پیام‌های خاص استفاده کرد، مثلا اگر پیامی با '/' شروع شده باشد مثلا: «/say /join is used to join a new chat room»"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: نمایش اطلاعات در خصوص یک آشنا"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<command>]: نشان دادن تمام پیام‌های پشتیبانی شده. اگر <command> مشخص شده باشد، استفاده‌ی آن نمایش داده می‌شود."
-#: ../libempathy-gtk/empathy-chat.c:978
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "کاربرد: %s"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "فرمان ناشناخته"
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "دستور ناشناخته؛ help/ را برای دیدن دستورهای موجود ببینید"
-#: ../libempathy-gtk/empathy-chat.c:1281
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+#| msgid "Insufficient free space to save file"
+msgid "insufficient balance to send message"
+msgstr "مانده اعتبار برای ارسای پیام کافی نیست"
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "قابلیت لازم را ندارد"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "برون‌خط"
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "آشنای نامعتبر"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "مجوز رد شد"
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "پیام خیلی بلند است"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "پیاده‌سازی نشده است"
-#: ../libempathy-gtk/empathy-chat.c:1297
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "ناشناخته"
-#: ../libempathy-gtk/empathy-chat.c:1302
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "خطا در فرستان پیام «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1306
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "خطا در فرستان پیام: %s"
-#: ../libempathy-gtk/empathy-chat.c:1367
-#: ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "سرفصل:"
-#: ../libempathy-gtk/empathy-chat.c:1379
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "سرفصل تنظیم شد: %s"
-#: ../libempathy-gtk/empathy-chat.c:1381
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "هیچ سرفصلی تعریف نشده است"
-#: ../libempathy-gtk/empathy-chat.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(پیشنهادی نیست)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1948
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "اضافه کردن «%s» به لغت‌نامه"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "اضافه‌کردن «%s» به لغت‌نامه «%s»"
-#: ../libempathy-gtk/empathy-chat.c:2042
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "درج صورتک"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2060
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
msgid "_Send"
msgstr "_ارسال"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "پیشنهادات _املایی"
-#: ../libempathy-gtk/empathy-chat.c:2184
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "بازیابی وقایع ثبت شده، شکست خورد"
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "مورد %s قطع شده است"
@@ -1332,12 +1445,12 @@ msgstr "مورد %s قطع شده است"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2302
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "فرد %1$s توسط %2$s شوت شد"
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "فرد %s شوت شد"
@@ -1345,17 +1458,17 @@ msgstr "فرد %s شوت شد"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "فرد %1$s توسط %2$s تحریم شد"
-#: ../libempathy-gtk/empathy-chat.c:2316
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "فرد %s تحریم شد"
-#: ../libempathy-gtk/empathy-chat.c:2320
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "فرد %s از اتاق خارج شد"
@@ -1365,111 +1478,124 @@ msgstr "فرد %s از اتاق خارج شد"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2329
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2354
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "فرد %s به اتاق پیوست"
-#: ../libempathy-gtk/empathy-chat.c:2379
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "فرد %s اکنون با %s شناخته می‌شود"
-#: ../libempathy-gtk/empathy-chat.c:2518
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1126
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241
+#: ../src/empathy-call-window.c:1704
msgid "Disconnected"
msgstr "قطع شد"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3148
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "آیا مایلید این گذرواژه را ذخیره کنید؟"
-#: ../libempathy-gtk/empathy-chat.c:3154
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "به خاطر بسپار"
-#: ../libempathy-gtk/empathy-chat.c:3164
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "الان خیر"
-#: ../libempathy-gtk/empathy-chat.c:3208
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "تلاش مجدد"
-#: ../libempathy-gtk/empathy-chat.c:3212
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "گذرواژه اشتباه است؛ لطفا دوباره سعی کنید:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3329
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "این اتاق توسط یک گذرواژه محافظت می‌شود:"
-#: ../libempathy-gtk/empathy-chat.c:3356
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "پیوستن"
-#: ../libempathy-gtk/empathy-chat.c:3526
-#: ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3797
+#: ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "متصل شد"
-#: ../libempathy-gtk/empathy-chat.c:3579
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "گفتگو"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+#| msgid "%s (%s)"
+msgid "%s (SMS)"
+msgstr "%s (اس‌ام‌اس)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "شناساگر نامعتبر و یا ناشناس است"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "امکان مسدود کردن آشنا به صورت موقت غیرفعال است"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "امکان مسدود کردن کاربر در دسترس نیست"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "مجوز رد شد"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "نمی‌توان آشنا را مسدود کرد"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "ویرایش آشناهای مسدود شده"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "حساب:"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "آشناهای مسدود شده"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_رونوشت از نشانی پیوند"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_باز کردن پیوند"
@@ -1494,24 +1620,24 @@ msgid "New Contact"
msgstr "آشنای جدید"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "مسدود کردن %s؟"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "آیا مطمئنید که می‌خواهید «%s» را از برقراری دوباره ارتباط با خود مسدود کنید؟"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "_مسدود کردن"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "_گزارش این آشنا به عنوان سوء استفاده‌گر"
@@ -1537,122 +1663,121 @@ msgstr "گروه‌بندی لغو شد"
msgid "Favorite People"
msgstr "افراد موردپسند"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "جدا می‌خواهید گروه «%s» را حذف کنید؟"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "در حال حذف گروه"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2594
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_حذف"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "جدا می‌خواهید آشنای «%s» را حذف کنید؟"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "در حال حذف آشنا"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "ا_فزودن آشنا..."
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "_مسدود کردن آشنا"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_گپ"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "تماس _صوتی"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "تماس _تصویری"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "گفتگوی _پیشین"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "ارسال پرونده"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "میزکارم به اشتراک گذاشته شود"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1761
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "علاقه‌مندی‌ها"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "_اطلاعات"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_ویرایش"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "در حال دعوت شما به این اتاق"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "_دعوت به اتاق گپ"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "جستجو آشناها"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "جستجو: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "ا_فزودن آشنا"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "هیچ آشنایی پیدا نشد"
@@ -1660,178 +1785,205 @@ msgstr "هیچ آشنایی پیدا نشد"
msgid "Select a contact"
msgstr "آشنایی انتخاب کنید"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "نام کامل:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "شماره‌ی تلفن:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "نشانی پست‌الکترونیکی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "وب‌گاه:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "روز تولد:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "آخرین حضور:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+#| msgid "Connected"
+msgid "Connected from:"
+msgstr "متصل شد از:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "پیغام ترک:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#| msgid "Ca_ncel"
+msgid "Channels:"
+msgstr "کانال‌ها:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "کد ISO کشور:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "کشور:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "ایالت:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "شهر:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "منطقه:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "کد پستی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "خیابان:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "ساختمان:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "طبقه:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "اتاق:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "متن:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "توضیحات:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "نشانی اینترنتی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "سطح دقت:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "خطا:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "خطای عمودی (متر):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "خطای افقی (متر):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "سرعت:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "جهت:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "سرعت بالا رفتن:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "آخرین به‌روزرسانی در:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "طول جغرافیایی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "عرض جغرافیایی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "بلندی:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:886
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "مکان"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s، %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:940
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%Od %B، سال %Oy در %OH:%OM UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1022
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "ذخیره‌ی آواتار"
-#: ../libempathy-gtk/empathy-contact-widget.c:1078
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "ذخیره‌ی آواتار ممکن نیست"
@@ -1841,7 +1993,7 @@ msgstr "<b>مکان</b> در (تاریخ)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "نام مستعار:"
@@ -1861,7 +2013,7 @@ msgstr "جزئیات آشنا"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "شناسه:"
@@ -1878,87 +2030,93 @@ msgstr "سیستم عامل:"
msgid "Version:"
msgstr "نسخه:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "گروه‌ها"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
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:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_افزودن گروه"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "انتخاب"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "گروه"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "هویت مقابل مسدود خواهد شد:"
msgstr[1] "هویت‌های مقابل مسدود خواهند شد:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "هویت مقابل را نمی‌توان مسدود کرد:"
msgstr[1] "هویت‌های مقابل را نمی‌توان مسدود کرد:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "آشناهای پیوند شده"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "آشناها را انتخاب کنید تا پیوند داده شود"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "پیش‌نمایش آشنای جدید"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_اس‌ام‌اس"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_ویرایش"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_پیوند آشناها..."
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "حذف و _مسدود کن"
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, 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» را حذف کنید؟ دقت کنید که این کار باعث می‌شود تمام آشناهایی که به این آشنا پیوند داده شده‌اند حذف شوند."
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2036,65 +2194,218 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_لغو پیوند"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "تاریخ"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "تاریخچه"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "نمایش"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "جستجو"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+#| msgid "Call with %s"
+msgid "Chat in %s"
+msgstr "گپ در %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+#| msgid "Call with %s"
+msgid "Chat with %s"
+msgstr "گپ با %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+#| msgid "%A %B %d %Y"
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "٪"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "تماس در %s گرفته شد، در %s پایان یافت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "امروز"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+#| msgid "Western"
+msgid "Yesterday"
+msgstr "دیروز"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+#| msgid "%A %B %d %Y"
+msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "هرزمانی"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+#| msgid "None"
+msgid "Anyone"
+msgstr "هرکسی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "چه کسی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "چه زمانی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "هرچیزی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+#| msgid "Set status"
+msgid "Text chats"
+msgstr "گپ‌های متنی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
+#| msgid "Call"
+msgid "Calls"
+msgstr "تماس‌ها"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+#| msgid "Incoming call"
+msgid "Incoming calls"
+msgstr "تماس‌های ورودی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+#| msgid "Outgoing voice call"
+msgid "Outgoing calls"
+msgstr "تماس خروجی"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+#| msgid "Missed call from %s"
+msgid "Missed calls"
+msgstr "تماس‌های از دست رفته"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+#| msgid "Chat"
+msgid "What"
+msgstr "کدام"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+#| msgid "Are you sure you want to block '%s' from contacting you again?"
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "آیا مطمئنید که می‌خواهید تمام وقایع ثبت شده گفتگوهای قبلی را حذف کنید؟"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+#| msgid "C_lear"
+msgid "Clear All"
+msgstr "پاک کردن همه"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "پاک کردن از:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">بارگیری...</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "مکالمات"
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "تماس"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "یافتن بعدی"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "گپ"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "یافتن قبلی"
+msgid "Delete All History..."
+msgstr "پاک کردن تمام تاریخچه..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "مکالمه‌های قبلی"
+#| msgid "Provide"
+msgid "Profile"
+msgstr "مجموعه تنظیمات"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "ویدئو"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "جستجو"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_ویرایش"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#| msgid "File"
+msgid "_File"
+msgstr "_پرونده"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_برای:"
+msgid "page 2"
+msgstr "صفحه ۲"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "شناسه‌ی آشنا:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "_گپ"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "گفتگوی جدید"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "فرستادن _ویدئو"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "_تماس"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "تماس جدید"
@@ -2113,34 +2424,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "پیام سفارشی..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "ویرایش پیام‌های سفارشی..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "برای برداشتن این مورد از فهرست علاقه‌مندی‌ها، کلیک کنید"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "برای افزودن این وضعیت به علاقه‌مندی‌ها کلیک کنید"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "تنظیم وضعیت"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "حضور و وضعیت جاری خود را تنظیم کنید"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "پیام‌های دلخواه..."
@@ -2153,6 +2464,14 @@ msgstr "پیام‌های دلخواه..."
msgid "New %s account"
msgstr "حساب جدید %s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "یافتن بعدی"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "یافتن قبلی"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "یافتن:"
@@ -2205,35 +2524,41 @@ msgstr "تماس صوتی خروجی"
msgid "Voice call ended"
msgstr "تماس صوتی پایان یافت"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "پیام‌ سفارشی را وارد کنید"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "پیام‌های سفارشی را ویرایش کنید"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "ذخیره پیام وضعیت _جدید"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "حذف"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "پیام ویرایش شده در %s"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "پیام‌های وضعیت ذخیره شده"
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#| msgid "N_ormal Size"
+msgid "Normal"
+msgstr "معمولی"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "کلاسیک"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "ساده"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "تمیز"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "آبی"
@@ -2307,24 +2632,24 @@ msgstr "این انتخاب را برای اتصال‌های آینده به خ
msgid "Certificate Details"
msgstr "جزئیات گواهی"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "بازکردن نشانی اینترنتی مقدور نیست"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
msgid "Select a file"
msgstr "یک پرونده انتخاب کنید"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
msgid "Insufficient free space to save file"
msgstr "فضای آزاد ناکافی برای ذخیره پرونده"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
#, 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 موجود است. لطفا یک محل دیگر را انتخاب کنید."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
#, c-format
msgid "Incoming file from %s"
msgstr "در حال دریافت پرونده از %s"
@@ -2512,23 +2837,23 @@ msgstr "پیغام خطایی وجود ندارد"
msgid "Instant Message (Empathy)"
msgstr "پیام فوری (امپاتی)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "امپاتی هنگام راه‌اندازی اولیه متصل نشود"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "در هنگام راه‌اندازی فهرست آشناها یا هر محاوره‌ی دیگری را نشان نده"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- کارگیر پیام رسانی اینترنتی امپاتی"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "خطا در برقراری ارتباط با مدیریت حساب"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2644,8 +2969,8 @@ msgid "Select the accounts you want to import:"
msgstr "حساب‌هایی که می‌خواهید وارد کنید را انتخاب کنید:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "بله"
@@ -2704,7 +3029,8 @@ msgid "Your new account has not been saved yet."
msgstr "حساب جدید شما هنوز ذخیره نشده است."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:653
msgid "Connecting…"
msgstr "در حال اتصال..."
@@ -2747,7 +3073,7 @@ msgstr "آیا می‌خواهید %s را از رایانه‌تان حذف ک
msgid "This will not remove your account on the server."
msgstr "این کار حساب شما بر روی کارگزار را پاک نخواهد کرد."
-#: ../src/empathy-accounts-dialog.c:1434
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2756,15 +3082,15 @@ msgstr ""
"خواهد گرفت. آیا مطمئنید که میخواهید ادامه دهید؟"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1652
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_فعال‌کردن"
-#: ../src/empathy-accounts-dialog.c:1653
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "_غیرفعال‌کردن"
-#: ../src/empathy-accounts-dialog.c:2174
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2773,34 +3099,35 @@ msgstr ""
"خواهد گرفت. آیا مطمئنید که می‌خواهید ادامه دهید؟"
#: ../src/empathy-accounts-dialog.ui.h:1
+#| msgid "_Add…"
+msgid "Add…"
+msgstr "افزودن..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "بارگیری اطلاعات حساب"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "قراردادی نصب نشده است"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "قرارداد:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
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:5
-msgid "_Add…"
-msgstr "_افزودن..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_وارد کردن..."
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr " - کارگیر تصدیق هویت امپاتی"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "کارگیر تصدیق هویت امپاتی"
@@ -2809,291 +3136,347 @@ msgid "People nearby"
msgstr "افراد دور و بر"
#: ../src/empathy-av.c:118
+#: ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- کارگیر صوتی/تصویری امپاتی"
#: ../src/empathy-av.c:134
+#: ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "کارگیر صوتی/تصویری امپاتی"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "سایه روشن تصویر"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "روشنی"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "گاما"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "بلندی صدا"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "نوار _جانبی"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "ورودی صدا"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "ورودی ویدئو"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "شماره‌گیر"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "جزئیات"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1043
#, c-format
msgid "Call with %s"
msgstr "تماس با %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "تماس"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1287
msgid "The IP address as seen by the machine"
msgstr "نشانی IP همانطور که توسط ماشین دیده می‌شود"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1289
msgid "The IP address as seen by a server on the Internet"
msgstr "آدرس IP همانطور که توسط کارگزار روی اینترنت دیده می‌شود"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1291
msgid "The IP address of the peer as seen by the other side"
msgstr "آدرس IP مربوط به peer همانطور که توسط طرف مقابل دیده می‌شود"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1293
msgid "The IP address of a relay server"
msgstr "آدرس IP مربوط به سرور بازپخش"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1295
msgid "The IP address of the multicast group"
msgstr "آدرس IP مربوط به گروه چندگانه"
-#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "ناشناخته"
-#: ../src/empathy-streamed-media-window.c:1909
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "ناشناخته"
-#: ../src/empathy-streamed-media-window.c:1912
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "ناشناخته"
-#: ../src/empathy-streamed-media-window.c:1915
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "ناشناخته"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "متصل شد — %Id: %I02dm"
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2023
msgid "Technical Details"
msgstr "جزئیات فنی"
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2061
#, c-format
msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr "نرم‌افزار %s هیچ‌کدام از قالب‌های صوتی پشتیبانی شده توسط رایانه‌ی شما را تشخیص نمی‌دهد"
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid "%s's software does not understand any of the video formats supported by your computer"
msgstr "نرم‌افزار %s هیچ‌کدام از قالب‌های ویدئویی پشتیبانی شده توسط رایانه‌ی شما را تشخیص نمی‌دهد"
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2072
#, 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-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2078
msgid "There was a failure on the network"
msgstr "یک خرابی در شبکه بوجود آمده بود"
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2082
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "قالب‌های صوتی لازم برای برقراری این تماس روی رایانه‌ی شما نصب نشده‌اند"
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2085
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "قالب‌های ویدئویی لازم برای برقراری این تماس روی رایانه‌ی شما نصب نشده‌اند"
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2097
#, 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\"> این ایراد را گزارش دهید</a> و ثبت وقایع جمع‌آوری شده از پنجره‌ی اشکال‌زدایی در منوی راهنما، را پیوست کنید."
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2106
msgid "There was a failure in the call engine"
msgstr "یک خرابی در موتور تماس بوجود آمده بود"
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2109
msgid "The end of the stream was reached"
msgstr "به انتهای جریان رسیدیم"
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2149
msgid "Can't establish audio stream"
msgstr "نمی‌توان جریان صوتی را برقرار کرد"
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2159
msgid "Can't establish video stream"
msgstr "نمی‌توان جریان ویدئویی را برقرار کرد"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "صدا"
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "دوباره با آشنای مورد نظر تماس گرفته شود"
-
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "خاموش کردن دوربین"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "رمزگشایی کُدک:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "روشن کردن دوربین"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "غیرفعال‌کردن دوربین"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "رمزگشایی کُدک:"
+msgid "Display the dialpad"
+msgstr "نمایش صفحه شماره‌گیر"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "دوربین از کار بیافتد و فرستادن ویدئو متوقف شود"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "رمزنگاری کُدک:"
#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "دوربین به کار بیافتد و ویدئو ارسال شود"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "قطع کردن"
#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "دوربین به کار بیافتد ولی ویدئو فرستاد نشود"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "تماس جاری قطع شود"
#: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "رمزنگاری کُدک:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "کاندیدای محلی:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "قطع کردن"
+msgid "Maximise me"
+msgstr " حداکثر کردن من"
#: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "تماس جاری قطع شود"
+msgid "Minimise me"
+msgstr "حداقل کردن من"
#: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "کاندیدای محلی:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "کاندیدای دوردست:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "پیش‌نمایش"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "فرستادن صدا"
#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "تماس دوباره"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "فرستادن ویدئو"
#: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "کاندیدای دوردست:"
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "نمایش شماره‌گیر"
#: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "فرستادن صدا"
+msgid "Start a video call"
+msgstr "شروع یک تماس ویدئویی"
#: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "تغییر حالت ارسال صدا"
+msgid "Start an audio call"
+msgstr "شروع یک تماس صوتی"
#: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "ناشناخته"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "تغییر حالت ارسال صدا"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_ویدئو"
+#| msgid "Toggle audio transmission"
+msgid "Toggle video transmission"
+msgstr "تغییر حالت ارسال ویدئو"
#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "ویدئو"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "خاموش کردن ویدئو"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1659
+#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1661
+#: ../src/empathy-call-window.c:1662
+msgid "Unknown"
+msgstr "ناشناخته"
#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "روشن کردن ویدئو"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "تماس ویدئویی"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "پیش‌نمایش ویدئو"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_تماس"
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "_محتویات"
+
#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:29
-msgid "_View"
-msgstr "_نما"
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_اشکال‌زدایی"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "_راهنما"
+
+#: ../src/empathy-call-window.ui.h:28
+msgid "_Microphone"
+msgstr "_میکروفون"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "_Settings"
+msgstr "_تنظیمات"
-#: ../src/empathy-chat-window.c:474
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%Id نخوانده)"
msgstr[1] "%s (%Id نخوانده)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (و %Iu دیگر)"
msgstr[1] "%s (و %Iu دیگر)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%Id نخوانده از بین دیگران)"
msgstr[1] "%s (%Id نخوانده از بین دیگران)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%Id نخوانده از بین همه)"
msgstr[1] "%s (%Id نخوانده از بین همه)"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "اس‌ام‌اس:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+#| msgid "Typing a message."
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "درحال ارسال %Id پیام"
+msgstr[1] "درحال ارسال %Id پیام"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "درحال تایپ یک پیام."
@@ -3105,10 +3488,6 @@ msgstr "پا_ک کردن"
msgid "C_ontact"
msgstr "آ_شنا"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "گپ"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "درج صورتک"
@@ -3129,11 +3508,6 @@ msgstr "جابه‌جایی زبانه به _راست"
msgid "Notify for All Messages"
msgstr "برای همه‌ی پیام‌ها اخطار داده شود"
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_محتویات"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_گفتگو"
@@ -3142,20 +3516,10 @@ msgstr "_گفتگو"
msgid "_Detach Tab"
msgstr "_جداکردن زبانه"
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_ویرایش"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_اتاق گپ مورد پسند"
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_راهنما"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "زبانه‌ی _بعدی"
@@ -3177,15 +3541,15 @@ msgstr "_زبانه‌ها"
msgid "_Undo Close Tab"
msgstr "_برگردان بستن زبانه"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "نام"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "اتاق"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "اتصال خودکار"
@@ -3193,92 +3557,99 @@ msgstr "اتصال خودکار"
msgid "Manage Favorite Rooms"
msgstr "مدیریت اتاق‌های مورد پسند"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "در حال دریافت تماس ویدئویی"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "در حال دریافت تماس"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "فرد %s تماس ویدئویی با شما گرفته است، آیا جواب می‌دهید؟"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "فرد %s با شما تماس گرفته است، آیا جواب می‌دهید؟"
-#: ../src/empathy-event-manager.c:515
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:530
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "در حال دریافت تماس از %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_رَد"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_پاسخگویی"
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_پاسخگویی با ویدئو"
+
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "ویدئو ورودی از %s"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "دعوتنامه‌ی اتاق"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "دعوتنامه برای پیوستن به %s"
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "آشنای %s از شما دعوت می‌کند تا به %s بپیوندید"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_چشم پوشی"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_پیوستن"
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "آشنای %s از شما دعوت کرد تا به %s بپیوندید"
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "شما دعوت شده‌اید تا به %s بپیوندید"
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "پرونده‌ی دریافت شده از %s"
-#: ../src/empathy-event-manager.c:1020
-#: ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1135
+#: ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "گذرواژه لازم است"
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "آشنا %s اجازه می‌خواهد تا ببیند چه زمانی برخط هستید"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3365,7 +3736,7 @@ msgid "File transfer completed"
msgstr "انتقال پرونده کامل شد"
#: ../src/empathy-ft-manager.c:616
-#: ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "در حال انتظار برای گرفتن جواب دیگر شرکت کنندگان"
@@ -3381,15 +3752,11 @@ msgstr "آزمایش درستی «%s»"
msgid "Hashing \"%s\""
msgstr "در حال درهم کردن «%s»"
-#: ../src/empathy-ft-manager.c:1029
-msgid "%"
-msgstr "٪"
-
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "پرونده"
-#: ../src/empathy-ft-manager.c:1063
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "باقی مانده"
@@ -3422,39 +3789,55 @@ msgstr "قرارداد"
msgid "Source"
msgstr "منبع"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "فراهم کردن گذرواژه"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "قطع اتصال"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "هیچ مطابقتی پیدا نشد"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "اتصال مجدد"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "ویرایش حساب"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "بستن"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "بالا بردن %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "بالا بردن مانده اعتبار"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "بالا بردن..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "تماس"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "فهرست آشناها"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "نمایش و ویرایش حساب‌ها"
@@ -3463,91 +3846,96 @@ msgid "Contacts on a _Map"
msgstr "آشناها روی یک _نقشه"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "مانده اعتبار"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "جستجو در _فهرست آشناها"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "پیوستن به فهرست _علاقه‌مندی‌ها"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "مدیریت علاقه‌مندی‌ها"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "ا_ندازه‌ی معمولی"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:7
#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "تماس _جدید..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "اندازه‌ی عادی به همراه آ_واتار"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "_ترجیحات"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "نشان دادن _قراردادها"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "مرتب‌سازی بر اساس _نام"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "مرتب‌سازی بر اساس _وضعیت"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_حساب‌ها"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "آشناهای _مسدود شده"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "اندازه‌ی _فشرده"
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_اشکال‌زدایی"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "انتقال _پرونده‌ها"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "_پیوستن..."
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_گفتگوی جدید..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "آ_شناهای برون‌خط"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "_اطلاعات شخصی"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_اتاق"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "_جستجو برای آشناها..."
+#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "_View"
+msgstr "_نما"
+
#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
msgstr "اتاق گپ"
@@ -3558,7 +3946,7 @@ msgstr "اعضا"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3571,16 +3959,16 @@ msgstr ""
"نیاز به گذرواژه: %s\n"
"اعضا: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "خیر"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "شروع به فهرست کردن اتاق ممکن نبود"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "توقف فهرست کردن اتاق امکان پذیر نشد"
@@ -3608,39 +3996,82 @@ msgstr "فهرست اتاق"
msgid "_Room:"
msgstr "_اتاق:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:171
msgid "Message received"
msgstr "پیام دریافت شد"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:172
msgid "Message sent"
msgstr "پیام فرستاده‌شده"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:173
msgid "New conversation"
msgstr "گفتگوی جدید"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:174
msgid "Contact goes online"
msgstr "آشنا برخط می‌شود"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:175
msgid "Contact goes offline"
msgstr "آشنا برون‌خط می‌شود"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:176
msgid "Account connected"
msgstr "حساب متصل شد"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:177
msgid "Account disconnected"
msgstr "حساب قطع شد"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:480
msgid "Language"
msgstr "زبان"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:730
+#| msgid "Client:"
+msgid "Juliet"
+msgstr "ژولیت"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:737
+#| msgid "Room"
+msgid "Romeo"
+msgstr "رومئو"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:758
+#| msgid "%s has disconnected"
+msgid "Juliet has disconnected"
+msgstr "ژولیت قطع شده است"
+
+#: ../src/empathy-preferences.c:1164
msgid "Preferences"
msgstr "ترجیحات"
@@ -3648,128 +4079,141 @@ msgstr "ترجیحات"
msgid "Appearance"
msgstr "ظاهر"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "رفتار"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "_تم گپ:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "در حالت «_غایب» یا «مشغول» اطلاعیه‌ها از کار بیافتند"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "در حالت «_غایب» یا «مشغول» صداها از کار بیافتند"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "رویداد‌های ورودی در منطقه‌ی اطلاعیه‌ها نشان داده شوند"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "وقتی آشنایی برخط می‌شود، اطلاعیه‌ها به کار افتد"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "وقتی آشنایی برون‌خط می‌شود، اطلاعیه‌ها به کار افتد"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "وقتی تمرکز بر پنجره‌ی _گپ نیست، اطلاعیه‌ها به کار بیافتد"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "غلط‌یاب املایی به کار افتد برای زبان:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "عمومی"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "سطح ورودی"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "ورودی بلندی صدا"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "منابع مکان‌ها:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "ثبت وقایع مکالمات"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "اطلاعیه‌ها"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "پخش صدا برای رویدادها"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "حریم خصوصی"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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) به میزان یک رقم اعشار دقیق خواهند بود."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "نمایش _صورتک‌ها به صورت تصویر"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "نمایش _فهرست آشناها در اتاق‌ها"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "صداها"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "غلط‌یاب املایی"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid "The list of languages reflects only the languages for which you have a dictionary installed."
msgstr "فهرست زبان‌هایی که اینجا آمده‌اند تنها شامل زبان‌هایی است که شما برایشان لغت‌نامه نصب کرده‌اید."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "تم‌ها"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+#| msgid "Bearing:"
+msgid "Variant:"
+msgstr "گزینه:"
+
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "اتصال _خودکار در هنگام راه‌اندازی اولیه"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_موبایل"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_فعال کردن اطلاعیه‌های حبابی"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_فعال کردن اطلاعیه‌های صوتی"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_موقعیت‌یاب جغرافیایی (GPS)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_شبکه (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "گپ‌های جدید در پنجره‌های _مجزا باز شوند"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
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:34
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_کاهش دقت مکان"
@@ -3781,81 +4225,129 @@ msgstr "وضعیت"
msgid "_Quit"
msgstr "_خروج"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "دوباره با آشنای مورد نظر تماس گرفته شود"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "خاموش کردن دوربین"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "روشن کردن دوربین"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "دوربین از کار بیافتد و فرستادن ویدئو متوقف شود"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "دوربین به کار بیافتد و ویدئو ارسال شود"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "دوربین به کار بیافتد ولی ویدئو فرستاد نشود"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "پیش‌نمایش"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "تماس دوباره"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_ویدئو"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "خاموش کردن ویدئو"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "روشن کردن ویدئو"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "پیش‌نمایش ویدئو"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "نمایش نقشه‌ی آشنایان"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "ذخیره"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "پنجره اشکال‌زدایی"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "مکث"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "سطح "
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "اشکال‌زدایی"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "اطلاعات"
-#: ../src/empathy-debug-window.c:1520
-#: ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "پیغام"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "اخطار"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "حیاتی"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "خطا"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "زمان"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "دامنه"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "دسته‌بندی"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "سطح"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid "The selected connection manager does not support the remote debugging extension."
msgstr "مدیر اتصال انتخاب شده، از افزونه‌ی اشکال‌زدایی دوردست پشتیبانی نمی‌کند."
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "دعوت از شرکت‌کنندگان"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "آشنایی انتخاب کنید تا به گفتگو دعوت شود:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "دعوت"
@@ -3883,7 +4375,16 @@ msgstr "- حساب‌های امپاتی"
msgid "Empathy Accounts"
msgstr "حساب‌های امپاتی"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "نمایش یک سرویس خاص"
+
+#: ../src/empathy-debugger.c:75
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- اشکال‌زدای امپاتی"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "اشکال‌زدای امپاتی"
@@ -3891,42 +4392,98 @@ msgstr "اشکال‌زدای امپاتی"
msgid "- Empathy Chat Client"
msgstr "- کارگیر گپ امپاتی"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "پاسخ"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "رَد"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "پاسخ"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "پاسخگویی با ویدئو"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "چشم پوشی"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "پذیرش"
-#: ../src/empathy-notifications-approver.c:223
+#: ../src/empathy-notifications-approver.c:260
msgid "Provide"
msgstr "فراهم کردن"
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "تماس از دست رفته از %s"
-
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
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:560
+#: ../src/empathy-call-window.c:574
+msgid "i"
+msgstr "ر"
+
+#: ../src/empathy-call-window.c:1952
+msgid "On hold"
+msgstr "نگه داشتن پشت خط"
+
+#: ../src/empathy-call-window.c:1955
+msgid "Mute"
+msgstr "بی‌صدا"
+
+#: ../src/empathy-call-window.c:1957
+#| msgid "Location"
+msgid "Duration"
+msgstr "مدت"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:1960
+#, c-format
+#| msgid "Connected — %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "%s — %Id:%I02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+#| msgid "Match case"
+msgid "_Match case"
+msgstr "_تطابق کوچک و بزرگی حروف"
+
+#~ msgid "All"
+#~ msgstr "همه"
+
+#~ msgid "Date"
+#~ msgstr "تاریخ"
+
+#~ msgid "Conversations"
+#~ msgstr "مکالمات"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "مکالمه‌های قبلی"
+
+#~ msgid "_For:"
+#~ msgstr "_برای:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "پیام‌ سفارشی را وارد کنید"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "ذخیره پیام وضعیت _جدید"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "پیام‌های وضعیت ذخیره شده"
+
#~ msgid "_Enabled"
#~ msgstr "_فعال شد"
diff --git a/po/gl.po b/po/gl.po
index 7870c6369..0a5e117ef 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: 2011-07-04 21:07+0200\n"
-"PO-Revision-Date: 2011-07-04 21:07+0200\n"
+"POT-Creation-Date: 2011-08-16 19:15+0200\n"
+"PO-Revision-Date: 2011-08-16 19:17+0200\n"
"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
"Language: gl\n"
@@ -46,8 +46,20 @@ msgstr "Cliente de MI"
msgid "Always open a separate chat window for new chats."
msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
-# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volume da chamada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volume da chamada, como porcentaxe."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Dispositivo da cámara"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -56,17 +68,17 @@ msgstr ""
"alcume (tabulador) nunha conversa de grupo."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme"
msgstr "Tema da xanela de conversa"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Chat window theme variant"
msgstr "Variante do tema da xanela de charla"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
@@ -74,40 +86,46 @@ msgstr ""
"ex., «gl, pt, en»)."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Compact contact list"
msgstr "Lista de contactos compacta"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Connection managers should be used"
msgstr "Se se deberían usar xestores de conexión"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Contact list sort criterion"
msgstr "Criterio de ordenación da lista de contactos"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
+"dev/video0."
+
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Default directory to select an avatar image from"
msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Disable popup notifications when away"
msgstr "Desactivar as notificacións emerxentes cando se está ausente"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable sounds when away"
msgstr "Desactivar os sons cando se está ausente"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Display incoming events in the status area"
msgstr "Mostrar os eventos de entrada na área de estado"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -115,268 +133,272 @@ msgstr ""
"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
"directamente ao usuario."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "Compatibilidade de cancelación de eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can publish the user's location"
msgstr "Empathy pode publicar a localización dos usuarios"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy pode usar o GPS para seguir a localización"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the network to guess the location"
msgstr "Empathy pode usar a rede para adiviñar a localización"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy default download folder"
msgstr "Cartafol de descargas predeterminado do Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy migrou os seus rexistros de butterfly"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should auto-away when idle"
msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-connect on startup"
msgstr "O Empathy debería conectarse automaticamente ao inicio"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should reduce the location's accuracy"
msgstr "O Empathy debería reducir a precisión da localización"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"O Empathy debería usar o avatar do contacto como a icona da xanela de "
"conversa"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Enable WebKit Developer Tools"
msgstr "Activar as ferramentas de desenvolvedor WebKit"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable popup notifications for new messages"
msgstr "Activar as notificacións emerxentes para as mensaxes novas"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Enable spell checker"
msgstr "Activar a verificación ortográfica"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Hide main window"
msgstr "Agochar a xanela principal"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Hide the main window."
msgstr "Agochar a xanela principal."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Nick completed character"
msgstr "Carácter de completado de alcume"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Open new chats in separate windows"
msgstr "Abrir as novas conversas en xanelas separadas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Path of the Adium theme to use"
msgstr "Ruta do tema de Adium para usar"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound for incoming messages"
msgstr "Reproducir un son para as mensaxes entrantes"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for new conversations"
msgstr "Reproducir un son para as conversas novas"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for outgoing messages"
msgstr "Reproducir un son para as mensaxes saíntes"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when a contact logs in"
msgstr "Reproducir un son cando un contacto inicia unha sesión"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound when a contact logs out"
msgstr "Reproducir un son cando un contacto saia da sesión"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when we log in"
msgstr "Reproducir un son cando iniciamos a sesión"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when we log out"
msgstr "Reproducir un son cando saímos da sesión"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Pop up notifications if the chat isn't focused"
msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Pop up notifications when a contact logs in"
msgstr "Facer emerxer unha notificación cando un contacto entra"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications when a contact logs out"
msgstr "Facer emerxer unha notificación cando un contacto sae"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show Balance in contact list"
msgstr "Mostrar o balance na lista de contactos"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show avatars"
msgstr "Mostrar os avatares"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show contact list in rooms"
msgstr "Mostrar a lista de contactos nas salas"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show hint about closing the main window"
msgstr "Mostrar unha indicación sobre pechar a xanela principal"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show offline contacts"
msgstr "Mostrar os contactos desconectados"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show protocols"
msgstr "Mostrar os protocolos"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Spell checking languages"
msgstr "Idiomas para a corrección ortográfica"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The default folder to save file transfers in."
msgstr ""
"O cartafol predeterminado en que gardar as transferencias de ficheiros."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The last directory that an avatar image was chosen from."
msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The position for the chat window side pane"
msgstr "A posición do panel lateral da xanela de conversa"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
"A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The theme that is used to display the conversation in chat windows."
msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr ""
"A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Use graphical smileys"
msgstr "Usar emoticonas gráficas"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Use notification sounds"
msgstr "Usar sons de notificación"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use theme for chat rooms"
msgstr "Usar un tema para as salas de conversa"
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
"contactos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy can use the GPS to guess the location."
msgstr ""
"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
"a localización."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the network to guess the location."
msgstr ""
"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Indica se Empathy migrou os seus rexistros de butterfly."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
"ao inicio ou non."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
@@ -384,7 +406,7 @@ msgstr ""
"inactivo."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
@@ -392,14 +414,14 @@ msgstr ""
"motivos de privacidade."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
"xanela da conversa ou non."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
@@ -407,7 +429,7 @@ msgstr ""
"deberían ser activadas."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -416,7 +438,7 @@ msgstr ""
"desconectarse automaticamente ou non."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
@@ -424,80 +446,84 @@ msgstr ""
"as quere verificar."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
+
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Indica se reproducir ou non un son para notificar que os contactos inician "
"unha sesión na rede."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Indica se reproducir ou non un son para notificar que os contactos terminan "
"unha sesión na rede."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound to notify of events."
msgstr "Indica se reproducir ou non un son para notificar os eventos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play a sound to notify of new conversations."
msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to play a sound when logging into a network."
msgstr ""
"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to play a sound when logging out of a network."
msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
"ausente."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
"desconectado."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
"conectado."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -506,19 +532,19 @@ msgstr ""
"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
"mensaxe nova."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show account balances in the contact list."
msgstr "Indica se mostrar ou non os balances na lista de contactos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
@@ -526,38 +552,38 @@ msgstr ""
"das xanelas de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Indica se mostrar ou non os contactos que están desconectados na lista de "
"contactos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
"ou ocupado."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Indica se mostrar ou non os protocolos para os contacto na lista de "
"contactos."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Whether to show the contact list in chat rooms."
msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
msgid "Whether to show the contact list in compact mode."
msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -566,12 +592,12 @@ msgstr ""
"principal co botón 'x' da barra de título."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
msgid "Whether to use the theme for chat rooms."
msgstr "Indica se usar ou non o tema para as salas de conversa."
# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -699,7 +725,7 @@ msgstr "O estado está definido a desconectado"
# rever
#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Network error"
msgstr "Erro de rede"
@@ -888,67 +914,68 @@ msgstr "no futuro"
msgid "All accounts"
msgstr "Tódalas contas"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Conta"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "Contrasinal"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porto"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "A conta %s edítase mediante My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Non é posíbel editar a conta %s en Empathy."
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "Iniciar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Nome de _usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "Iniciar sesi_ón"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -958,20 +985,20 @@ msgstr "Ca_ncelar"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sobre %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "Conta nova"
@@ -983,6 +1010,7 @@ msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -1128,44 +1156,52 @@ msgstr "Opcións"
msgid "None"
msgstr "Ningún"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Codificación de caracteres:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"A maioría dos servidores IRC non precisan contrasinal, polo que se non está "
+"seguro non escriba un contrasinal."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Rede"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Rede:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Alcume:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Contrasinal:"
# rever
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Mensaxe de saída:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Nome real:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Servidores"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Cal é o seu alcume de IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Que rede IRC?"
@@ -1429,63 +1465,63 @@ msgstr "Todos os ficheiros"
msgid "Click to enlarge"
msgstr "Prema para ampliar"
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
msgid "There was an error starting the call"
msgstr "Produciuse un erro ao iniciar a chamada"
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "The specified contact doesn't support calls"
msgstr "O contacto especificado non admite as chamadas"
# rever
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
msgid "The specified contact is offline"
msgstr "O contacto especificado está desconectado"
# rever
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
msgid "The specified contact is not valid"
msgstr "O contacto especificado non é válido"
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
msgid "Emergency calls are not supported on this protocol"
msgstr "Este protocolo non admite as chamadas de emerxencia"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Produciuse un fallo ao abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Ese asunto non se admite nesta conversación"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Non se lle permite cambiar o asunto"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "«%s» non é un ID de contacto válido"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear, limpa todas as mensaxes da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>, estabelece o asunto da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1493,23 +1529,23 @@ msgstr ""
"/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
"actual"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact id> [<message>], abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact id> <message>, abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1519,11 +1555,11 @@ msgstr ""
"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
"unirse a unha nova sala de conversa\""
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1531,119 +1567,119 @@ msgstr ""
"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
"definida, mostra o seu uso."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Orde descoñecida"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "non ten balance suficiente para enviar a mensaxe"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "non é posíbel"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "contacto incorrecto"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "permiso denegado"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "a mensaxe é demasiado longa"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "non implementado"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "descoñecido"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Produciuse un erro ao enviar a mensaxe: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Asunto:"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Cambiouse o asunto a: %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Non se definiu un asunto"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Sen suxestións)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Engadir «%s» ao dicionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Engadir «%s» ao dicionario de %s"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Inserir unha emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1819
msgid "_Send"
msgstr "_Enviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "Suxestións de _ortografía"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Produciuse un fallo ao obter os rexistros recentes"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
@@ -1651,12 +1687,12 @@ msgstr "%s desconectou"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulsado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulsado"
@@ -1664,17 +1700,17 @@ msgstr "%s foi expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi vetado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s foi excluído"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s deixou a sala"
@@ -1684,70 +1720,69 @@ msgstr "%s deixou a sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s uniuse á sala"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2291
msgid "Disconnected"
msgstr "Desconectado"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Desexa gardar este contrasinal?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Lembrar"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Agora non"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Conversa"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1773,7 +1808,7 @@ msgid "Could not block contact"
msgstr "Non foi posíbel bloquear o contacto"
# rever
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
msgid "Edit Blocked Contacts"
msgstr "Editar os contactos bloqueados"
@@ -1793,15 +1828,22 @@ msgstr "Conta:"
msgid "Blocked Contacts"
msgstr "Contactos bloqueados"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Eliminar"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Abrir a ligazón"
@@ -1918,50 +1960,50 @@ msgid "_Block Contact"
msgstr "_Bloquear contacto"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Conversa"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audiochamada"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videochamada"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "Conversas _previas"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Enviar ficheiro"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Compartir o meu escritorio"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Favorito"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Infor_mación"
@@ -1972,14 +2014,14 @@ msgstr "_Editar"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "Conv_idar a sala de conversa"
@@ -2182,7 +2224,7 @@ msgstr "Altitude:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Localización"
@@ -2316,18 +2358,18 @@ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
#. 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
@@ -2335,7 +2377,7 @@ msgstr "_Editar"
# rever
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Ligar contactos…"
@@ -2438,129 +2480,130 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Desligar"
-#: ../libempathy-gtk/empathy-log-window.c:450
+#: ../libempathy-gtk/empathy-log-window.c:458
msgid "History"
msgstr "Historial"
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "Mostrar"
-#: ../libempathy-gtk/empathy-log-window.c:524
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "Buscar"
-#: ../libempathy-gtk/empathy-log-window.c:938
+#: ../libempathy-gtk/empathy-log-window.c:946
#, c-format
msgid "Chat in %s"
msgstr "Conversar en %s"
-#: ../libempathy-gtk/empathy-log-window.c:940
+#: ../libempathy-gtk/empathy-log-window.c:948
#, c-format
msgid "Chat with %s"
msgstr "Conversa con %s"
-#: ../libempathy-gtk/empathy-log-window.c:990
-#: ../libempathy-gtk/empathy-log-window.c:1153
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e de %B de %Y ás %X"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1110
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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:1116
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1172
-#: ../libempathy-gtk/empathy-log-window.c:1174
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:1181
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "A chamada levou %s, rematou ás %s"
-#: ../libempathy-gtk/empathy-log-window.c:1513
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "Hoxe"
-#: ../libempathy-gtk/empathy-log-window.c:1517
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "Mañá"
-#: ../libempathy-gtk/empathy-log-window.c:1533
+#: ../libempathy-gtk/empathy-log-window.c:1556
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%e de %B de %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1614
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr "Calquera momento"
-#: ../libempathy-gtk/empathy-log-window.c:1692
-#: ../libempathy-gtk/empathy-log-window.c:2041
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
msgid "Anyone"
msgstr "Calquera persoa"
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr "Quen"
-#: ../libempathy-gtk/empathy-log-window.c:2526
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr "Cando"
-#: ../libempathy-gtk/empathy-log-window.c:2642
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr "Calquera cousa"
-#: ../libempathy-gtk/empathy-log-window.c:2644
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "Conversas de texto"
-#: ../libempathy-gtk/empathy-log-window.c:2646
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "Chamadas"
# rever
-#: ../libempathy-gtk/empathy-log-window.c:2651
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "Chamadas entrantes"
# rever
-#: ../libempathy-gtk/empathy-log-window.c:2652
+#: ../libempathy-gtk/empathy-log-window.c:2781
msgid "Outgoing calls"
msgstr "Chamadas de voz saíntes"
-#: ../libempathy-gtk/empathy-log-window.c:2653
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "Chamadas perdidas de %s"
-#: ../libempathy-gtk/empathy-log-window.c:2674
+#: ../libempathy-gtk/empathy-log-window.c:2804
msgid "What"
msgstr "Que"
-#: ../libempathy-gtk/empathy-log-window.c:3369
+#: ../libempathy-gtk/empathy-log-window.c:3506
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
-#: ../libempathy-gtk/empathy-log-window.c:3373
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "Limpar todo"
-#: ../libempathy-gtk/empathy-log-window.c:3380
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr "Eliminar desde:"
@@ -2571,7 +2614,8 @@ msgstr "<span size=\"x-large\">Cargando…</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "Chamar"
@@ -2589,13 +2633,14 @@ msgid "Profile"
msgstr "Perfíl"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "V_ídeo"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "_Editar"
@@ -2624,17 +2669,17 @@ msgstr "Conversa nova"
# rever
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Enviar _Vídeo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "Ch_amar"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Nova chamada"
@@ -2767,18 +2812,12 @@ msgstr "Chamada de voz finalizada"
msgid "Edit Custom Messages"
msgstr "Editar mensaxes personalizadas"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
msgstr "Mensaxe editado ás %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "Normal"
@@ -2878,19 +2917,19 @@ msgstr "Lembrar esta elección para futuras conexións"
msgid "Certificate Details"
msgstr "Detalles do certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1715
msgid "Unable to open URI"
msgstr "Non foi posíbel abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "Select a file"
msgstr "Seleccione un ficheiro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1883
msgid "Insufficient free space to save file"
msgstr "Non hai espazo suficiente para gardar o ficheiro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1891
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2899,7 +2938,7 @@ msgstr ""
"Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
"dispoñíbeis. Elixa outra localización."
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
#, c-format
msgid "Incoming file from %s"
msgstr "Ficheiro entrante de %s"
@@ -3090,25 +3129,25 @@ msgid "Instant Message (Empathy)"
msgstr "Mensaxe instantáneo (Empathy)"
# rever
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "Non conectarse ao inicio"
# rever
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
# rever
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr " - Cliente de mensaxaría instantánea Empathy"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "Produciuse un erro ao contactar co Xestor de contas"
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3349,7 +3388,8 @@ 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:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1125
msgid "Connecting…"
msgstr "Conectando…"
@@ -3467,126 +3507,121 @@ msgid "People nearby"
msgstr "Persoas próximas"
# rever
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
msgid "- Empathy Audio/Video Client"
msgstr "- Cliente de son/vídeo Empathy"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
msgid "Empathy Audio/Video Client"
msgstr "Cliente de son/vídeo Empathy"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "Barra _lateral"
# rever
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Entrada de audio"
# rever
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Marcador"
# rever
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Detalles do contacto"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1626
#, c-format
msgid "Call with %s"
msgstr "Chamar con %s"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1870
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP como é visto polo computador"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1872
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-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1874
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-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1876
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1878
msgid "The IP address of the multicast group"
msgstr "O enderezo IP do grupo multicast"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Descoñecido"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Descoñecido"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Descoñecido"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Descoñecido"
# rever
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
# rever
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2610
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2648
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3595,8 +3630,8 @@ msgstr ""
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2653
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3605,8 +3640,8 @@ msgstr ""
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2659
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3615,25 +3650,25 @@ msgstr ""
"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
"que non permite conexións directas."
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2665
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2669
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de audio necesarios neste computador"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2672
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-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2684
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3644,141 +3679,123 @@ msgstr ""
"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
"xanela «Depurar» no menú Axuda."
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2693
msgid "There was a failure in the call engine"
msgstr "Produciuse un fallo ao chamar ao motor"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2696
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2736
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de audio"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2746
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Auto"
-# rever
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar ao contacto de novo"
-
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara desactivada"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara activada"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "Códec de decodificación:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar cámara e deter o envío do vídeo"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar cámara e enviar o vídeo"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "Desactivar cámara"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar cámara pero non enviar o vídeo"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "Desactivar o marcador"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "Códec de codificación:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "Colgar"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "Colgar chamada actual"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "Candidato local:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualizar"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Maximizarme"
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Remarcación"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimizarme"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Candidato remoto:"
# rever
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Enviar audio"
+# rever
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "Enviar vídeo"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "Mostrar marcador"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Iniciar vídeochamada"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Iniciar chamada de son"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Trocar cámara"
+
+#: ../src/empathy-call-window.ui.h:19
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Activar/desactivar transmisión de audio"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "Activar/desactivar transmisión de vídeo"
+
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:2246 ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2248 ../src/empathy-call-window.c:2249
msgid "Unknown"
msgstr "Descoñecido"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
-
-# rever
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desactivado"
-
-# rever
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo activado"
-
#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Previsualizar o vídeo"
+msgid "Video call"
+msgstr "Videochamada"
#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
@@ -3786,10 +3803,32 @@ msgid "_Call"
msgstr "_Chamar"
#: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "_Marcador"
+msgid "_Camera"
+msgstr "_Cámara"
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "_Contidos"
+
+#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_Depuración"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Micrófono"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Configuracións"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Ver"
@@ -3868,10 +3907,6 @@ msgstr "Mover a lapela á _dereita"
msgid "Notify for All Messages"
msgstr "Notificar todas as mensaxes"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Contidos"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Conversa"
@@ -3885,10 +3920,6 @@ msgstr "Des_prender lapela"
msgid "_Favorite Chat Room"
msgstr "Sala de conversa _favorita"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "A_xuda"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "Lapela _seguinte"
@@ -4229,12 +4260,12 @@ msgstr "Recargar…"
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "Lista de contactos"
# rever
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
@@ -4302,10 +4333,6 @@ msgstr "Contactos _bloqueados"
msgid "_Compact Size"
msgstr "Ta_maño compacto"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Depuración"
-
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Trans_ferencias de ficheiros"
@@ -4407,84 +4434,84 @@ msgstr "Lista de _salas"
msgid "_Room:"
msgstr "Sa_la:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:172
msgid "Message received"
msgstr "Mensaxe recibida"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:173
msgid "Message sent"
msgstr "Mensaxe enviada"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:174
msgid "New conversation"
msgstr "Conversa nova"
# rever
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:175
msgid "Contact goes online"
msgstr "O contacto conéctase"
# rever
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:176
msgid "Contact goes offline"
msgstr "O contacto desconéctase"
# rever
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:177
msgid "Account connected"
msgstr "Conta conectada"
# rever
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:178
msgid "Account disconnected"
msgstr "Conta desconectada"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:487
msgid "Language"
msgstr "Idioma"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:737
msgid "Juliet"
msgstr "Xulieta"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:744
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:750
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:753
msgid "Deny thy father and refuse thy name;"
msgstr "Nega ao teu pai e rexeita o teu nome;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:756
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Ou, se non queres, xúrame tan só que me amas"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:759
msgid "And I'll no longer be a Capulet."
msgstr "Y deixarei eu de ser unha Capuleto."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:762
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Debo escoitar máis ou contestar ao dito?"
# rever
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:765
msgid "Juliet has disconnected"
msgstr "Xulieta desconectouse"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1173
msgid "Preferences"
msgstr "Preferencias"
@@ -4492,75 +4519,83 @@ msgstr "Preferencias"
msgid "Appearance"
msgstr "Aparencia"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Comportamento"
# rever
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "T_ema da conversa:"
# rever
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
# rever
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Mostrar os eventos de entrada na área de notificación"
# rever
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Activar as notificacións cando un contacto está conectado"
# rever
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Activar as notificacións cando un contacto está desconectado"
# rever
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Activar as notificacións cando a _conversa non está enfocada"
# rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Activar a verificación ortográfica para os idiomas:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Xeral"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Nivel de entrada"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Volume de entrada"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Fontes de localización:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Rexistrar conversas"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notificacións"
# rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Reproducir un son para os eventos"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Privacidade"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4571,25 +4606,25 @@ msgstr ""
"aproximadas a 1 valor decimal."
# rever
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "Mostrar as _emoticonas como imaxes"
# rever
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Mostrar a _lista de contactos nas salas"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Sons"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Verificación ortográfica"
# rever
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -4597,53 +4632,53 @@ msgstr ""
"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
"dicionario instalado."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "Variante:"
# rever
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "_Conectar automaticamente ao iniciar"
# rever
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_Teléfono móbil"
# rever
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Activar as burbullas de notificación"
# rever
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Activar as notificacións de son"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Rede (IP, Wifi)"
# rever
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "A_brir as conversas novas en xanelas separadas"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publicar a miña localización aos meus contactos"
#. 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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Reducir a precisión de localización"
@@ -4655,67 +4690,118 @@ msgstr "Estado"
msgid "_Quit"
msgstr "_Saír"
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Chamar ao contacto de novo"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Cámara desactivada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Cámara activada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar cámara e deter o envío do vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activar cámara e enviar o vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activar cámara pero non enviar o vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Remarcación"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vídeo desactivado"
+
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Vídeo activado"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Previsualizar o vídeo"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Vista de mapa de contactos"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "Gardar"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "Depurar xanela"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "Pausa"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "Depuración"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "Mensaxe"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "Aviso"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "Erro"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "Tempo"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -4723,16 +4809,16 @@ msgstr ""
"O xestor de conexión seleccionado non é compatíbel coa extensión de "
"depuración remota."
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "Invitar participante"
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "Seleccione o contacto que quere invitar á conversa:"
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "Invitar"
@@ -4766,7 +4852,15 @@ msgstr "- Contas de Empathy"
msgid "Empathy Accounts"
msgstr "Contas de Empathy"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Mostrar un servizo en particular"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador de Empathy"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
@@ -4812,26 +4906,41 @@ msgstr "Fornecer"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
-#: ../src/empathy-call-window.c:1246
-#, c-format
-msgid "Call with %d participants"
-msgstr "Chamada con %d participantes"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1008 ../src/empathy-call-window.c:1027
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2539
+msgid "On hold"
+msgstr "En espera"
+
+#: ../src/empathy-call-window.c:2542
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2544
+msgid "Duration"
+msgstr "Duración"
# rever
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:2547
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr "En espera"
-
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "_Coincidir con capitalización"
+#~ msgid "Call with %d participants"
+#~ msgstr "Chamada con %d participantes"
+
+#~ msgid "_Dialpad"
+#~ msgstr "_Marcador"
+
#~ msgid "Enter Custom Message"
#~ msgstr "Insira unha mensaxe personalizada"
diff --git a/po/he.po b/po/he.po
index 5ad0a5573..34795ea6f 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: 2011-07-15 10:18+0300\n"
-"PO-Revision-Date: 2011-07-15 10:21+0200\n"
+"POT-Creation-Date: 2011-08-06 15:46+0300\n"
+"PO-Revision-Date: 2011-08-06 15:51+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"Language: \n"
@@ -38,6 +38,14 @@ msgid "Always open a separate chat window for new chats."
msgstr "Always open a separate chat window for new chats."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "עצמת השמע של השיחה"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "עצמת שמע השיחה באחוזים."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -45,49 +53,49 @@ msgstr ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Chat window theme"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "Chat window theme variant"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "Compact contact list"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "Connection managers should be used"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "Contact list sort criterion"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "Default directory to select an avatar image from"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Disable popup notifications when away"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Disable sounds when away"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Display incoming events in the status area"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -95,238 +103,238 @@ msgstr ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy can publish the user's location"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy can use the GPS to guess the location"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy can use the cellular network to guess the location"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy can use the network to guess the location"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Empathy default download folder"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy has migrated butterfly logs"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy should auto-away when idle"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy should auto-connect on startup"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy should reduce the location's accuracy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
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.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "Enable WebKit Developer Tools"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Enable popup notifications for new messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "Enable spell checker"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Hide main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "Hide the main window."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "Nick completed character"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Open new chats in separate windows"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Path of the Adium theme to use"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "Play a sound for incoming messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "Play a sound for new conversations"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "Play a sound for outgoing messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "Play a sound when a contact logs in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "Play a sound when a contact logs out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "Play a sound when we log in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "Play a sound when we log out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
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.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Pop up notifications when a contact logs in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Pop up notifications when a contact logs out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
msgstr "Show Balance in contact list"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "Show avatars"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "Show contact list in rooms"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "Show hint about closing the main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "Show offline contacts"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Show protocols"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "The default folder to save file transfers in."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "The last directory that an avatar image was chosen from."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "The position for the chat window side pane"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "The stored position (in pixels) of the chat window side pane."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "The theme that is used to display the conversation in chat windows."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
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.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Use notification sounds"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Use theme for chat rooms"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Whether Empathy can publish the user's location to their contacts."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Whether Empathy can use the GPS to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Whether Empathy can use the cellular network to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Whether Empathy can use the network to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Whether Empathy has migrated butterfly logs."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "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.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
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.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
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.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
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.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -334,64 +342,64 @@ msgstr ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
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.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Whether to convert smileys into graphical images in conversations."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Whether to play a sound to notify of contacts logging into the network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
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.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "Whether to play a sound to notify of events."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Whether to play a sound to notify of incoming messages."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "Whether to play a sound to notify of new conversations."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Whether to play a sound to notify of outgoing messages."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "Whether to play a sound when logging into a network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "Whether to play a sound when logging out of a network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Whether to play sound notifications when away or busy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Whether to show a popup notification when a contact goes offline."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Whether to show a popup notification when a contact goes online."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -399,41 +407,41 @@ 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.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Whether to show a popup notification when receiving a new message."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
msgstr "Whether to show account balances in the contact list."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Whether to show avatars for contacts in the contact list and chat windows."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Whether to show contacts that are offline in the contact list."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "Whether to show popup notifications when away or busy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Whether to show protocols for contacts in the contact list."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Whether to show the contact list in chat rooms."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "Whether to show the contact list in compact mode."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -441,11 +449,11 @@ 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.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "Whether to use the theme for chat rooms."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -734,66 +742,67 @@ msgstr "בעתיד"
msgid "All accounts"
msgstr "כל החשבונות"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "חשבון"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "ססמה"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "שרת"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "פתחה"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "החשבון %s נערך דרך החשבונות המקוונים שלי."
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "לא ניתן לערוך את החשבון %s ב־Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "טעינת החשבונות המקוונים שלי"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "ש_ם משתמש:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "ה_חלה"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "_כניסה"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "חשבון זה כבר קיים על השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "יצירת חשבון חדש על השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "_ביטול"
@@ -802,19 +811,19 @@ msgstr "_ביטול"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "‏%1$s על גבי %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "חשבון %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "חשבון חדש"
@@ -826,6 +835,7 @@ msgstr "<span size=\"small\"><b>דוגמה:</b> MyScreenName</span>"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -968,43 +978,49 @@ msgstr "אפשרויות"
msgid "None"
msgstr "ללא"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "קידוד תווים:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "רשת"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "רשת:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "כינוי:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "ססמה:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "הודעת יציאה:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "שם אמיתי:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "שרתים"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "מהו הכינוי שלך ב־IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "איזו רשת IRC?"
@@ -1276,62 +1292,62 @@ msgstr "איש הקשר המסוים הזה אינו תקני"
msgid "Emergency calls are not supported on this protocol"
msgstr "אין תמיכה בשיחות חירום בפרוטוקול זה"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "ארע כשל בפתיחת שיחה פרטית"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "אין תמיכה בשימוש בנושא בדיון זה"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "אין לך הרשאה לשנות את הנושא"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "\"%s\" אינו מזהה איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <נושא>:‎ הגדרת נושא השיחה הנוכחית"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הוא בררת המחדל"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <זיהוי איש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳אט אישי"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <זיהוי איש הקשר>‎ <הודעה>:‎ פתיחת צ׳אט פרטי"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1340,11 +1356,11 @@ msgstr ""
"/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות "
"המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטים על איש הקשר"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1352,113 +1368,113 @@ msgstr ""
"/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. אם יש הגדרה ל־<פקודה> יוצג אופן "
"הפעלתה."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "שימוש: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "פקודה לא ידועה"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "המאזן אינו מאפשר לשלוח הודעה"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "ללא יכולת"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "לא מחובר"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "הודעה ארוכה מדי"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "לא ממומש"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "לא ידוע"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "שגיאה בשליחת ההודעה '%s': ‏%s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "שגיאה בשליחת ההודעה: ‏%s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "נושא:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "הנושא הוגדר ל־: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "לא נקבע נושא"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(אין הצעות)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "הוספת '%s' למילון"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "הוספת '%s' למילון %s"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "הכנס סמיילי"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
msgid "_Send"
msgstr "_שלח"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "הצעות _איות"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "ארע כשל בקבלת הדוחות האחרונים"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "‏%s התנתק"
@@ -1466,12 +1482,12 @@ msgstr "‏%s התנתק"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "‏%1$s סולק על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "‏%s סולק"
@@ -1479,17 +1495,17 @@ msgstr "‏%s סולק"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "‏%1$s נחסם על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "‏%s נחסם"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "‏%s עזב את החדר"
@@ -1499,69 +1515,68 @@ msgstr "‏%s עזב את החדר"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "‏%s הצטרף לחדר"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "‏%s נודע כעת בכינוי %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1858
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1704
msgid "Disconnected"
msgstr "מנותק"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "האם ברצונך לאחסן ססמה זו?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "שמירה"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "לא כעת"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "ניסיון חוזר"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "ססמה שגויה; נא לנסות שוב:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "חדר זה מוגן בססמה:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "הצטרפות"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2105
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "מחובר"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "שיחה"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1975,7 +1990,7 @@ msgstr "גובה:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "מיקום"
@@ -2314,6 +2329,7 @@ msgid "Text chats"
msgstr "מלל הצ׳אטים"
#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "שיחות"
@@ -2352,7 +2368,8 @@ msgstr "<span size=\"x-large\">בטעינה...</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "התקשרות"
@@ -2370,13 +2387,14 @@ msgid "Profile"
msgstr "פרופיל"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "וידאו"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "ע_ריכה"
@@ -2642,15 +2660,15 @@ msgstr "פרטי התעודה"
msgid "Unable to open URI"
msgstr "לא ניתן לפתוח את הכתובת"
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
msgid "Select a file"
msgstr "בחירת קובץ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
msgid "Insufficient free space to save file"
msgstr "אין די מקום פנוי לשמירת הקובץ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2659,7 +2677,7 @@ msgstr ""
"נדרשים %s של מקום פנוי כדי לשמור קובץ זה, אך ישנם רק %s פנויים. נא לבחור "
"במיקום אחר."
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
#, c-format
msgid "Incoming file from %s"
msgstr "קובץ נכנס מ־%s"
@@ -2847,23 +2865,23 @@ msgstr "אין הודעת שגיאה"
msgid "Instant Message (Empathy)"
msgstr "הודעה מיידית (Empathy)"
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "לא להתחבר בהפעלה"
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "אין להציג את רשימת אנשי הקשר או כל דו־שיח אחר בהפעלה"
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- לקוח המסרים המידיים Empathy"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "שגיאה ביצירת קשר עם מנהל החשבונות"
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3090,7 +3108,7 @@ msgid "Your new account has not been saved yet."
msgstr "החשבון החדש שלך לא נשמר עדיין."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:880
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:653
msgid "Connecting…"
msgstr "בהתחברות…"
@@ -3205,129 +3223,124 @@ msgstr "- לקוח השמע/הווידאו Empathy"
msgid "Empathy Audio/Video Client"
msgstr "לקוח השמע/הווידאו Empathy"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:458
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "ניגוד"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:461
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "בהירות"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:464
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "גאמה"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:569
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "עצמה"
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "_סרגל צד"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "קלט שמע"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "קלט וידאו"
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "מקשי חיוג"
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "פרטים"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1250
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1043
#, c-format
msgid "Call with %s"
msgstr "שיחה עם %s"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1447
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1287
msgid "The IP address as seen by the machine"
msgstr "כתובת ה־IP כפי שנראית על ידי המחשב"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1449
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1289
msgid "The IP address as seen by a server on the Internet"
msgstr "כתובת ה־IP כפי שנראית על ידי שרת באינטרנט"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1451
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1291
msgid "The IP address of the peer as seen by the other side"
msgstr "כתובת ה־IP כדי שנראית על ידי עמית מהצד השני"
-#: ../src/empathy-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1453
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1293
msgid "The IP address of a relay server"
msgstr "כתובת ה־IP של שרת הממסר"
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1295
msgid "The IP address of the multicast group"
msgstr "כתובת ה־IP של קבוצת התשדורת"
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "לא ידוע"
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "לא ידוע"
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "לא ידוע"
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "לא ידוע"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "מחובר — %d:%02d דק׳"
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2167
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2023
msgid "Technical Details"
msgstr "פרטים טכניים"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2205
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2061
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "התכנה של %s אינה מבינה את מבני השמע הנתמכים על ידי המחשב שלך"
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2210
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "התכנה של %s אינה מבינה את מבני הווידאו הנתמכים על ידי המחשב שלך"
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2072
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3336,25 +3349,25 @@ msgstr ""
"לא ניתן להפעיל את החיבור אל %s. כנראה אחד ממשתתפי השיחה מחובר לרשת שאינה "
"מאפשרת חיבורים ישירים."
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2222
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2078
msgid "There was a failure on the network"
msgstr "אירעה שגיאה ברשת"
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2226
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2082
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
-#: ../src/empathy-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2229
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2085
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2241
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2097
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3364,36 +3377,31 @@ msgstr ""
"משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> "
"ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה."
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2106
msgid "There was a failure in the call engine"
msgstr "אירעה שגיאה במנוע הקריאה"
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2253
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2109
msgid "The end of the stream was reached"
msgstr "התזרים הגיע לסיומו"
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2293
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2149
msgid "Can't establish audio stream"
msgstr "לא ניתן לקיים תזרים שמע"
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2303
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2159
msgid "Can't establish video stream"
msgstr "לא ניתן לקיים תזרים וידאו"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "שמע"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "התקשרות חוזרת לאיש הקשר"
-
#: ../src/empathy-call-window.ui.h:3
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
@@ -3436,53 +3444,77 @@ msgid "Minimise me"
msgstr "מזעור"
#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "חיוג חוזר"
-
-#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "מועמד מרוחק:"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "שלח צליל"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
msgid "Send Video"
msgstr "שליחת וידאו"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
msgid "Show dialpad"
msgstr "הצגת מקשי חיוג"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "התחלה בשיחת וידאו"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "התחלה בשיחת שמע"
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "החלפה בין העברה ואי העברה של שמע"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
msgid "Toggle video transmission"
msgstr "החלפת מצב העברת וידאו"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1813 ../src/empathy-call-window.c:1814
-#: ../src/empathy-call-window.c:1815 ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:1659 ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1661 ../src/empathy-call-window.c:1662
msgid "Unknown"
msgstr "לא ידוע"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video call"
+msgstr "שיחת וידאו"
+
+#: ../src/empathy-call-window.ui.h:23
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_שיחה"
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_תצוגה"
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "_תכנים"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_ניפוי שגיאות"
+
+#: ../src/empathy-call-window.ui.h:27 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "ע_זרה"
+
+#: ../src/empathy-call-window.ui.h:28
+msgid "_Microphone"
+msgstr "_מיקרופון"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "_Settings"
+msgstr "ה_גדרות"
#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
@@ -3555,10 +3587,6 @@ msgstr "הזזת הלשונית _ימינה"
msgid "Notify for All Messages"
msgstr "התרעה עבור כל ההודעות"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_תכנים"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_שיחה"
@@ -3571,10 +3599,6 @@ msgstr "_ניתוק הלשונית"
msgid "_Favorite Chat Room"
msgstr "_הוספת חדר השיחה למועדפים"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "ע_זרה"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "ה_לשונית הבאה"
@@ -3883,11 +3907,11 @@ msgstr "Top Up..."
msgid "Contact"
msgstr "איש קשר"
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "רשימת אנשי קשר"
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "הצגה ועריכה של חשבונות"
@@ -3951,10 +3975,6 @@ msgstr "אנשי קשר _חסומים"
msgid "_Compact Size"
msgstr "גודל _קומפקטי"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_ניפוי שגיאות"
-
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "העברות _קבצים"
@@ -3983,6 +4003,11 @@ msgstr "_חדר"
msgid "_Search for Contacts…"
msgstr "_חיפוש אחר אנשי קשר…"
+#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "_View"
+msgstr "_תצוגה"
+
#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
msgstr "חדר שיחה"
@@ -4049,79 +4074,79 @@ msgstr "רשימת חדרים"
msgid "_Room:"
msgstr "_חדר:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:171
msgid "Message received"
msgstr "התקבלה הודעה"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:172
msgid "Message sent"
msgstr "הודעה נשלחה"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:173
msgid "New conversation"
msgstr "שיחה חדשה"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:174
msgid "Contact goes online"
msgstr "איש קשר מתחבר"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:175
msgid "Contact goes offline"
msgstr "איש קשר מתנתק"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:176
msgid "Account connected"
msgstr "חשבון מחובר"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:177
msgid "Account disconnected"
msgstr "חשבון נותק"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:480
msgid "Language"
msgstr "שפה"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:730
msgid "Juliet"
msgstr "יוליה"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:737
msgid "Romeo"
msgstr "רומיאו"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:743
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "הו רומיאו, רומיאו, מן אין שבת רומיאו?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:746
msgid "Deny thy father and refuse thy name;"
msgstr "התכחש לאביך וסרב לשמו;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:749
msgid "Or if thou wilt not, be but sworn my love"
msgstr "או אם לא תסכים, אשבע לך באהבתי"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:752
msgid "And I'll no longer be a Capulet."
msgstr "ולא אהיה עוד בת קפולט."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:755
msgid "Shall I hear more, or shall I speak at this?"
msgstr "האם דיברתי די או שמא אוסיף לדבר?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:758
msgid "Juliet has disconnected"
msgstr "יוליה התנתקה"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1164
msgid "Preferences"
msgstr "העדפות"
@@ -4129,67 +4154,75 @@ msgstr "העדפות"
msgid "Appearance"
msgstr "מראה"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "התנהגות"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "ער_כת נושא לשיחה:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "ביטול התרעות בזמן מצב _מרוחק או עסוק"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "ביטול צלילים בזמן מצב _מרוחק או עסוק"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "הצגת אירועים נכנסים באזור הדיווחים"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "הפעלת התרעות כאשר איש קשר מתחבר"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "הפעלת התרעות כאשר איש קשר מתנתק"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "איפשור התרעות כאשר חלון ה_שיחה אינו ממוקד"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "הפעלת בדיקת איות עבור השפות:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "כללי"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "רמת הקלט"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "עצמת הקלט"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "מקורות המיקומים:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "רישום השיחות"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "התרעות"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "השמעת צליל עבור אירועים"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "פרטיות"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4198,70 +4231,70 @@ msgstr ""
"הפחתת רמת הדיוק של המיקום אומרת שהמידע המדויק ביותר שיפורסם הוא העיר, המדינה "
"והארץ שלך. הדיוק של נקודות ציון מ־GPS יהיו עם מספר עשרוני 1."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "הצגת _סמיילים כתמונות"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "הצגת _רשימת אנשי קשר בחדרים"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "צלילים"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "בדיקת איות"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "ברשימת השפות מוצגות שפות שעבורן מותקנים אצלך מילונים."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "ערכות נושא"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "הגוון:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "התחברות _אוטומטית עם ההפעלה"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "טלפון _סלולרי"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "ה_פעלת התרעות בתוך בועה"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "ה_פעלת התרעות קוליות"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_רשת (IP, אלחוטית)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_פתיחת שיחות חדשות בחלונות נפרדים"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "ה_פחתת דיוק המיקום"
@@ -4273,6 +4306,10 @@ msgstr "מצב"
msgid "_Quit"
msgstr "יצי_אה"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "התקשרות חוזרת לאיש הקשר"
+
#: ../src/empathy-streamed-media-window.ui.h:3
msgid "Camera Off"
msgstr "כיבוי המצלמה"
@@ -4297,6 +4334,10 @@ msgstr "הפעלת המצלמה אך ללא שליחת וידאו"
msgid "Preview"
msgstr "תצוגה מקדימה"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "חיוג חוזר"
+
#: ../src/empathy-streamed-media-window.ui.h:19
msgid "V_ideo"
msgstr "_וידאו"
@@ -4317,78 +4358,78 @@ msgstr "תצוגה מקדימה לווידאו"
msgid "Contact Map View"
msgstr "מפת אנשי קשר"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "שמירה"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "חלון ניפוי שגיאות"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "השהייה"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "רמה"
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "ניפוי שגיאות"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "מידע"
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "הודעה"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "אזהרה"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "קריטי"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "שגיאה"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "זמן"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "תחום"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "קטגוריה"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "רמה"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ניפוי שגיאות מרחוק."
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "הזמנת משתתפים"
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "נא לבחור אנשי קשר להזמנה לדיון:"
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "הזמנה"
@@ -4419,7 +4460,15 @@ msgstr "- חשבונות Empathy"
msgid "Empathy Accounts"
msgstr "חשבונות Empathy"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "הצגת שירות מסוים"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- מנפה השגיאות של Empathy"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "מנפה השגיאות של Empathy"
@@ -4465,25 +4514,33 @@ msgstr "התקבלה בקשת שיחה מאת %s, אך באותו הזמן כב
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:787 ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:560 ../src/empathy-call-window.c:574
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1257
+#: ../src/empathy-call-window.c:1050
#, c-format
msgid "Call with %d participants"
msgstr "שיחה עם %d משתתפים"
+#: ../src/empathy-call-window.c:1952
+msgid "On hold"
+msgstr "בהמתנה"
+
+#: ../src/empathy-call-window.c:1955
+msgid "Mute"
+msgstr "השתק"
+
+#: ../src/empathy-call-window.c:1957
+msgid "Duration"
+msgstr "משך"
+
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2104
+#: ../src/empathy-call-window.c:1960
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02d דק׳"
-#: ../src/empathy-call-window.c:2105
-msgid "On hold"
-msgstr "בהמתנה"
-
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "התאמת _רישיות"
@@ -4754,10 +4811,6 @@ msgstr "התאמת _רישיות"
#~ msgid "Import Accounts..."
#~ msgstr "ייבוא חשבונות..."
-#~| msgid "<b>Settings</b>"
-#~ msgid "Settings"
-#~ msgstr "הגדרות"
-
#~ msgid "Type:"
#~ msgstr "סוג:"
@@ -4957,12 +5010,6 @@ msgstr "התאמת _רישיות"
#~ msgid "salut account settings"
#~ msgstr "הגדרות חשבון salut"
-#~ msgid "Input"
-#~ msgstr "קלט"
-
-#~ msgid "Mute"
-#~ msgstr "השתק"
-
#~ msgid "Output"
#~ msgstr "פלט"
diff --git a/po/hu.po b/po/hu.po
index 8138d4cf3..b1e5965bf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,12 +3,13 @@
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, Free Software Foundation, Inc.
#
# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
+# Balázs Meskó <meskobalazs at gmail dot com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-30 14:24+0200\n"
-"PO-Revision-Date: 2011-06-30 20:20+0200\n"
+"POT-Creation-Date: 2011-08-02 01:15+0200\n"
+"PO-Revision-Date: 2011-08-02 01:17+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
"Language: \n"
@@ -39,6 +40,14 @@ msgid "Always open a separate chat window for new chats."
msgstr "Mindig külön ablakot nyisson az új csevegéseknek."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Hívás hangereje"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Hívás hangereje százalékban."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -46,49 +55,49 @@ msgstr ""
"Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
"csoportos csevegésben."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Csevegőablak témája"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "Csevegőablak témájának változata"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
"listája (például: „en, fr, hu”)."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "Tömör partnerlista"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "Használandó kapcsolatkezelők"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "Partnerlista rendezési feltétele"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Felugró értesítések tiltása ha nincs itt"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Hangok tiltása ha nincs itt"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Bejövő események megjelenítése az állapotterületen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -96,287 +105,289 @@ msgstr ""
"Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
"megjeleníti ezeket a felhasználónak."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Az Empathy közzéteheti a felhasználó helyét"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Az Empathy alapértelmezett letöltési mappája"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Az Empathy átköltöztette az MSN-naplókat"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Az Empathy csökkentse-e a hely pontosságát?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "WebKit fejlesztőeszközök engedélyezése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Felugró értesítések értesítések engedélyezése új üzenetekre"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "Helyesírás-ellenőrző engedélyezése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Főablak elrejtése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "A főablak elrejtése."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "Kiegészített becenevet jelző karakter"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Új csevegések megnyitása külön ablakokban"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "A használandó Adium téma útvonala"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "Hang lejátszása érkező üzenetekhez"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "Hang lejátszása új társalgásokhoz"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "Hang lejátszása kimenő üzenetekhez"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "Hang lejátszása partner bejelentkezésekor"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "Hang lejátszása partner kijelentkezésekor"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "Hang lejátszása bejelentkezéskor"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "Hang lejátszása kijelentkezéskor"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
msgstr "Egyenleg megjelenítése a partnerlistában"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "Avatarok megjelenítése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "Partnerlista megjelenítése szobákban"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "Tanács megjelenítése a főablak bezárásakor"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "Kilépett partnerek megjelenítése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Protokollok megjelenítése"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "Helyesírás-ellenőrző nyelvei"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "A csevegőablak oldalsávjának pozíciója"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The theme variant that is used to display the conversation in chat windows."
msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Grafikus hangulatjelek használata"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Értesítő hangok használata"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Téma használata a csevegőszobákhoz"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Az Empathy átköltöztette-e az MSN naplókat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to check words typed against the languages you want to check with."
msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Hangulatjelek képekké alakítása társalgások közben."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a hálózatból?"
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
+"hálózatból?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
"válik."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -384,53 +395,53 @@ msgstr ""
"Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
"csevegés meg van nyitva, de nincs fókuszban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
"csevegőablakokban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Kilépett partnerek megjelenítése a partnerlistában."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
"csevegőablakokban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "Megjelenjen-e a partnerlista tömör módban."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "Használandó-e téma a csevegőszobákhoz."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -717,66 +728,67 @@ msgstr "a jövőben"
msgid "All accounts"
msgstr "Minden fiók"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Fiók"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "Jelszó"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Kiszolgáló"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "A(z) %s fiók szerkesztésre került a webes fiókjaimmal."
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "A webes fiókjaim elindítása"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Felhasználónév:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "_Alkalmazás"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "Bejele_ntkezés"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "Ez a fiók már létezik a kiszolgálón"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "Új fiók létrehozása a kiszolgálón"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "Mé_gse"
@@ -785,19 +797,19 @@ msgstr "Mé_gse"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s ezen: %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "%s fiók"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "Új fiók"
@@ -809,6 +821,7 @@ msgstr "<b>Például:</b> Sajátnevem"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -951,43 +964,51 @@ msgstr "Beállítások"
msgid "None"
msgstr "Nincs"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Karakterkészlet:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"A legtöbb IRC-kiszolgáló nem kér jelszót, ha bizonytalan, akkor ne írjon be "
+"jelszót."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Hálózat"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Hálózat:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Becenév:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Jelszó:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Kilépési üzenet:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Valódi név:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Kiszolgálók"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Mi az Ön IRC beceneve?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Melyik IRC-hálózat?"
@@ -1260,40 +1281,40 @@ msgstr "A kiválasztott partner nem érvényes"
msgid "Emergency calls are not supported on this protocol"
msgstr "A vészhívások nem támogatottak ezzel a protokollal"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Nem sikerült privát csevegést nyitni"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "A téma nem támogatott ebben a csevegésben"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "A téma megváltoztatása nem engedélyezett"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "A(z) „%s” nem érvényes partnerazonosító"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: az aktuális társalgás összes üzenetének törlése"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <téma>: az aktuális társalgás témájának beállítása"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <szobaazonosító>: csatlakozás új csevegőszobához"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <szobaazonosító>: csatlakozás új csevegőszobához"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1301,23 +1322,23 @@ msgstr ""
"/part [<csevegőszoba-azonosító>] [<ok>]: csevegőszoba elhagyása, "
"alapértelmezés a jelenlegi"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <partnerazonosító> [<üzenet>]: privát csevegés megnyitása"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <partnerazonosító> <üzenet>: privát csevegés megnyitása"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <becenév>: becenév módosítása a jelenlegi kiszolgálón"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <üzenet>: tevékenység üzenet küldése az aktuális társalgásba"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1327,11 +1348,11 @@ msgstr ""
"jellel kezdődő üzenetek küldésére használatos. Például: „/say /join "
"#csevegőszoba, így léphet be új csevegőszobába”"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <partnerazonosító>: információk megjelenítése egy partnerről"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1339,113 +1360,113 @@ msgstr ""
"/help [<parancs>]: minden támogatott parancs megjelenítése. Ha a <parancs> "
"meg van adva, akkor annak használatát jeleníti meg."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Használat: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Ismeretlen parancs"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Ismeretlen parancs, lásd a /help kimenetét az elérhető parancsokért"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "Az egyenleg nem elég az üzenet elküldéséhez"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "nem lehetséges"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "kilépett"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "érvénytelen partner"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "hozzáférés megtagadva"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "túl hosszú üzenet"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "nincs megvalósítva"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "ismeretlen"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "hiba a(z) „%s” üzenet elküldésekor: %s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Hiba az üzenet elküldésekor: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Téma:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Téma beállítva: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Nincs megadva témakör"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Nincs javaslat)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "„%s” hozzáadása a szótárhoz"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "„%s” hozzáadása a(z) %s szótárhoz"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Hangulatjel beszúrása"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-chat.c:2224
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Küldés"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Helyesírási javaslatok"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Nem sikerült lekérni a legutóbbi naplókat"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s kilépett"
@@ -1453,12 +1474,12 @@ msgstr "%s kilépett"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s kirúgta a következőt: %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s kirúgva"
@@ -1466,17 +1487,17 @@ msgstr "%s kirúgva"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s kitiltotta a következőt: %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s kitiltva"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s elhagyta a szobát"
@@ -1486,69 +1507,69 @@ msgstr "%s elhagyta a szobát"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s belépett a szobába"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s mostantól %s néven ismert"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1666
msgid "Disconnected"
msgstr "Kapcsolat bontva"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Szeretné tárolni ezt a jelszót?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Megjegyzés"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Most nem"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Újra"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Hibás jelszó, próbálja újra:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Ezt a szobát jelszó védi:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Csatlakozás"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1914
msgid "Connected"
msgstr "Kapcsolódva"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Társalgás"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1594,13 +1615,13 @@ msgstr "Blokkolt partnerek"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "Hivatkozás cí_mének másolása"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Hivatkozás megnyitása"
@@ -1708,48 +1729,48 @@ msgid "_Block Contact"
msgstr "Partner _blokkolása"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Csevegés"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Hanghívás"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videohívás"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "K_orábbi társalgások"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Fájl küldése"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Az asztalom megosztása"
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Kedvenc"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "_Információk"
@@ -1759,13 +1780,13 @@ msgid "_Edit"
msgstr "S_zerkesztés"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Meghívás ebbe a szobába"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "Meg_hívás csevegőszobába"
@@ -1962,7 +1983,7 @@ msgstr "Magasság:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Hely"
@@ -2089,25 +2110,25 @@ msgstr "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva.
#. 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "S_zerkesztés"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Partnerek összekapcsolása…"
@@ -2207,116 +2228,127 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "S_zétválasztás"
-#: ../libempathy-gtk/empathy-log-window.c:419
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Előzmények"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "Megjelenítés"
-#: ../libempathy-gtk/empathy-log-window.c:441
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "Keresés"
-#: ../libempathy-gtk/empathy-log-window.c:676
-#: ../libempathy-gtk/empathy-log-window.c:840
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%Y. %B %e %A, %X"
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Csevegés itt: %s"
-#: ../libempathy-gtk/empathy-log-window.c:678
+#: ../libempathy-gtk/empathy-log-window.c:948
#, c-format
msgid "Chat with %s"
msgstr "Csevegés vele: %s"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Y. %B %e %A, %X"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:797
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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:803
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:859
-#: ../libempathy-gtk/empathy-log-window.c:861 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:868
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Hívás hossza: %s, befejezve: %s"
-#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "Ma"
-#: ../libempathy-gtk/empathy-log-window.c:1199
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "Tegnap"
-#: ../libempathy-gtk/empathy-log-window.c:1215
+#: ../libempathy-gtk/empathy-log-window.c:1556
msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%Y. %B %e"
-#: ../libempathy-gtk/empathy-log-window.c:1296
-#: ../libempathy-gtk/empathy-log-window.c:2736
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr "Bármikor"
-#: ../libempathy-gtk/empathy-log-window.c:1368
-#: ../libempathy-gtk/empathy-log-window.c:1712
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
msgid "Anyone"
msgstr "Bárki"
-#: ../libempathy-gtk/empathy-log-window.c:1992
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr "Ki"
-#: ../libempathy-gtk/empathy-log-window.c:2196
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr "Mikor"
-#: ../libempathy-gtk/empathy-log-window.c:2312
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr "Bármi"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "Szöveges csevegések"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "Hívások"
-#: ../libempathy-gtk/empathy-log-window.c:2321
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "Bejövő hívások"
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2781
msgid "Outgoing calls"
msgstr "Kimenő hívások"
-#: ../libempathy-gtk/empathy-log-window.c:2323
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "Nem fogadott hívások"
-#: ../libempathy-gtk/empathy-log-window.c:2344
+#: ../libempathy-gtk/empathy-log-window.c:2804
msgid "What"
msgstr "Mi"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3506
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Biztosan törölni szeretné a korábbi társalgások minden naplóját?"
-#: ../libempathy-gtk/empathy-log-window.c:3043
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "Összes törlése"
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr "Törlés innen:"
@@ -2327,7 +2359,8 @@ msgstr "<span size=\"x-large\">Betöltés…</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "Hívás"
@@ -2341,29 +2374,26 @@ msgid "Delete All History..."
msgstr "Minden előzmény törlése…"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "History"
-msgstr "Előzmények"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
msgid "Profile"
msgstr "Profil"
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "Videó"
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "S_zerkesztés"
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
msgid "_File"
msgstr "_Fájl"
-#: ../libempathy-gtk/empathy-log-window.ui.h:10
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "page 2"
msgstr "2. oldal"
@@ -2382,17 +2412,17 @@ msgid "New Conversation"
msgstr "Új társalgás"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "_Videó küldése"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "_Hívás"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Új hívás"
@@ -2521,12 +2551,12 @@ msgstr "Egyéni üzenetek szerkesztése"
msgid "Remove"
msgstr "Eltávolítás"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
msgstr "Üzenet szerkesztve ekkor: %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "Normál"
@@ -2893,7 +2923,9 @@ msgstr "A GNOME üzenetküldő-kliense"
#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
-msgstr "Kelemen Gábor <kelemeng at gnome dot hu>"
+msgstr ""
+"Kelemen Gábor <kelemeng at gnome dot hu>\n"
+"Meskó Balázs <meskobalazs at gmail dot com>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
@@ -3068,7 +3100,7 @@ msgid "Your new account has not been saved yet."
msgstr "Új fiókja még nincs elmentve."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:651
msgid "Connecting…"
msgstr "Kapcsolódás…"
@@ -3176,121 +3208,116 @@ msgstr "Empathy hitelesítési kliens"
msgid "People nearby"
msgstr "Közeli emberek"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "– Empathy hang/videó kliens"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy hang/videó kliens"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Kontraszt"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Fényerő"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Hangerő"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "_Oldalsáv"
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Hangbemenet"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Videobemenet"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Tárcsázókészülék"
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Részletek"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1005
#, c-format
msgid "Call with %s"
msgstr "%s hívása"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1249
msgid "The IP address as seen by the machine"
msgstr "A gép által látott IP-cím"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1251
msgid "The IP address as seen by a server on the Internet"
msgstr "Az interneten lévő kiszolgáló által látott IP-cím"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1253
msgid "The IP address of the peer as seen by the other side"
msgstr "A partner másik oldal által látott IP-címe"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1255
msgid "The IP address of a relay server"
msgstr "Közvetítő kiszolgáló IP-címe"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1257
msgid "The IP address of the multicast group"
msgstr "Üzenetszórási csoport IP-címe"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Ismeretlen"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Ismeretlen"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Ismeretlen"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Ismeretlen"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Kapcsolódva – %d.%02dp"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1976
msgid "Technical Details"
msgstr "Technikai részletek"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2014
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3299,8 +3326,8 @@ msgstr ""
"%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
"hangformátumot sem"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2019
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3309,8 +3336,8 @@ msgstr ""
"%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
"videoformátumot sem"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2025
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3319,23 +3346,23 @@ msgstr ""
"Nem hozható létre kapcsolat %s partnerhez. Lehet, hogy egyikük közvetlen "
"kapcsolatot nem engedélyező hálózatot használ."
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2031
msgid "There was a failure on the network"
msgstr "Hálózati hiba történt"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2035
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "A híváshoz szükséges hangformátumok nincsenek telepítve a számítógépre"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2038
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2050
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3346,146 +3373,126 @@ msgstr ""
"a hibát</a>, és csatolja a Súgó menü „Hibakeresés” ablakából elérhető "
"naplókat."
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2059
msgid "There was a failure in the call engine"
msgstr "Hiba történt a hívási alrendszerben"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2062
msgid "The end of the stream was reached"
msgstr "A folyam vége elérve"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2102
msgid "Can't establish audio stream"
msgstr "Nem hozható létre a hangfolyam"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2112
msgid "Can't establish video stream"
msgstr "Nem hozható létre a videofolyam"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Hang"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Partner újrahívása"
-
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera ki"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera be"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "Dekódoló kodek:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kamera kikapcsolása és a képküldés leállítása"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Kamera bekapcsolása és kép küldése"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "Kamera letiltása"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Kamera bekapcsolása, de ne küldjön képet"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "Tárcsázókészülék megjelenítése"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "Kódoló kodek:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "Befejezés"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "Aktuális hívás befejezése"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "Helyi jelölt:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Előnézet"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Maximalizálás"
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Újratárcsázás"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimalizálás"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Távoli jelölt:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Hang küldése"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "Videó küldése"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "Tárcsázókészülék"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Videohívás indítása"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Hanghívás indítása"
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
-msgstr "Hangátvitel átváltása"
+msgstr "Hangátvitel be/ki"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
+msgid "Toggle video transmission"
+msgstr "Videoátvitel be/ki"
+
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1621 ../src/empathy-call-window.c:1622
+#: ../src/empathy-call-window.c:1623 ../src/empathy-call-window.c:1624
msgid "Unknown"
msgstr "Ismeretlen"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Vi_deó"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Videó ki"
-
#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Videó be"
+msgid "Video call"
+msgstr "Videohívás"
#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoelőnézet"
-
-#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Hívás"
#: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "_Tárcsázókészülék"
+msgid "_Microphone"
+msgstr "_Mikrofon"
#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
@@ -4058,80 +4065,80 @@ msgstr "Szobalista"
msgid "_Room:"
msgstr "Sz_oba:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "Üzenet érkezett"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "Üzenet elküldve"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "Új társalgás"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "Partner belép"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "Partner kilép"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "Fiók kapcsolódott"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "Fiók kapcsolata bontva"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "Nyelv"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "Júlia"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "Romeo"
-#. translators: Quote from Romeo & Julier, for chat theme preview
# http://mek.oszk.hu/00400/00492/00492.htm
-#: ../src/empathy-preferences.c:722
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "Ó, Romeo, mért vagy te Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr "Tagadd meg az atyád, neved hajítsd el,"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:738
msgid "Or if thou wilt not, be but sworn my love"
msgstr "S ha nem teszed meg, esküdj édesemmé"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr "És nem leszek Capulet én se többé."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:744
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Hallgassak-e vagy szóljak-e neki?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "Júlia kilépett"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "Beállítások"
@@ -4139,67 +4146,75 @@ msgstr "Beállítások"
msgid "Appearance"
msgstr "Megjelenés"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Viselkedés"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "Csevegés té_mája:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "É_rtesítések tiltása, ha távol vagy elfoglalt vagyok"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Hangok tiltása, ha _távol vagy elfoglalt vagyok"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Bejövő események megjelenítése az értesítési területen"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Általános"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Bemeneti szint"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Bemeneti hangerő"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Helyforrások:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Társalgások naplózása"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Értesítések"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Hang lejátszása eseményekhez"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Adatvédelem"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4209,23 +4224,23 @@ msgstr ""
"csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
"hely pontosságúak lesznek."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "_Hangulatjelek képekké alakítása"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Partnerlista m_utatása szobákban"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Hangok"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Helyesírás-ellenőrzés"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -4233,48 +4248,48 @@ msgstr ""
"Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
"van szótár."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Témák"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "Változat:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "A_utomatikus kapcsolódás indításkor"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_Mobiltelefon"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "B_uborékértesítések engedélyezése"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "H_angos értesítések engedélyezése"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Hálózat (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "Új csevegések megnyitása _külön ablakokban"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Hely közzététele a partnereimnek"
#. 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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "Hely pontosságának _csökkentése"
@@ -4286,6 +4301,54 @@ msgstr "Állapot"
msgid "_Quit"
msgstr "_Kilépés"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Partner újrahívása"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera ki"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera be"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Kamera kikapcsolása és a képküldés leállítása"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Kamera bekapcsolása és kép küldése"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Kamera bekapcsolása, de ne küldjön képet"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Előnézet"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Újratárcsázás"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "Vi_deó"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Videó ki"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Videó be"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Videoelőnézet"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Partner térképnézete"
@@ -4437,18 +4500,24 @@ msgstr "Megadás"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s megpróbálta felhívni, de Ön egy másik beszélgetést folytatott."
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:558 ../src/empathy-call-window.c:572
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1012
#, c-format
msgid "Call with %d participants"
msgstr "Hívás %d résztvevővel"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:1913
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s – %d.%02dp"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:1914
msgid "On hold"
msgstr "Várakoztatás"
diff --git a/po/id.po b/po/id.po
index 58f306bfc..644ffa75c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4,14 +4,15 @@
#
# Taufiq Wirahman <taufiq.wirahman@gmail.com>, 2010.
# Dirgita <dirgitadevina@yahoo.co.id>, 2011.
+# Andika Triwidada <andika@gmail.com>, 2011.
+#
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: 2011-03-18 15:05+0000\n"
-"PO-Revision-Date: 2011-02-20 09:10+0700\n"
-"Last-Translator: Dirgita <dirgitadevina@yahoo.co.id>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-08-16 14:32+0000\n"
+"PO-Revision-Date: 2011-08-16 21:42+0700\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
+msgstr "Mengobrol pada Google Talk, Facebook, MSN, dan banyak layanan obrolan lain"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -30,7 +31,7 @@ msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
-msgstr ""
+msgstr "Perpesanan Internet Empathy"
#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
@@ -41,425 +42,401 @@ msgid "Always open a separate chat window for new chats."
msgstr "Selalu membuka jendela obrolan yang terpisah untuk obrolan baru."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Karakter yang ditambahkan setelah nama panggilan saat menggunakan "
-"penyelesaian nama panggilan (tab) dalam grup obrolan."
+msgid "Call volume"
+msgstr "Volume panggilan"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "Tema jendela obrolan"
+msgid "Call volume, as a percentage."
+msgstr "Volume panggilan, dalam persentase."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Daftar yang dipisahkan koma dari bahasa pemeriksa ejaan yang digunakan "
-"(misalnya \"en, fr, nl\")."
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "Perangkat kamera"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Karakter yang ditambahkan setelah nama panggilan saat menggunakan penyelesaian nama panggilan (tab) dalam grup obrolan."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Chat window theme"
+msgstr "Tema jendela obrolan"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Chat window theme variant"
+msgstr "Varian tema jendela obrolan"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Daftar yang dipisahkan koma dari bahasa pemeriksa ejaan yang digunakan (misalnya \"en, fr, nl\")."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Compact contact list"
msgstr "Daftar kontak ringkas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Connection managers should be used"
msgstr "Manajer koneksi yang mesti digunakan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Contact list sort criterion"
msgstr "Kriteria urutan daftar kontak"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Perangkat kamera bawaan untuk dipakai dalam panggilan video, mis. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Default directory to select an avatar image from"
msgstr "Direktori bawaan untuk memilih gambar avatar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Disable popup notifications when away"
msgstr "Nonaktifkan pemberitahuan popup ketika pergi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable sounds when away"
msgstr "Nonaktifkan suara ketika pergi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Display incoming events in the status area"
-msgstr ""
+msgstr "Tampilkan kejadian masuk di area status"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Tampilkan kejadian masuk di area status. Bila false, sajikan mereka seketika ke pengguna."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "Dukungan penghilangan gaung"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can publish the user's location"
msgstr "Empathy dapat mempublikasikan lokasi pengguna"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy dapat menggunakan GPS untuk menebak lokasi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy dapat menggunakan jaringan selular untuk menebak lokasi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the network to guess the location"
msgstr "Empathy dapat menggunakan jaringan untuk menebak lokasi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy default download folder"
msgstr "Folder unduh bawaan Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy telah memindahkan log kupu-kupu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should auto-away when idle"
msgstr "Empathy harus otomatis berstatus pergi saat menganggur"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-connect on startup"
-msgstr "Empathy harus otomatis terhubung pada startup"
+msgstr "Empathy mesti otomatis terhubung pada saat awalan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy harus mengurangi akurasi lokasi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy harus menggunakan avatar dari kontak sebagai ikon jendela obrolan"
+msgstr "Empathy harus menggunakan avatar dari kontak sebagai ikon jendela obrolan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Enable WebKit Developer Tools"
msgstr "Aktifkan Perangkat Pengembang WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable popup notifications for new messages"
msgstr "Aktifkan pemberitahuan popup untuk pesan baru"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Enable spell checker"
msgstr "Aktifkan pemeriksa ejaan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Hide main window"
msgstr "Sembunyikan jendela utama"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Hide the main window."
msgstr "Sembunyikan jendela utama."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Nick completed character"
msgstr "Karakter lengkap panggilan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Open new chats in separate windows"
msgstr "Buka obrolan baru di jendela terpisah"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Path of the Adium theme to use"
msgstr "Jalur tema Adium untuk digunakan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Jalur tema Adium yang digunakan jika tema yang digunakan untuk mengobrol "
-"adalah Adium."
+msgstr "Jalur tema Adium yang digunakan jika tema yang digunakan untuk mengobrol adalah Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound for incoming messages"
msgstr "Putar suara untuk pesan masuk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for new conversations"
msgstr "Putar suara untuk percakapan baru"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for outgoing messages"
msgstr "Putar suara untuk pesan keluar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when a contact logs in"
msgstr "Putar suara saat kontak masuk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound when a contact logs out"
msgstr "Putar suara saat kontak keluar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when we log in"
msgstr "Putar suara saat kita masuk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when we log out"
msgstr "Putar suara saat kita keluar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Pop up notifications if the chat isn't focused"
msgstr "Munculkan pemberitahuan jika obrolan tidak terfokus"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Pop up notifications when a contact logs in"
msgstr "munculkan pemberitahuan bila kontak masuk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications when a contact logs out"
msgstr "Munculkan pemberitahuan bila kontak keluar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Show Balance in contact list"
+msgstr "Tampilkan Kredit di daftar kontak"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show avatars"
msgstr "Tampilkan avatar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show contact list in rooms"
msgstr "Tampilkan daftar kontak di ruang"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show hint about closing the main window"
msgstr "Tampilkan petunjuk tentang menutup jendela utama"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show offline contacts"
msgstr "Tampilkan kontak luring"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show protocols"
msgstr "Tampilkan protokol"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Spell checking languages"
msgstr "Bahasa pemeriksaan ejaan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The default folder to save file transfers in."
msgstr "Folder bawaan untuk menyimpan berkas masuk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The last directory that an avatar image was chosen from."
msgstr "Direktori terakhir tempat gambar avatar dipilih darinya."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The position for the chat window side pane"
-msgstr ""
+msgstr "Posisi panel sisi jendela obrolan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "Posisi tersimpan (dalam piksel) dari panel sisi jendela obrolan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Tema yang digunakan untuk menampilkan percakapan di jendela obrolan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Varian tema yang digunakan untuk menampilkan percakapan di jendela obrolan."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Use graphical smileys"
msgstr "Gunakan smiley grafis"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Use notification sounds"
msgstr "Gunakan suara pemberitahuan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use theme for chat rooms"
msgstr "Gunakan tema untuk ruang obrolan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Apakah Empathy dapat mempublikasikan lokasi pengguna ke kontak mereka."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Apakah Empathy dapat menggunakan GPS untuk menebak lokasi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Apakah Empathy dapat menggunakan jaringan selular untuk menebak lokasi."
+msgstr "Apakah Empathy dapat menggunakan jaringan selular untuk menebak lokasi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the network to guess the location."
msgstr "Apakah Empathy dapat menggunakan jaringan untuk menebak lokasi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Apakah Empathy telah memindahkan log kupu-kupu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Apakah Empathy akan secara otomatis masuk ke akun Anda pada startup."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#, fuzzy
-#| msgid ""
-#| "Whether Empathy should go into away mode automatically if user is idle."
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Apakah Empathy harus pergi ke modus pergi secara otomatis jika pengguna "
-"menganggur."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Apakah Empathy harus pergi ke modus pergi secara otomatis jika pengguna menganggur."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Apakah Empathy harus mengurangi akurasi lokasi untuk alasan privasi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Apakah Empathy harus menggunakan avatar dari kontak sebagai ikon jendela "
-"obrolan."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Apakah Empathy harus menggunakan avatar dari kontak sebagai ikon jendela obrolan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Apakah perangkat pengembang WebKit, seperti Inspektur Web, harus diaktifkan."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Apakah perangkat pengembang WebKit, seperti Inspektur Web, harus diaktifkan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Apakah manajer konektivitas harus digunakan untuk secara otomatis melepas/"
-"menyambung kembali."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Apakah manajer konektivitas harus digunakan untuk secara otomatis melepas/menyambung kembali."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Apakah akan memeriksa kata-kata yang diketik terhadap bahasa yang ingin "
-"memeriksa dengannya."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Apakah akan memeriksa kata-kata yang diketik terhadap bahasa yang ingin memeriksa dengannya."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Apakah akan mengkonversi smiley menjadi gambar grafis dalam percakapan."
+msgstr "Apakah akan mengkonversi smiley menjadi gambar grafis dalam percakapan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Apakah akan mengaktifkan penyaring penghilangan gaung Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Apakah akan memainkan suara untuk memberitahu kontak masuk ke jaringan."
+msgstr "Apakah akan memainkan suara untuk memberitahu kontak masuk ke jaringan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Apakah akan memainkan suara untuk memberitahu kontak keluar dari jaringan."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Apakah akan memainkan suara untuk memberitahu kontak keluar dari jaringan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound to notify of events."
msgstr "Apakah akan memainkan suara untuk memberitahukan peristiwa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Apakah akan memainkan suara untuk memberitahukan pesan masuk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play a sound to notify of new conversations."
msgstr "Apakah akan memainkan suara untuk memberitahukan pembicaraan baru."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Apakah akan memainkan suara untuk memberitahukan pesan keluar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to play a sound when logging into a network."
msgstr "Apakah akan memainkan suara ketika masuk ke jaringan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to play a sound when logging out of a network."
msgstr "Apakah akan memainkan suara ketika keluar dari jaringan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to play sound notifications when away or busy."
msgstr "Apakah akan memainkan suara pemberitahuan ketika pergi atau sibuk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Apakah akan menampilkan pemberitahuan popup ketika kontak pergi luring."
+msgstr "Apakah akan menampilkan pemberitahuan popup ketika kontak pergi luring."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Apakah akan menampilkan pemberitahuan popup ketika kontak pergi daring."
+msgstr "Apakah akan menampilkan pemberitahuan popup ketika kontak menjadi daring."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-#, fuzzy
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Apakah akan menampilkan pemberitahuan popup saat menerima pesan baru bahkan "
-"jika obrolan sudah terbuka, tapi tidak terfokus."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Apakah akan menampilkan pemberitahuan popup saat menerima pesan baru bahkan jika obrolan sudah terbuka, tapi tidak terfokus."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Apakah akan menampilkan pemberitahuan popup saat menerima pesan baru."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Apakah akan menampilkan avatar untuk kontak dalam daftar kontak dan jendela "
-"obrolan."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Whether to show account balances in the contact list."
+msgstr "Apakah akan menampilkan sisa kredit akun dalam daftar kontak."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Apakah akan menampilkan avatar untuk kontak dalam daftar kontak dan jendela obrolan."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Apakah akan menampilkan kontak yang sedang luring dalam daftar kontak."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid "Whether to show popup notifications when away or busy."
msgstr "Apakah akan menampilkan pemberitahuan popup ketika pergi atau sibuk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Apakah akan menampilkan protokol untuk kontak dalam daftar kontak."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Whether to show the contact list in chat rooms."
msgstr "Apakah akan menampilkan daftar kontak di ruang mengobrol."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
msgid "Whether to show the contact list in compact mode."
msgstr "Apakah akan menampilkan daftar kontak dalam mode kompak."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Apakah akan menampilkan dialog pesan tentang menutup jendela utama dengan "
-"tombol 'x' pada panel judul."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Apakah akan menampilkan dialog pesan tentang menutup jendela utama dengan tombol 'x' pada panel judul."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
msgid "Whether to use the theme for chat rooms."
msgstr "Apakah akan menggunakan tema untuk ruang mengobrol."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Kriteria mana yang digunakan saat mngurutkan daftar kontak. Standar adalah "
-"untuk mengurutkan berdasarkan nama kontak dengan nilai \"nama\". Nilai "
-"\"negara\" akan menyortir daftar kontak berdasar negara."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
+msgstr "Kriteria mana yang digunakan saat mngurutkan daftar kontak. Standar adalah untuk mengurutkan berdasarkan nama kontak dengan nilai \"nama\". Nilai \"negara\" akan menyortir daftar kontak berdasar negara."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -467,15 +444,13 @@ msgstr "Mengelola akun Perpesanan dan VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "Akun Perpesanan dan VoIP"
#: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
msgid "File transfer completed, but the file was corrupted"
-msgstr "Transfer berkas selesai"
+msgstr "Transfer berkas selesai, tapi berkas rusak"
# belum konsisten: file - berkas
#: ../libempathy/empathy-ft-handler.c:1113
@@ -492,6 +467,23 @@ msgstr "Berkas yang dipilih bukan merupakan berkas biasa"
msgid "The selected file is empty"
msgstr "Berkas yang dipilih kosong"
+#: ../libempathy/empathy-message.c:413
+#: ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Panggilan tak terjawab dari %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Memanggil %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Panggilan dari %s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Jenis soket tidak didukung"
@@ -524,249 +516,240 @@ msgstr "Kesalahan ketika mencoba untuk mentransfer berkas"
msgid "The other participant is unable to transfer the file"
msgstr "Peserta lainnya tidak dapat mentransfer berkas"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Alasan yang tidak diketahui"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Tersedia"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Sibuk"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Pergi"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Tak kelihatan"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "Luring"
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:224
+msgctxt "presence"
msgid "Unknown"
-msgstr "Tidak Diketahui"
+msgstr "Tak dikenal"
# msgid "Unknown"
# msgstr "Tidak Diketahui"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Tidak ada alasan tertentu"
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:266
+#: ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "Status diatur ke luring"
# Kesalahan jaringan?
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:268
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Network error"
msgstr "Kesalahan jaringan"
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "Otentikasi gagal"
# Kesalahan penyandian?
# Saya tetap memakai enkripsi sebagai lawan dari dekripsi (decryption) dengan acuan dari KBBI
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Kesalahan enkripsi"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "Nama sedang dipakai"
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Sertifikat tidak disediakan"
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "Sertifikat tidak dipercaya"
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "Sertifikat kadaluarsa"
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Sertifikat tidak diaktifkan"
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Nama host sertifikat tidak cocok"
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Sidik jari sertifikat tidak cocok"
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Sertifikat ditandatangani sendiri"
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "Sertifikat salah"
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
-msgstr ""
+msgstr "Enkripsi tidak tersedia"
-#: ../libempathy/empathy-utils.c:416
-#, fuzzy
-#| msgid "Certificate not activated"
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
-msgstr "Sertifikat tidak diaktifkan"
+msgstr "Sertifikat tak valid"
-#: ../libempathy/empathy-utils.c:418
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
-msgstr "Manajer koneksi yang mesti digunakan"
+msgstr "Koneksi telah ditolak"
-#: ../libempathy/empathy-utils.c:420
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
-msgstr "Manajer koneksi yang mesti digunakan"
+msgstr "Koneksi tak dapat dijalin"
-#: ../libempathy/empathy-utils.c:422
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
-msgstr "Manajer koneksi yang mesti digunakan"
+msgstr "Koneksi telah terputus"
-#: ../libempathy/empathy-utils.c:424
-#, fuzzy
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
-msgstr "Akun ini sudah ada di server"
+msgstr "Sumber daya ini sudah tersambung ke server"
-#: ../libempathy/empathy-utils.c:426
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
-msgstr ""
+#: ../libempathy/empathy-utils.c:336
+msgid "Connection has been replaced by a new connection using the same resource"
+msgstr "Koneksi telah digantikan oleh koneksi baru memakai sumberdaya yang sama"
-#: ../libempathy/empathy-utils.c:429
-#, fuzzy
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "Akun ini sudah ada di server"
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
-msgstr ""
+msgstr "Server kini terlalu sibuk untuk menangani koneksi"
-#: ../libempathy/empathy-utils.c:433
-#, fuzzy
-#| msgid "Certificate not provided"
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
-msgstr "Sertifikat tidak disediakan"
+msgstr "Sertifikat telah dicabut"
-#: ../libempathy/empathy-utils.c:435
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
+#: ../libempathy/empathy-utils.c:345
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Sertifikat memakai algorima cipher yang tak aman atau lemah secara kriptografi"
-#: ../libempathy/empathy-utils.c:438
-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:348
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Panjang sertifikat server, atau kedalaman rantai sertifikat server, melampaui batas yang diberlakukan oleh pustaka kriptografi"
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Orang-orang Berada di Sekitar"
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! Jepang"
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "Obrolan Facebook"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d detik yang lalu"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d menit yang lalu"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d jam yang lalu "
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d hari yang lalu"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d minggu yang lalu"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d bulan yang lalu"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "di masa mendatang"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Semua"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Semua akun"
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Akun"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "Sandi"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porta"
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
@@ -774,58 +757,39 @@ msgstr "%s:"
#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
-msgstr ""
+msgstr "Akun %s disunting melalui Akun Webku."
#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
-msgstr ""
+msgstr "Akun %s tak dapat disunting di Empathy."
#: ../libempathy-gtk/empathy-account-widget.c:1192
-#, fuzzy
-#| msgid "Empathy Accounts"
msgid "Launch My Web Accounts"
-msgstr "Akun Empathy"
+msgstr "Luncurkan Akun Webku"
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Nama pengguna:"
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "Tera_pkan"
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "_Masuk"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Akun:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-#, fuzzy
-#| msgid "Enabled"
-msgid "_Enabled"
-msgstr "Diaktifkan"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "Akun ini sudah ada di server"
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "Buat akun baru pada server"
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "_Batal"
@@ -834,19 +798,19 @@ msgstr "_Batal"
#. * 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:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s pada %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "Akun %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "Akun baru"
@@ -858,6 +822,7 @@ msgstr "<b>Contoh:</b> NamaLayarSaya"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -871,7 +836,7 @@ msgstr "Tingkat Lanjut"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Sandi:"
@@ -881,7 +846,7 @@ msgstr "_Sandi:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Ingat Sandi"
@@ -891,11 +856,11 @@ msgstr "Ingat Sandi"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
-msgstr ""
+msgstr "Ingat sandi"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "Screen _Name:"
@@ -952,10 +917,8 @@ msgstr "<b>Contoh:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-#, fuzzy
-#| msgid "Character set:"
msgid "Ch_aracter set:"
-msgstr "Himpunan karakter:"
+msgstr "Set k_arakter:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
@@ -969,78 +932,82 @@ msgstr "Apa UIN ICQ Anda?"
msgid "What is your ICQ password?"
msgstr "Apa sandi ICQ Anda?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Otomatis"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Register"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Pilihan"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Tidak ada"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Himpunan karakter:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Kebanyakan server IRC tak memerlukan sandi, maka jika Anda tak yakin, jangan masukkan sandi."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Jaringan"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Jaringan:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Panggilan:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Sandi:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Pesan keluar:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Nama asli:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Apa nama panggilan IRC Anda?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
-msgstr ""
+msgstr "Jaringan IRC yang mana?"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
@@ -1072,18 +1039,14 @@ msgstr "S_umber:"
#. 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:14
-#, fuzzy
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 ""
-"Ini adalah nama pengguna Anda, bukan akun masuk Facebook Anda secara "
-"normal.\n"
-"Jika Anda <b>badger</b> facebook.com/, masukkan <b>badger</b>.\n"
-"Gunakan <a href=\"http://www.facebook.com/username/\">halaman ini</a> untuk "
-"memilih nama pengguna Facebook jika Anda belum memiliki."
+"Ini adalah nama pengguna Anda, bukan akun masuk Facebook Anda secara normal.\n"
+"Jika Anda facebook.com/<b>badger</b>, masukkan <b>badger</b>.\n"
+"Gunakan <a href=\"http://www.facebook.com/username/\">halaman ini</a> untuk memilih nama pengguna Facebook jika Anda belum memiliki."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Use old SS_L"
@@ -1166,7 +1129,6 @@ msgid "Authentication username:"
msgstr "Otentikasi nama pengguna:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#, fuzzy
msgid "Discover Binding"
msgstr "Temukan Ikatan"
@@ -1175,70 +1137,71 @@ msgid "Discover the STUN server automatically"
msgstr "Temukan server STUN secara otomatis"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Abaikan Galat TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Interval (detik)"
# keep alive = jaga tetap hidup
# barangkali ada yang lebih pendek?
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Pilihan Jaga-Tetap-Hidup"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
-msgstr "Rute Longgar"
+msgstr "Routing Santai"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Mekanisme:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "Pilihan Lain-lain"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
-msgstr "Pilihan NAT Traversal"
+msgstr "Pilihan Traversal NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Porta:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "Pilihan Proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Server STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Transportasi:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Apa sandi akun SIP Anda?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "Apa ID masuk SIP Anda?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "Nama pengg_una:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#, fuzzy
-#| msgid "_Ignore conference and chat room invitations"
msgid "I_gnore conference and chat room invitations"
-msgstr "Aba_ikan konferensi dan undangan ruang mengobrol"
+msgstr "Aba_ikan undangan konferensi dan ruang mengobrol"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
@@ -1256,28 +1219,36 @@ msgstr "I_D Yahoo!:"
msgid "_Room List locale:"
msgstr "Daftar _Ruang lokal:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "Tidak dapat mengubah gambar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "Tidak ada dari format gambar yang diterima, didukung pada sistem Anda"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Tak bisa menyimpan pixbuf ke png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "Pilih Gambar Avatar Anda"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Ambil gambar..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "Tidak Ada Gambar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Gambar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Semua File"
@@ -1285,168 +1256,200 @@ msgstr "Semua File"
msgid "Click to enlarge"
msgstr "Klik untuk memperbesar"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Ada galat saat memulai panggilan"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Kontak yang dinyatakan tak mendukung panggilan"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Kontak yang dinyatakan sedang luring"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Kontak yang dinyatakan tak valid"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Panggilan darurat tak didukung protokol ini"
+
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Gagal membuka obrolan pribadi"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Topik tidak didukung pada percakapan ini"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Anda tidak diperbolehkan untuk mengubah topik"
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "\"%s\" bukan ID kontak yang valid"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: menghapus semua pesan dari percakapan aktif saat ini"
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topik> : Mengatur topik percakapan aktif saat itu"
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID ruang mengobrol>: Bergabung dengan ruang mengbrol baru"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID ruang mengobrol>: Bergabung dengan ruang mengobrol baru"
-#: ../libempathy-gtk/empathy-chat.c:920
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1043
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
+msgstr "/part [<ID ruang obrolan>][<alasan>]: meninggalkan ruang obrolan, secara baku yang sedang aktif"
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID kontak> [<pesan>]: Membuka obrolan pribadi"
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID kontak><pesan>: Membuka obrolan pribadi"
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
-msgstr ""
-"/nick <nama panggilan>: Mengubah nama panggilan Anda pada server saat ini"
+msgstr "/nick <nama panggilan>: Mengubah nama panggilan Anda pada server saat ini"
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <pesan>: Mengirim pesan TINDAKAN untuk percakapan aktif saat itu"
-#: ../libempathy-gtk/empathy-chat.c:937
-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 <pesan>: Mengirim <pesan> pada percakapan aktif saat itu. Ini digunakan "
-"untuk mengirim pesan yang dimulai dengan sebuah '/'. Sebagai contoh: \"/say /"
-"join digunakan untuk bergabung dalam ruang mengobrol baru\""
+#: ../libempathy-gtk/empathy-chat.c:1059
+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 <pesan>: Mengirim <pesan> pada percakapan aktif saat itu. Ini digunakan untuk mengirim pesan yang dimulai dengan sebuah '/'. Sebagai contoh: \"/say /join digunakan untuk bergabung dalam ruang mengobrol baru\""
-#: ../libempathy-gtk/empathy-chat.c:942
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<perintah>]: Menampilkan semua perintah yang didukung. Jika "
-"<perintah> didefinisikan, menunjukkan cara penggunaannya."
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID kontak>: menampilkan informasi tentang kontak"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<perintah>]: Menampilkan semua perintah yang didukung. Jika <perintah> didefinisikan, menunjukkan cara penggunaannya."
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Penggunaan: %s"
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Perintah tidak dikenal"
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Perintah tak dikenal; lihat /help untuk perintah yang tersedia"
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr "tak cukup kredit untuk mengirim pesan"
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "tak mampu"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "luring"
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "kontak tidak valid"
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "ijin ditolak"
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "pesan terlalu panjang"
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "tidak dilaksanakan"
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "tidak diketahui"
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Kesalahan pengiriman pesan '%s':%s"
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Galat saat mengirim pesan: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Topik:"
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Topik diatur ke: %s"
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Tidak ada topik didefinisikan"
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Tidak Ada Saran)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "Tambahkan '%s' ke Kamus"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "Tambahkan '%s' ke Kamus %s"
-#: ../libempathy-gtk/empathy-chat.c:2010
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Sisipkan Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1819
msgid "_Send"
msgstr "_Kirim"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Saran Ejaan"
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Gagal mengambil catatan terbaru"
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s telah terputus"
@@ -1454,12 +1457,12 @@ msgstr "%s telah terputus"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ditendang oleh %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s ditendang"
@@ -1467,17 +1470,17 @@ msgstr "%s ditendang"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s dilarang oleh %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s dilarang"
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s telah meninggalkan ruangan"
@@ -1487,112 +1490,136 @@ msgstr "%s telah meninggalkan ruangan"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s telah bergabung dengan ruangan"
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s sekarang dikenal sebagai %s"
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241
+#: ../src/empathy-call-window.c:2269
msgid "Disconnected"
msgstr "Terputus"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
-msgstr ""
+msgstr "Apakah Anda ingin menyimpan sandi ini?"
-#: ../libempathy-gtk/empathy-chat.c:3122
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
-msgstr "Anggota"
+msgstr "Ingat"
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
-msgstr ""
+msgstr "Jangan sekarang"
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Mencoba kembali"
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Sandi salah, coba lagi:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Ruangan ini dilindungi oleh sandi:"
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Gabung"
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3797
+#: ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "Terhubung"
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Percakapan"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
-msgid "Unknown or invalid identifier"
-msgstr ""
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
-msgid "Contact blocking temporarily unavailable"
-msgstr ""
+msgid "Unknown or invalid identifier"
+msgstr "Identifier tak dikenal atau tak valid"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
-msgid "Contact blocking unavailable"
-msgstr ""
+msgid "Contact blocking temporarily unavailable"
+msgstr "Pemblokiran kontak sementara tak tersedia"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
-#, fuzzy
-#| msgid "permission denied"
+msgid "Contact blocking unavailable"
+msgstr "Blokir kontak tak tersedia"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
-msgstr "ijin ditolak"
+msgstr "Ijin Ditolak"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
-msgstr ""
+msgstr "Tak bisa memblokir kontak"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
msgid "Edit Blocked Contacts"
-msgstr "K_ontak Luring"
+msgstr "Sunting Kontak Yang Diblokir"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Akun:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Kontak Yang Diblokir"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Buang"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "Salin Alamat _Tautan"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Buka Tautan"
# %A %d %B %Y?
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
@@ -1610,28 +1637,28 @@ msgstr "Informasi Pribadi"
msgid "New Contact"
msgstr "Kontak Baru"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
-msgstr ""
+msgstr "Blok %s?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "Anda yakin ingin memblokir '%s' agar tak bisa menghubungi Anda lagi?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
-msgstr ""
+msgstr "_Blok"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
+msgstr[0] "Lapo_rkan kontak ini sebagai abusif?"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
@@ -1643,331 +1670,337 @@ msgstr "Permintaan Berlangganan"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
msgid "_Block User"
-msgstr ""
+msgstr "_Blok Pengguna"
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
-msgstr ""
+msgstr "Tak dikelompokkan"
#: ../libempathy-gtk/empathy-contact-list-store.h:72
-#, fuzzy
-#| msgid "Favorite"
msgid "Favorite People"
-msgstr "Favorit"
+msgstr "Orang Favorit"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Apakah Anda benar-benar ingin menghapus grup '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "Menghapus grup"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_Hapus"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Apakah Anda benar-benar ingin menghapus kontak '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "Menghapus kontak"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "T_ambah Kontak..."
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
-msgstr "K_ontak Luring"
+msgstr "_Blok Kontak"
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Obrolan"
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Panggilan Suar_a"
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "Panggilan _Video"
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "_Percakapan Sebelumnya"
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Kirim Berkas"
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
-#, fuzzy
-#| msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
-msgstr "Berbagi desktop saya"
+msgstr "Berbagi Desktop Saya"
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Favorit"
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Infor_masi"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Mengundang Anda ke ruangan ini"
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
-#, fuzzy
-#| msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
-msgstr "_Undang ke ruang mengobrol"
+msgstr "_Undang ke Ruang Mengobrol"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
-#, fuzzy
-#| msgid "_Show Contact List"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
-msgstr "_Tampilkan Daftar Kontak"
+msgstr "Cari kontak"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
-msgstr "Pencarian"
+msgstr "Cari:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
-msgstr "T_ambah Kontak..."
+msgstr "T_ambah Kontak"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
-#, fuzzy
-#| msgid "No match found"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
-msgstr "Tidak ada yang cocok"
+msgstr "Kontak tak ditemukan"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Pilih kontak"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Nama lengkap:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Nomor telepon:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Alamat Surel:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Situs web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Tanggal Lahir:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Terakhir terlihat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Tersambung dari:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Pesan pergi:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanal:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "Kode ISO Negara:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "Negara:"
# pada konteks ini, rasanya state = negara bagian
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Negara Bagian:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Kota:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "Kode Pos:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Jalan:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Gedung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Lantai:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Kamar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Teks:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Keterangan:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Tingkat Keakuratan:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Kesalahan:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Kesalahan Vertikal(meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Kesalahan Horisontal (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Kecepatan:"
# bearing = arah?
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Arah:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Kecepatan Mendaki:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Terakhir Diperbarui:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Bujur:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Lintang:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Ketinggian:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Lokasi"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
# man strftime
# %B %e, %Y = nama_bulan tanggal, tahun
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y pada %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Simpan Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Tidak dapat menyimpan avatar"
@@ -1979,7 +2012,7 @@ msgstr "<b>Lokasi</b> pada (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Alias:"
@@ -1999,7 +2032,7 @@ msgstr "Rincian Kontak"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Identifair:"
@@ -2016,115 +2049,105 @@ msgstr "OS:"
msgid "Version:"
msgstr "Versi:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Group"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
-msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Pilih grup dimaana Anda menginginkan kontak ini muncul. Perhatikan bahwa "
-"Anda dapat memilih lebih dari satu grup atau tidak sama sekali."
+#: ../libempathy-gtk/empathy-groups-widget.c:345
+msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
+msgstr "Pilih grup dimaana Anda menginginkan kontak ini muncul. Perhatikan bahwa Anda dapat memilih lebih dari satu grup atau tidak sama sekali."
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "T_ambah Grup"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Pilih"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Grup"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
+msgstr[0] "Identitas berikut akan diblokir:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
+msgstr[0] "Identitas berikut tak dapat diblokir:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
-msgstr "K_ontak Luring"
+msgstr "Kontak Terkait"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
-msgstr "Pilih kontak"
+msgstr "Pilih kontak untuk dikait"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-#, fuzzy
-#| msgid "New Contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
-msgstr "Kontak Baru"
+msgstr "Pratilik kontak baru"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
+msgstr "Kontak yang dipilih pada daftar di sebelah kiri akan dikaitkan bersama-sama."
#. 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Sunting"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
-msgstr "T_ambah Kontak..."
+msgstr "_Kaitkan Kontak..."
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
-msgstr ""
+msgstr "Hapus dan _Blokir"
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, 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 ""
+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 "Anda yakin ingin menghapus kontak terkait '%s'? Hal ini akan menghapus semua kontak yang menyusun kontak terkait ini."
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] ""
+msgstr[0] "Kontak terkait memuat %u kontak"
# (date) mungkin placeholder untuk variabel? mesti cek source code
# \t di akhir baris hilang
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#, fuzzy
-#| msgid "<b>Location</b> at (date)\t"
msgid "<b>Location</b> at (date)"
-msgstr "<b>Lokasi</b> pada (date)\t"
+msgstr "<b>Lokasi</b> pada (date)"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
msgid "Online from a phone or mobile device"
-msgstr ""
+msgstr "Daring dari telepon atau perangkat mobil"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
msgid "New Network"
@@ -2132,15 +2155,13 @@ msgstr "Jaringan Baru"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
msgid "Choose an IRC network"
-msgstr ""
+msgstr "Pilih jaringan IRC"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
msgid "Reset _Networks List"
-msgstr ""
+msgstr "Reset Daftar Jaringa_n"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
-#, fuzzy
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Pilih"
@@ -2157,22 +2178,17 @@ msgstr "SSL"
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
#: ../libempathy-gtk/empathy-linking-dialog.c:115
-#, fuzzy
-#| msgid "_Offline Contacts"
msgid "Link Contacts"
-msgstr "K_ontak Luring"
+msgstr "Kaitkan Kontak"
#: ../libempathy-gtk/empathy-linking-dialog.c:120
-#, fuzzy
-#| msgid "_Join…"
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
-msgstr "_Gabung..."
+msgstr "_Lepaskan..."
#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgid "Completely split the displayed linked contacts into the separate contacts."
+msgstr "Uraikan sepenuhnya kontak terkait yang ditampilkan ke kontak-kontak terpisah"
# Dirgita: "Link" sebagai kata kerja (verba).
#. Add button
@@ -2184,85 +2200,217 @@ msgid "_Link"
msgstr "_Tautkan"
#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "invalid contact"
+#, c-format
msgid "Unlink linked contacts '%s'?"
-msgstr "kontak tidak valid"
+msgstr "Lepaskan kontak terkait '%s'?"
#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
+msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
+msgstr "Anda yakin ingin mengurai kontak-kontak terkait ini? Ini akan mengurai seluruh kontak yang terkait ke kontak-kontak terpisah."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
-msgstr ""
+msgstr "_Lepaskan"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Tanggal"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Riwayat"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Tampilkan"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Pencarian"
+
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Obrolan di %s"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Obrolan dengan %s"
+
+# %A %d %B %Y?
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Panggilan selama %s, berakhir pada %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Hari ini"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Kemarin"
+
+# %A %d %B %Y?
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Kapanpun"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Siapapun"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Siapa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Kapan"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Apapun"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
+msgstr "Obrolan teks"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Panggilan"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Panggilan masuk"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Panggilan keluar"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Panggilan tak terjawab"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "Apa"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Anda yakin ingin menghapus semua log dari percakapan sebelumnya?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "Hapus Semua"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Hapus dari:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Memuat...</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Percakapan"
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Panggilan"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr ""
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Obrolan"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Video Preview"
-msgid "Find Previous"
-msgstr "Video Pra-tampil"
+msgid "Delete All History..."
+msgstr "Hapus Semua Riwayat..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Percakapan Sebelumnya"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Pencarian"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_Sunting"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Berkas"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Untuk:"
+msgid "page 2"
+msgstr "halaman 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "ID Kontak:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "O_brolan"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Percakapan baru"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Kirim _Video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-#, fuzzy
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
-msgstr "Panggilan"
+msgstr "P_anggil"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Panggilan Baru"
@@ -2281,34 +2429,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Pesan gubahan..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Sunting Pesan Gubahan..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "Klik untuk menghapus status ini sebagai favorit"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "Klik untuk membuat status favorit"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Mengatur status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "Mengatur kehadiran Anda dan status saat ini"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Pesan gubahan..."
@@ -2321,6 +2469,14 @@ msgstr "Pesan gubahan..."
msgid "New %s account"
msgstr "Akun %s baru"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Cari Selanjutnya"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Cari Sebelumnya"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Cari:"
@@ -2373,47 +2529,42 @@ msgstr "Panggilan suara keluar"
msgid "Voice call ended"
msgstr "Suara panggilan berakhir"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Masukkan Pesan Gubahan"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "Sunting Pesan Gubahan"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Pesan disunting pada %s"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#, fuzzy
-#| msgid "Edit Custom Messages"
-msgid "Saved Status Messages"
-msgstr "Sunting Pesan Gubahan"
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+msgid "Normal"
+msgstr "Normal"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Klasik"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Sederhana"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Bersih"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Biru"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "Identitas yang diberikan oleh server obrolan tak dapat diverifikasi."
#: ../libempathy-gtk/empathy-tls-dialog.c:157
msgid "The certificate is not signed by a Certification Authority."
-msgstr ""
+msgstr "Sertifikat tak ditandatangani oleh Certificate Authority."
#: ../libempathy-gtk/empathy-tls-dialog.c:161
msgid "The certificate has expired."
@@ -2425,36 +2576,31 @@ msgstr "Sertifikat belum diaktifkan."
#: ../libempathy-gtk/empathy-tls-dialog.c:167
msgid "The certificate does not have the expected fingerprint."
-msgstr ""
+msgstr "Sertifikat tak memiliki sidik jari yang diharapkan."
#: ../libempathy-gtk/empathy-tls-dialog.c:170
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr ""
+msgstr "Nama host yang diperiksa oleh sertifikat tak cocok dengan nama server."
#: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "Certificate self-signed"
msgid "The certificate is self-signed."
-msgstr "Sertifikat ditandatangani sendiri"
+msgstr "Sertifikat ditandatangani sendiri."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
-msgstr ""
+msgid "The certificate has been revoked by the issuing Certification Authority."
+msgstr "Sertifikat telah dicabut oleh Certificate Authority yang menerbitkannya."
#: ../libempathy-gtk/empathy-tls-dialog.c:181
msgid "The certificate is cryptographically weak."
-msgstr ""
+msgstr "Sertifikat lemah secara kriptografi."
#: ../libempathy-gtk/empathy-tls-dialog.c:184
msgid "The certificate length exceeds verifiable limits."
-msgstr ""
+msgstr "Panjang sertifikat melampaui batas yang dapat diperiksa."
#: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "Certificate expired"
msgid "The certificate is malformed."
-msgstr "Sertifikat kadaluarsa"
+msgstr "Sertifikat salah bentuk."
#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
@@ -2467,43 +2613,39 @@ msgid "Certificate hostname: %s"
msgstr "Nama host sertifikat: %s"
#: ../libempathy-gtk/empathy-tls-dialog.c:281
-#, fuzzy
-#| msgid "Context"
msgid "Continue"
-msgstr "Konteks"
+msgstr "Lanjutkan"
#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
+msgstr "Koneksi ini tak terpercaya. Anda masih mau melanjutkan?"
#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
-msgstr ""
+msgstr "Ingat pilihan ini bagi koneksi di masa depan"
#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr "Rincian Sertifikat"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1715
msgid "Unable to open URI"
msgstr "Tidak dapat membuka URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "Select a file"
msgstr "Pilih berkas"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1883
msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "Tak cukup ruang untuk menyimpan berkas"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1891
#, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Diperlukan ruang kosong %s untuk menyimpan berkas ini, tapi hanya tersedia %s. Silakan pilih lokasi lain."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
#, c-format
msgid "Incoming file from %s"
msgstr "Berkas masuk dari %s"
@@ -2691,66 +2833,44 @@ msgstr "Tidak ada pesan kesalahan"
msgid "Instant Message (Empathy)"
msgstr "Pesan Instan (Empathy)"
-#: ../src/empathy.c:308
-#, fuzzy
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
-msgstr "Jangan terhubung saat startup"
+msgstr "Jangan menyambung saat memulai"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Jangan menampilkan daftar kontak atau dialog lainnya pada startup"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- Klien IM Empathy"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
-msgstr ""
+msgstr "Galat saat menghubungi Manajer Akun"
-#: ../src/empathy.c:501
-#, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
+#: ../src/empathy.c:562
+#, 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 ""
+"Ada galat saat mencoba menyambung ke Manajer Akun Telepathy. Pesan galat:\n"
"\n"
"%s"
-msgstr "Ada kesalahan saat menguraikan rincian akun."
#: ../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 adalah perangkat lunak bebas; Anda dapat menyebarluaskannya dan/atau "
-"memodifikasinya di bawah Lisensi Publik Umum GNU sebagaimana dipublikasikan "
-"oleh Free Software Foundation; baik versi 2 dari Lisensi, atau (dengan "
-"pilihan Anda) versi lain."
+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 adalah perangkat lunak bebas; Anda dapat menyebarluaskannya dan/atau memodifikasinya di bawah Lisensi Publik Umum GNU sebagaimana dipublikasikan oleh Free Software Foundation; baik versi 2 dari Lisensi, atau (dengan pilihan Anda) versi lain."
#: ../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 ini didistribusikan dengan harapan bahwa ini akan berguna, tetapi "
-"TANPA ADANYA JAMINAN; tanpa jaminan yang termasuk dari DAGANGAN atau "
-"KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik Umum GNU untuk lebih "
-"jelasnya."
+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 ini didistribusikan dengan harapan bahwa ini akan berguna, tetapi TANPA ADANYA JAMINAN; tanpa jaminan yang termasuk dari DAGANGAN atau KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik Umum GNU untuk lebih jelasnya."
#: ../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 ""
-"Anda seharusnya menerima salinan dari Lisensi Publik Umum GNU bersama dengan "
-"Empathy, jika tidak, tulis ke Free Software Foundation, Inc, 51 Franklin "
-"Street, Fifth Floor, Boston, MA USA 02.110-130.159"
+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 "Anda seharusnya menerima salinan dari Lisensi Publik Umum GNU bersama dengan Empathy, jika tidak, tulis ke Free Software Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA USA 02.110-130.159"
#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
@@ -2782,12 +2902,8 @@ msgid "The error message was: %s"
msgstr "Pesan kesalahan adalah: %s"
#: ../src/empathy-account-assistant.c:183
-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 ""
-"Anda dapat kembali dan mencoba untuk memasukkan rincian akun Anda lagi atau "
-"berhenti dari asisten ini dan menambahkan akun dari menu Edit."
+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 "Anda dapat kembali dan mencoba untuk memasukkan rincian akun Anda lagi atau berhenti dari asisten ini dan menambahkan akun dari menu Edit."
#: ../src/empathy-account-assistant.c:220
#: ../src/empathy-account-assistant.c:1271
@@ -2819,22 +2935,12 @@ msgid "Enter the details for the new account"
msgstr "Masukkan rincian untuk akun baru"
#: ../src/empathy-account-assistant.c:612
-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 ""
-"Dengan Empathy Anda dapat mengobrol dengan orang terdekat dan daring dengan "
-"teman dan kolega yang menggunakan Google Talk, AIM, Windows Live dan banyak "
-"program obrolan lainnya. Dengan mikrofon atau webcam Anda juga dapat "
-"memiliki panggilan audio atau video."
+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 "Dengan Empathy Anda dapat mengobrol dengan orang terdekat dan daring dengan teman dan kolega yang menggunakan Google Talk, AIM, Windows Live dan banyak program obrolan lainnya. Dengan mikrofon atau webcam Anda juga dapat memiliki panggilan audio atau video."
#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Apakah Anda memiliki akun yang telah Anda gunakan dengan program obrolan "
-"yang lain?"
+msgstr "Apakah Anda memiliki akun yang telah Anda gunakan dengan program obrolan yang lain?"
#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
@@ -2850,16 +2956,15 @@ msgstr "Tidak, saya ingin akun baru"
#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"Tidak, saya hanya ingin melihat orang-orang terdekat yang daring sekarang"
+msgstr "Tidak, saya hanya ingin melihat orang-orang terdekat yang daring sekarang"
#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Pilih akun yang Anda ingin untuk diimpor:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Ya"
@@ -2868,17 +2973,8 @@ msgid "No, that's all for now"
msgstr "Tidak, itu saja untuk saat ini"
#: ../src/empathy-account-assistant.c:1085
-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. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy secara otomatis dapat menemukan dan mengobrol dengan orang yang "
-"terhubung pada jaringan yang sama dengan Anda. Jika Anda ingin menggunakan "
-"fitur ini, silakan periksa rincian di bawah ini adalah benar. Anda dapat "
-"dengan mudah mengubah rincian nanti atau menonaktifkan fitur ini dengan "
-"menggunakan dialog 'Akun'"
+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. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
+msgstr "Empathy secara otomatis dapat menemukan dan mengobrol dengan orang yang terhubung pada jaringan yang sama dengan Anda. Jika Anda ingin menggunakan fitur ini, silakan periksa rincian di bawah ini adalah benar. Anda dapat dengan mudah mengubah rincian nanti atau menonaktifkan fitur ini dengan menggunakan dialog 'Akun'"
# kelebihan spasi
#: ../src/empathy-account-assistant.c:1091
@@ -2887,22 +2983,12 @@ msgid "Edit->Accounts"
msgstr "Sunting->Akun"
#: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
msgid "I do _not want to enable this feature for now"
-msgstr "Saya tidak ingin mengaktifkan fitur ini untuk sekarang"
+msgstr "Saya tidak ingi_n mengaktifkan fitur ini untuk sekarang"
#: ../src/empathy-account-assistant.c:1143
-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 ""
-"Anda tidak akan dapat mengobrol dengan orang-orang yang terhubung ke "
-"jaringan lokal Anda, jika telepati-salut tidak diinstal. Jika Anda ingin "
-"mengaktifkan fitur ini, silakan instal paket telepati-salut dan membuat akun "
-"Orang-orang Terdekat dari dialog Akun"
+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 "Anda tidak akan dapat mengobrol dengan orang-orang yang terhubung ke jaringan lokal Anda, jika telepati-salut tidak diinstal. Jika Anda ingin mengaktifkan fitur ini, silakan instal paket telepati-salut dan membuat akun Orang-orang Terdekat dari dialog Akun"
#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
@@ -2937,110 +3023,101 @@ msgstr "Ada perubahan yang belum disimpan ke akun %s Anda."
msgid "Your new account has not been saved yet."
msgstr "Akun baru Anda belum tersimpan."
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1103
msgid "Connecting…"
msgstr "Menyambung..."
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "Luring — %s"
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "Terputus — %s"
# garis --- disalin saja dari sumber
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "Luring — Tidak Ada Koneksi Jaringan"
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "Status Tidak Diketahui"
# garis --- disalin saja dari sumber
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "Luring — Akun Tidak Diaktifkan"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Anda akan membuat akun baru, yang akan membatalkan perubahan Anda. Apakah "
-"Anda yakin ingin melanjutkan?"
+msgstr "Anda akan membuat akun baru, yang akan membatalkan perubahan Anda. Apakah Anda yakin ingin melanjutkan?"
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Apakah Anda ingin menghapus %s dari komputer Anda?"
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr "Ini tidak akan menghapus akun Anda di server."
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Anda akan memilih akun lain, yang akan membatalkan perubahan Anda. Apakah "
-"Anda yakin ingin melanjutkan?"
+msgstr "Anda akan memilih akun lain, yang akan membatalkan perubahan Anda. Apakah Anda yakin ingin melanjutkan?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Aktifkan"
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
-msgstr ""
+msgstr "_Matikan"
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Anda akan menutup jendela, yang akan membatalkan perubahan Anda. Apakah Anda "
-"yakin ingin melanjutkan?"
+msgstr "Anda akan menutup jendela, yang akan membatalkan perubahan Anda. Apakah Anda yakin ingin melanjutkan?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Tambah..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Memuat informasi akun"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Tidak ada protokol terinstal"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Protokol:"
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Untuk menambah akun baru, pertama Anda harus menginstal backend untuk setiap "
-"protokol yang ingin Anda gunakan."
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "T_ambah..."
-
#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Untuk menambah akun baru, pertama Anda harus menginstal backend untuk setiap protokol yang ingin Anda gunakan."
+
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_Impor..."
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr " - Klien otentikasi Empathy"
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Klien otentikasi Empathy"
@@ -3049,285 +3126,351 @@ msgid "People nearby"
msgstr "Orang-orang terdekat"
#: ../src/empathy-av.c:118
+#: ../src/empathy-call.c:127
msgid "- Empathy Audio/Video Client"
msgstr "- Klien Audio/Video Empathy"
#: ../src/empathy-av.c:134
+#: ../src/empathy-call.c:152
msgid "Empathy Audio/Video Client"
msgstr "Klien Audio/Video Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Kontras"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Kecerahan"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "Panel _samping"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Masukan audio"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Masukan video"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Dialpad"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Rincian"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1604
#, c-format
msgid "Call with %s"
msgstr "Panggil dengan %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Panggilan"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1848
msgid "The IP address as seen by the machine"
-msgstr ""
+msgstr "Alamat IP sebagaimana dilihat oleh mesin"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1850
msgid "The IP address as seen by a server on the Internet"
-msgstr ""
+msgstr "Alamat IP sebagaimana dilihat oleh server di Internet"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1852
msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "Alamat IP dari peer sebagaimana dilihat oleh sisi lain"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1854
msgid "The IP address of a relay server"
-msgstr ""
+msgstr "Alamat IP dari server relay"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1856
msgid "The IP address of the multicast group"
-msgstr ""
+msgstr "Alamat IP dari grup multicast"
+
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Tak dikenal"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Tak dikenal"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Tak dikenal"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Tak dikenal"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Terhubung — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2588
msgid "Technical Details"
msgstr "Rincian Teknis"
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2626
#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"Perangkat lunak %s tidak memahami format audio apapun yang didukung oleh "
-"komputer Anda"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgstr "Perangkat lunak %s tidak memahami format audio apapun yang didukung oleh komputer Anda"
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2631
#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"Perangkat lunak %s tidak memahami format video apapun yang didukung oleh "
-"komputer Anda"
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr "Perangkat lunak %s tidak memahami format video apapun yang didukung oleh komputer Anda"
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2637
#, 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 ""
-"Tidak dapat membuat sambungan ke %s. Salah satu dari Anda mungkin berada "
-"pada jaringan yang tidak mengizinkan koneksi langsung."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Tidak dapat membuat sambungan ke %s. Salah satu dari Anda mungkin berada pada jaringan yang tidak mengizinkan koneksi langsung."
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2643
msgid "There was a failure on the network"
msgstr "Ada kegagalan pada jaringan"
-#: ../src/empathy-streamed-media-window.c:2386
-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-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2647
+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-streamed-media-window.c:2389
-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-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2650
+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-streamed-media-window.c:2399
-#, fuzzy, 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 ""
-"Sesuatu yang tidak terduga terjadi dalam komponen Telepathy. Silakan <a href="
-"\"%s\">laporkan bug ini</a> dan melampirkan log yang dikumpulkan dari "
-"jendela 'Debug' dalam menu Bantuan."
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2662
+#, 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 "Sesuatu yang tidak terduga terjadi dalam komponen Telepathy. Silakan <a href=\"%s\">laporkan bug ini</a> dan melampirkan log yang dikumpulkan dari jendela 'Debug' dalam menu Bantuan."
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2671
msgid "There was a failure in the call engine"
msgstr "Ada kegagalan dalam mesin panggilan"
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2674
msgid "The end of the stream was reached"
-msgstr ""
+msgstr "Akhir stream tercapai"
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2714
msgid "Can't establish audio stream"
msgstr "Tidak dapat membangun aliran audio"
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2724
msgid "Can't establish video stream"
msgstr "Tidak bisa membangun aliran video"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Audio"
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Memanggil kontak lagi"
-
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera Mati"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec Pengawakode:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera Hidup"
+msgid "Disable camera"
+msgstr "Matikan kamera"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr ""
+msgid "Display the dialpad"
+msgstr "Tampilkan dialpad"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Nonaktifkan kamera dan menghentikan pengiriman video"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec Pengode:"
#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Aktifkan kamera dan mengirim video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Menggantung"
#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Aktifkan kamera tetapi tidak mengirim video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Tutup saat panggilan"
#: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Kandidat Lokal:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Menggantung"
+msgid "Maximise me"
+msgstr "Maksimalkan saya"
#: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Tutup saat panggilan"
+msgid "Minimise me"
+msgstr "Minimalkan saya"
#: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Kandidat Jauh:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Pra-tampil"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Kirim Audio"
#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Panggil ulang"
+msgid "Send Video"
+msgstr "Kirim Video"
#: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+msgid "Show dialpad"
+msgstr "Tampilkan dialpad"
#: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Kirim Audio"
+msgid "Start a video call"
+msgstr "Mulai panggilan video"
#: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Aktifkan transmisi audio"
+msgid "Start an audio call"
+msgstr "Mulai panggilan audio"
+
+#: ../src/empathy-call-window.ui.h:18
+#| msgid "Disable camera"
+msgid "Swap camera"
+msgstr "Tukar kamera"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Aktifkan transmisi audio"
#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Jungkitkan transmisi video"
#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Mati"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video Hidup"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2224
+#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-call-window.c:2226
+#: ../src/empathy-call-window.c:2227
+msgid "Unknown"
+msgstr "Tidak Diketahui"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Pra-tampil"
+msgid "Video call"
+msgstr "Panggilan video"
#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Panggil"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "_Isi"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "_Bantuan"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Pengaturan"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Lihat"
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d belum dibaca)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (dan %u lainnya)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, 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:511
+#: ../src/empathy-chat-window.c:517
#, 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:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sedang mengirim %d pesan"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Ketik pesan."
@@ -3339,10 +3482,6 @@ msgstr "Bersi_hkan"
msgid "C_ontact"
msgstr "K_ontak"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Obrolan"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Masukkan _Smiley"
@@ -3360,14 +3499,8 @@ msgid "Move Tab _Right"
msgstr "Pindahkan Tab Ke _Kanan"
#: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
-#| msgid "No error message"
msgid "Notify for All Messages"
-msgstr "Tidak ada pesan kesalahan"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Isi"
+msgstr "Beritahu bagi Semua Pesan"
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
@@ -3377,18 +3510,10 @@ msgstr "Per_cakapan"
msgid "_Detach Tab"
msgstr "_Lepaskan Tab"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Sunting"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "Ruang Mengobrol _Favorit"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Bantuan"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "Tab Selanjut_nya"
@@ -3397,7 +3522,8 @@ msgstr "Tab Selanjut_nya"
msgid "_Previous Tab"
msgstr "Ta_b Sebelumnya"
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Tampilkan Daftar Kontak"
@@ -3409,15 +3535,15 @@ msgstr "_Tab"
msgid "_Undo Close Tab"
msgstr "Batalkan T_utup Tab"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Nama"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Ruang"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Tersambung-Otomatis"
@@ -3425,90 +3551,99 @@ msgstr "Tersambung-Otomatis"
msgid "Manage Favorite Rooms"
msgstr "Mengelola Ruang Favorit"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "Panggilan video masuk"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Panggilan masuk"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s memanggil Anda lewat video. Apakah Anda ingin menjawab?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s memanggil Anda. Apakah Anda ingin menjawab?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:530
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Panggilan masuk dari %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_Tolak"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_Jawab"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "J_awab dengan video"
+
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "Panggilan video masuk dari %s"
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Undangan ruang"
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Undangan untuk bergabung di %s"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s mengundang Anda untuk bergabung dengan %s"
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_Tolak"
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Gabung"
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s mengundang Anda untuk bergabung dengan %s"
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Anda diundang untuk bergabung di %s"
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Kedatangan transfer berkas dari %s"
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1135
+#: ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Memerlukan sandi"
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s ingin dapat melihat ketika Anda daring"
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3518,105 +3653,104 @@ msgstr ""
"Pesan: %s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Tidak diketahui"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s dari %s di %s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s dari %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Menerima \"%s\" dari %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Mengirim \"%s\" ke %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Kesalahan menerima \"%s\" dari %s"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Kesalahan menerima berkas"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Gagal mengirim \"%s\" ke %s"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Gagal mengirim berkas"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" diterima dari %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" dikirim ke %s"
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Transfer berkas selesai"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616
+#: ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Menunggu tanggapan peserta lain"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642
+#: ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Memeriksa integritas \"%s\""
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
-#, fuzzy, c-format
+#: ../src/empathy-ft-manager.c:645
+#: ../src/empathy-ft-manager.c:683
+#, c-format
msgid "Hashing \"%s\""
msgstr "Hashing \"%s\""
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Berkas"
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Tersisa"
@@ -3629,12 +3763,8 @@ msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "Hapus transfer berkas yang selesai, batal dan gagal dari daftar"
#: ../src/empathy-import-dialog.c:84
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Tidak ada akun yang akan diimpor dapat ditemukan. Empathy saat ini hanya "
-"mendukung pengimporan akun dari Pidgin."
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Tidak ada akun yang akan diimpor dapat ditemukan. Empathy saat ini hanya mendukung pengimporan akun dari Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -3653,41 +3783,55 @@ msgstr "Protokol"
msgid "Source"
msgstr "Sumber"
-#: ../src/empathy-main-window.c:387
-#, fuzzy
-#| msgid "Password:"
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
-msgstr "Sandi:"
+msgstr "Sediakan Sandi"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Putus"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Tidak ada yang cocok"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Hubungkan kembali"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Sunting Akun"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Tutup"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Isi ulang %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Isi ulang kredit akun"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "Isi Ulang..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "Kontak"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "Daftar Kontak"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "Tampilkan dan sunting akun"
@@ -3696,95 +3840,91 @@ msgid "Contacts on a _Map"
msgstr "Kontak pada Pe_ta"
#: ../src/empathy-main-window.ui.h:2
-#, fuzzy
-#| msgid "Contact List"
+msgid "Credit Balance"
+msgstr "Sisa Kredit"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
-msgstr "Daftar Kontak"
+msgstr "Cari di _Daftar Kontak"
# favorite -> favorit
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Gabung _Favorit"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Mengelola Favorit"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "Ukuran N_ormal"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "_Panggilan Baru ..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Ukuran Normal Dengan _Avatar"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "P_referensi"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Tampilkan P_rotokol"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Urutkan menurut _Nama"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Urutkan menurut _Status"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Akun"
-#: ../src/empathy-main-window.ui.h:14
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
-msgstr "K_ontak Luring"
+msgstr "Kontak Yang Di_blokir"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "Ukuran _Ringkas"
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Debug"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Trans_fer Berkas"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "_Gabung..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "Percakapa_n Baru..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "K_ontak Luring"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "Informasi _Personal"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Ruang"
-#: ../src/empathy-main-window.ui.h:28
-#, fuzzy
-#| msgid "_Show Contact List"
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
-msgstr "_Tampilkan Daftar Kontak"
+msgstr "_Cari Kontak..."
#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
@@ -3796,34 +3936,29 @@ msgstr "Anggota"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
+#: ../src/empathy-new-chatroom-dialog.c:553
+#, c-format
msgid ""
"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"Undangan dibutuhkan: %s\n"
"Sandi diperlukan: %s\n"
"Anggota: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Tidak"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Tidak dapat memulai daftar ruang"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "Tak dapat menghentikan daftar ruang"
@@ -3832,19 +3967,12 @@ msgid "Couldn't load room list"
msgstr "Tidak dapat mengambil daftar ruang"
#: ../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 ""
-"Masukkan nama ruang untuk bergabung di sini atau klik pada salah satu atau "
-"lebih ruang dalam daftar."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Masukkan nama ruang untuk bergabung di sini atau klik pada salah satu atau lebih ruang dalam daftar."
#: ../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 ""
-"Masukkan server yang memuat ruang, atau biarkan kosong jika ruangan berada "
-"di server yang sedang berjalan"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Masukkan server yang memuat ruang, atau biarkan kosong jika ruangan berada di server yang sedang berjalan"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
@@ -3858,39 +3986,79 @@ msgstr "Daftar Ruang"
msgid "_Room:"
msgstr "_Ruang:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:172
msgid "Message received"
msgstr "Pesan diterima"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:173
msgid "Message sent"
msgstr "Pesan terkirim"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:174
msgid "New conversation"
msgstr "Percakapan baru"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:175
msgid "Contact goes online"
msgstr "Kontak pergi daring"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:176
msgid "Contact goes offline"
msgstr "Kontak pergi luring"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:177
msgid "Account connected"
msgstr "Akun terhubung"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:178
msgid "Account disconnected"
msgstr "Akun terputus"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:487
msgid "Language"
msgstr "Bahasa"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:737
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:744
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:765
+msgid "Juliet has disconnected"
+msgstr "Juliet telah terputus"
+
+#: ../src/empathy-preferences.c:1173
msgid "Preferences"
msgstr "Preferensi"
@@ -3898,141 +4066,141 @@ msgstr "Preferensi"
msgid "Appearance"
msgstr "Penampilan"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Tingkah laku"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "T_ema Obrolan:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Nonaktifkan pemberitahuan bila pergi _atau sibuk"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Nonaktifkan suara ketika pergi _atau sibuk"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
-msgstr ""
+msgstr "Tampilkan kejadian masuk di area pemberitahuan"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Aktifkan pemberitahuan bila kontak daring"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Aktifkan pemberitahuan bila kontak luring"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Aktifkan pemberitahuan bila _obrolan tidak fokus"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Aktifkan pemeriksaan ejaan untuk bahasa:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Umum"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Tingkat masukan"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Volume masukan"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Sumber lokasi:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Log percakapan"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notifikasi"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Putar suara untuk acara"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Pribadi"
-#: ../src/empathy-preferences.ui.h:18
-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 ""
-"Mengurangi ketepatan lokasi berarti bahwa jika tidak ada yang lebih tepat "
-"dari kota Anda, propinsi dan negara akan dipublikasikan. Koordinat GPS akan "
-"akurat sampai 1 tempat desimal."
+#: ../src/empathy-preferences.ui.h:22
+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 "Mengurangi ketepatan lokasi berarti bahwa jika tidak ada yang lebih tepat dari kota Anda, propinsi dan negara akan dipublikasikan. Koordinat GPS akan akurat sampai 1 tempat desimal."
-#: ../src/empathy-preferences.ui.h:19
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
-msgstr "Tampilkan _smileys sebagai gambar"
+msgstr "Tampilkan _smiley sebagai gambar"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Tampi_lkan daftar kontak di ruang"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Suara"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Pemeriksaan Ejaan"
-#: ../src/empathy-preferences.ui.h:23
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Daftar bahasa yang ada hanya mencerminkan bahasa yang telah memiliki kamus "
-"yang terinstal."
+#: ../src/empathy-preferences.ui.h:27
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Daftar bahasa yang ada hanya mencerminkan bahasa yang telah memiliki kamus yang terinstal."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Tema"
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
-#| msgid "Automatically _connect on startup "
+# bearing = arah?
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Varian:"
+
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
-msgstr "_Koneksi otomatis saat memulai"
+msgstr "Koneksi otom_atis saat memulai"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "Telepon _seluler"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "Aktifkan pemberitahuan g_elembung"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "Aktifkan p_emberitahuan suara"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "Jaringa_n (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "Buka _obrolan baru di jendela terpisah"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "Tam_pilkan lokasi untuk kontak saya"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "Ku_rangi akurasi lokasi"
@@ -4044,104 +4212,143 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Keluar"
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Memanggil kontak lagi"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera Mati"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera Hidup"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Nonaktifkan kamera dan menghentikan pengiriman video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Aktifkan kamera dan mengirim video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Aktifkan kamera tetapi tidak mengirim video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Pra-tampil"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Panggil ulang"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video Mati"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video Hidup"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Video Pra-tampil"
+
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Tampilan Peta Kontak"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "Simpan"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "Jendela Debug"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "Berhenti sebentar"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "Tingkat"
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "Pesan"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "Peringatan"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "Kritis"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "Kesalahan"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "Waktu"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "Tingkat"
-#: ../src/empathy-debug-window.c:1601
-#, fuzzy
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Manajer koneksi yang dipilih tidak mendukung ekstensi remote debugging."
+#: ../src/empathy-debug-window.c:1642
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Manajer koneksi yang dipilih tidak mendukung ekstensi pengawakutuan jauh."
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "Undang Peserta"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "Pilih kontak untuk diundang ke percakapan:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "Undang"
#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Jangan tampilkan dialog apapun; lakukan pekerjaan apapun (misalnya, impor) "
-"dan keluar"
+msgstr "Jangan tampilkan dialog apapun; lakukan pekerjaan apapun (misalnya, impor) dan keluar"
#: ../src/empathy-accounts.c:187
-#, fuzzy
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Jangan tampilkan dialog apapun jika ada akun non-salut"
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "Jangan tampilkan dialog apapun kecuali hanya ada akun \"Orang Sekitar\""
#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Pertama pilih akun yang diberikan (misalnya, gabble/jabber/"
-"foo_40example_2eorg0)"
+msgstr "Pertama pilih akun yang diberikan (misalnya, gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:193
msgid "<account-id>"
@@ -4155,46 +4362,84 @@ msgstr "- Akun Empathy"
msgid "Empathy Accounts"
msgstr "Akun Empathy"
-#: ../src/empathy-debugger.c:66
-#, fuzzy
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Tampilkan layanan tertentu"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Pengawakutu Empathy"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
-msgstr "Debugger Empathy"
+msgstr "Pengawakutu Empathy"
#: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
msgid "- Empathy Chat Client"
-msgstr "- Klien IM Empathy"
+msgstr "- Klien Obrolan Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "Tanggapan"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Tolak"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Jawab"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Jawab dengan video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Tolak"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Terima"
-#: ../src/empathy-call-observer.c:130
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
-msgid "Missed call from %s"
-msgstr "Panggilan masuk dari %s"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Sediakan"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgstr "%s baru saja mencoba memanggil, tapi Anda sedang menerima panggilan lain."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1008
+#: ../src/empathy-call-window.c:1027
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2539
+msgid "On hold"
+msgstr "Ditahan"
+
+#: ../src/empathy-call-window.c:2542
+msgid "Mute"
+msgstr "Bisu"
+
+#: ../src/empathy-call-window.c:2544
+msgid "Duration"
+msgstr "Durasi"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2547
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Cocok _huruf besar kecil "
+
diff --git a/po/nb.po b/po/nb.po
index c5a1e6169..549d07ff9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 3.1.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-12 12:48+0200\n"
-"PO-Revision-Date: 2011-07-12 12:50+0200\n"
+"POT-Creation-Date: 2011-08-16 16:39+0200\n"
+"PO-Revision-Date: 2011-08-16 16:40+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -39,6 +39,18 @@ msgid "Always open a separate chat window for new chats."
msgstr "Alltid åpne et eget vindu til nye samtaler."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Samtalevolum"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Samtalevolum, som prosent."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kameraenhet"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -46,50 +58,54 @@ msgstr ""
"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
"tabulator benyttes i gruppeprat."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme"
msgstr "Tema for samtalevindu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Chat window theme variant"
msgstr "Temavariant for samtalevindu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
"fr, nl\")."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Compact contact list"
msgstr "Kompakt kontaktliste"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Connection managers should be used"
msgstr "Tilkoblingshåndterer skal brukes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Contact list sort criterion"
msgstr "Sorteringskriterier for kontaktliste"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Default directory to select an avatar image from"
msgstr "Forvalgt mappe for personbilde"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Disable popup notifications when away"
msgstr "Slå av varsling når du er borte"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable sounds when away"
msgstr "Slå av lyder når du er borte"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Display incoming events in the status area"
msgstr "Vis innkommende hendelser i statusområdet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -97,299 +113,307 @@ msgstr ""
"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
"til bruker med det samme."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "Støtte for utlikning av ekko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can publish the user's location"
msgstr "Empathy kan publisere brukers plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy kan bruke GPS til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the network to guess the location"
msgstr "Empathy kan bruke nettverket til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy default download folder"
msgstr "Forvalgt nedlastingsmappe for Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy har migrert logger fra butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should auto-away when idle"
msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-connect on startup"
msgstr "Empathy skal koble til automatisk ved oppstart"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Enable WebKit Developer Tools"
msgstr "Slå på utviklerverktøy for WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable popup notifications for new messages"
msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Enable spell checker"
msgstr "Bruk stavekontroll"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Hide main window"
msgstr "Skjul hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Hide the main window."
msgstr "Skjul hovedvinduet."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Nick completed character"
msgstr "Tegn for fullføring av kallenavn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Open new chats in separate windows"
msgstr "Åpne nye samtaler i egne vinduer"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Path of the Adium theme to use"
msgstr "Sti til Adium-tema som skal brukes"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound for incoming messages"
msgstr "Spill av lyd når meldinger kommer inn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for new conversations"
msgstr "Spill av lyd ved nye samtaler"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for outgoing messages"
msgstr "Spill av lyd for utgående meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when a contact logs in"
msgstr "Spill av lyd når kontakter logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound when a contact logs out"
msgstr "Spill av lyd når kontakter logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when we log in"
msgstr "Spill av lyd når du logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when we log out"
msgstr "Spill av lyd når du logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Pop up notifications if the chat isn't focused"
msgstr "Vis varsling når prat ikke er fokusert"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Pop up notifications when a contact logs in"
msgstr "Vis varsling når en kontakt logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications when a contact logs out"
msgstr "Vis varsling når en kontakt logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show Balance in contact list"
msgstr "Vis saldo i kontaktliste"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show avatars"
msgstr "Vis personbilder"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show contact list in rooms"
msgstr "Vis kontaktliste i rom"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show hint about closing the main window"
msgstr "Vis hint om lukking av hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show offline contacts"
msgstr "Vis frakoblede kontakter"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show protocols"
msgstr "Vis protokoller"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Spell checking languages"
msgstr "Stavekontrollspråk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The default folder to save file transfers in."
msgstr "Forvalgt mappe for lagring av filoverføringer."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The last directory that an avatar image was chosen from."
msgstr "Den forrige mappen et personbilde ble valgt fra."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The position for the chat window side pane"
msgstr "Posisjon for pratevinduets sidelinje"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Temaet som brukes til å vise samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Use graphical smileys"
msgstr "Vis smilefjes grafisk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Use notification sounds"
msgstr "Bruk varslingslyder"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use theme for chat rooms"
msgstr "Bruk tema for samtalerom"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Om Empathy kan publisere brukers plassering til kontakter."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Om Empathy kan bruke GPS for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the network to guess the location."
msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Om Empathy har migrert logger for butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
"nettverket."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound to notify of events."
msgstr "Om lyder skal spilles av for å varsle om hendelser."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play a sound to notify of new conversations."
msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to play a sound when logging into a network."
msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to play a sound when logging out of a network."
msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to play sound notifications when away or busy."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Om varsel skal vises når en kontakt kobler fra."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Om et varsel skal vises når en kontakt er kobler fra."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -397,40 +421,40 @@ msgstr ""
"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
"men ikke har fokus."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Om varsling skal vises når en ny melding mottas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show account balances in the contact list."
msgstr "Om saldo for konto skal vises i kontaktlisten."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid "Whether to show popup notifications when away or busy."
msgstr "Om varsling skal vises når du er borte eller opptatt."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Whether to show the contact list in chat rooms."
msgstr "Om kontaktlisten skal vises i praterom."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
msgid "Whether to show the contact list in compact mode."
msgstr "Om kontaktlisten skal vises i kompakt modus."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -438,11 +462,11 @@ msgstr ""
"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
"vises."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
msgid "Whether to use the theme for chat rooms."
msgstr "Om tema skal brukes for praterom eller ikke."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -561,7 +585,7 @@ msgid "Status is set to offline"
msgstr "Status er satt til frakoblet"
#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Network error"
msgstr "Nettverksfeil"
@@ -732,66 +756,67 @@ msgstr "i fremtiden"
msgid "All accounts"
msgstr "Alle kontoer"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "Passord"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Tjener"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Konto %s er redigert via Mine nettkontoer."
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Konto %s kan ikke redigeres i Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "Start Mine nettkontoer"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "L_ogg inn"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "A_vbryt"
@@ -800,19 +825,19 @@ msgstr "A_vbryt"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s av %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "Ny konto"
@@ -824,6 +849,7 @@ msgstr "<b>Eksempel:</b> MittSkjermNavn "
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -966,43 +992,51 @@ msgstr "Alternativer"
msgid "None"
msgstr "Ingen"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Tegnsett:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"De fleste IRC-tjenere krever ikke et passord, så ikke oppgi et passord hvis "
+"du ikke er sikker."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Nettverk"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Nettverk:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Kallenavn:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Passord:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Melding ved frakobling:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Virkelig navn:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Tjenere"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Hva er ditt kallenavn på IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Hvilket IRC-nettverk?"
@@ -1253,61 +1287,61 @@ msgstr "Alle filer"
msgid "Click to enlarge"
msgstr "Klikk for å forstørre"
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
msgid "There was an error starting the call"
msgstr "Det oppsto en feil ved start av samtalen"
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "The specified contact doesn't support calls"
msgstr "Valgt kontakt støtter ikke oppringing"
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
msgid "The specified contact is offline"
msgstr "Valgt kontakt er koblet fra"
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
msgid "The specified contact is not valid"
msgstr "Valgt kontakt er ugyldig"
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
msgid "Emergency calls are not supported on this protocol"
msgstr "Nødsamtaler er ikke støttet på denne protokollen"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Klarte ikke å åpne privat prat"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Emne er ikke støttet for denne samtalen"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Du har ikke lov til å bytte emne"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "«%s» er ikke en gyldig kontakt-ID"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: tøm alle meldinger fra aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <emne>: sett emne for aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID for praterom>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1315,23 +1349,23 @@ msgstr ""
"/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive "
"rommet"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1341,11 +1375,11 @@ msgstr ""
"sende en melding som starter med tegnet «/». For eksempel: «/say /join "
"brukes til å bli med i et nytt praterom»"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1353,113 +1387,113 @@ msgstr ""
"/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
"hvis den er definert."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Bruk: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Ukjent kommando"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "ikke nok kreditt til å sende melding"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "ikke kapabel"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "frakoblet"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "ugyldig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "tilgang nektet"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "meldingen er for lang"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "ikke implementert"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Feil ved sending av melding: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Emne:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Emnet er satt til: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Legg til «%s» i ordboken"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Legg til «%s» i ordbok for %s"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1819
msgid "_Send"
msgstr "_Send"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1467,12 +1501,12 @@ msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1480,17 +1514,17 @@ msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1500,69 +1534,68 @@ msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1858
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2269
msgid "Disconnected"
msgstr "Koblet fra"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Vil du lagre dette passordet?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Husk"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Ikke nå"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2105
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Samtale"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1587,7 +1620,7 @@ msgstr "Tilgang nektet"
msgid "Could not block contact"
msgstr "Kunne ikke blokkere kontakt"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
msgid "Edit Blocked Contacts"
msgstr "Rediger blokkerte kontakter"
@@ -1606,6 +1639,13 @@ msgstr "Konto:"
msgid "Blocked Contacts"
msgstr "Blokkerte kontakter"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Fjern"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:1417
@@ -1976,7 +2016,7 @@ msgstr "Høyde:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Sted"
@@ -2315,6 +2355,7 @@ msgid "Text chats"
msgstr "Tekstsamtaler"
#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "Samtaler"
@@ -2353,7 +2394,8 @@ msgstr "<span size=\"x-large\">Laster …</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "Ring"
@@ -2371,13 +2413,14 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "Video"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "_Rediger"
@@ -2537,12 +2580,6 @@ msgstr "Samtale avsluttet"
msgid "Edit Custom Messages"
msgstr "Rediger egendefinerte meldinger"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Fjern"
-
#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
@@ -2641,19 +2678,19 @@ msgstr "Husk dette valget for fremtidige tilkoblinger"
msgid "Certificate Details"
msgstr "Sertifikatdetaljer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1715
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1883
msgid "Insufficient free space to save file"
msgstr "Ikke nok ledig plass til å lagre filen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1891
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2662,7 +2699,7 @@ msgstr ""
"%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
"Vennligst velg en annen lokasjon."
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
#, c-format
msgid "Incoming file from %s"
msgstr "Innkommende fil fra %s"
@@ -2850,23 +2887,23 @@ msgstr "Ingen feilmelding"
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "Feil ved forsøk på å kontakte kontohåndtering"
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3095,7 +3132,8 @@ msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:880
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1103
msgid "Connecting…"
msgstr "Kobler til …"
@@ -3203,121 +3241,116 @@ msgstr "Empathy autentiseringsklient"
msgid "People nearby"
msgstr "Personer i nærheten"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy lyd-/bildeklient"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
msgid "Empathy Audio/Video Client"
msgstr "Empathy lyd-/bildeklient"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:458
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:461
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Lysstyrke"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:464
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:569
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Nummertavle"
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1250
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1604
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1447
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1848
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1449
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1850
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1451
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1852
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-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1453
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1854
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1856
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Ukjent"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2167
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2588
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2205
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2626
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3326,8 +3359,8 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2210
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2631
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3336,8 +3369,8 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2637
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3346,29 +3379,29 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2222
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2643
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2226
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2647
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-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2229
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2650
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-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2241
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2662
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3379,36 +3412,31 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2671
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2253
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2674
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2293
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2714
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2303
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2724
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Lyd"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring kontakten igjen"
-
#: ../src/empathy-call-window.ui.h:3
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
@@ -3451,50 +3479,87 @@ msgid "Minimise me"
msgstr "Minimer meg"
#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring på nytt"
-
-#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Ekstern kandidat:"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Send lyd"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
msgid "Send Video"
msgstr "Send video"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
msgid "Show dialpad"
msgstr "Vis ringetastatur"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Start en videosamtale"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Start en lydsamtale"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Bytt kamera"
+
+#: ../src/empathy-call-window.ui.h:19
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Slå av/på overføring av lyd"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Toggle video transmission"
msgstr "Slå av/på overføring av video"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1813 ../src/empathy-call-window.c:1814
-#: ../src/empathy-call-window.c:1815 ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:2224 ../src/empathy-call-window.c:2225
+#: ../src/empathy-call-window.c:2226 ../src/empathy-call-window.c:2227
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video call"
+msgstr "Videosamtale"
+
+#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Ring"
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_Feilsøk"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "Inn_stillinger"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Vis"
@@ -3570,10 +3635,6 @@ msgstr "Flytt fane til høy_re"
msgid "Notify for All Messages"
msgstr "Varsle for alle meldinger"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Innhold"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Samtale"
@@ -3586,10 +3647,6 @@ msgstr "Riv _løs fane"
msgid "_Favorite Chat Room"
msgstr "_Favoritt-praterom"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Hjelp"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Neste fane"
@@ -3897,11 +3954,11 @@ msgstr "Fyll opp …"
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "Kontaktliste"
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
@@ -3965,10 +4022,6 @@ msgstr "_Blokkerte kontakter"
msgid "_Compact Size"
msgstr "_Kompakt størrelse"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Feilsøk"
-
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "_Filoverføringer"
@@ -4064,79 +4117,79 @@ msgstr "Romliste"
msgid "_Room:"
msgstr "_Rom:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:172
msgid "Message received"
msgstr "Melding mottatt"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:173
msgid "Message sent"
msgstr "Melding sendt"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:174
msgid "New conversation"
msgstr "Ny samtale"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:175
msgid "Contact goes online"
msgstr "Kontakt kobler til"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:176
msgid "Contact goes offline"
msgstr "Kontakt kobler fra"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:177
msgid "Account connected"
msgstr "Konto koblet til"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:178
msgid "Account disconnected"
msgstr "Konto koblet fra"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:487
msgid "Language"
msgstr "Språk"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:737
msgid "Juliet"
msgstr "Juliet"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:744
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:750
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:753
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:756
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:759
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:762
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:765
msgid "Juliet has disconnected"
msgstr "Juliet har koblet fra"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1173
msgid "Preferences"
msgstr "Brukervalg"
@@ -4144,67 +4197,75 @@ msgstr "Brukervalg"
msgid "Appearance"
msgstr "Utseende"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Oppførsel"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "Samtale_tema:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Slå av varsling når du er borte eller oppt_att"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Slå av lyder når du er b_orte eller opptatt"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Vis innkommende hendelser i varslingsområdet"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Slå på varsling når en kontakt kobler seg til"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Slå på varsling når en kontakt kobler seg fra"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Aktiver varsling når _prat ikke er fokusert"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Slå på stavekontroll for språk:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Generelt"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Inngangsnivå"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Volum for inngang"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Kilder for steder:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Logg samtaler"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Varsling"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Spill av lyd for hendelser"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Personvern"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4213,71 +4274,71 @@ msgstr ""
"Redusert nøyaktighet for plassering betyr at kun by, område og land vil "
"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "Vis _smilefjes som bilder"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Vis kontakt_liste i rom"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Lyder"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Stavekontroll"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
"Listen med språk viser bare de språkene det er installert ordliste for."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Temaer"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "Variant:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "Koble til _automatisk ved oppstart"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_Mobiltelefon"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Aktiver varsling med bobler"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Aktiver varsling med lyder"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Nettverk (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_Åpne nye samtaler i egne vinduer"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publiser plassering til mine kontakter"
#. 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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Reduser nøyaktighet for plassering"
@@ -4289,6 +4350,10 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Avslutt"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Ring kontakten igjen"
+
#: ../src/empathy-streamed-media-window.ui.h:3
msgid "Camera Off"
msgstr "Kamera av"
@@ -4313,6 +4378,10 @@ msgstr "Slå på kamera men ikke send video"
msgid "Preview"
msgstr "Forhåndsvis"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Ring på nytt"
+
#: ../src/empathy-streamed-media-window.ui.h:19
msgid "V_ideo"
msgstr "V_ideo"
@@ -4333,79 +4402,79 @@ msgstr "Forhåndsvis video"
msgid "Contact Map View"
msgstr "Kartvisning for kontakter"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "Lagre"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "Feilsøkingsvindu"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "Nivå "
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "Feilsøk"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "Melding"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "Advarsel"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "Kritisk"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "Feil"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "Tid"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "Domene"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "Nivå"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr ""
"Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "Inviter deltaker"
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "Velg en kontakt å invitere til samtalen:"
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "Inviter"
@@ -4437,7 +4506,15 @@ msgstr "- Empathy-kontoer"
msgid "Empathy Accounts"
msgstr "Empathy-kontoer"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Vis en spesiell tjeneste"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy feilsøking"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "Empathy feilsøking"
@@ -4483,25 +4560,28 @@ 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:787 ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1005
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1257
-#, c-format
-msgid "Call with %d participants"
-msgstr "Samtale med %d deltakere"
+#: ../src/empathy-call-window.c:2517
+msgid "On hold"
+msgstr "På vent"
+
+#: ../src/empathy-call-window.c:2520
+msgid "Mute"
+msgstr "Demp"
+
+#: ../src/empathy-call-window.c:2522
+msgid "Duration"
+msgstr "Varighet"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2104
+#: ../src/empathy-call-window.c:2525
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s – %d:%02dm"
-#: ../src/empathy-call-window.c:2105
-msgid "On hold"
-msgstr "På vent"
-
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "Skill _mellom små/store bokstaver"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 654c22765..30aaaaea0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,15 +14,16 @@
# André Gondim <andregondim@ubuntu.com>, 2009.
# Jonh Wendell <jwendell@gnome.org>, 2009, 2010.
# Henrique P. Machado <hpmachado@gnome.org>, 2010.
-# Rodrigo Padula de Oliveira <contato@rodrigopadula.com>
-#
+# Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
+# Felipe Borges <felipe10borges@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-03 09:39-0400\n"
-"PO-Revision-Date: 2011-03-31 21:32-0300\n"
-"Last-Translator: Rodrigo Padula de Oliveira <contato@rodrigopadula.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-07-28 11:59+0000\n"
+"PO-Revision-Date: 2011-07-23 19:08-0300\n"
+"Last-Translator: Felipe Borges <felipe10borges@gmail.com>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,6 +56,15 @@ msgid "Always open a separate chat window for new chats."
msgstr "Sempre abrir uma janela de bate-papo separada para novos bate-papos."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "Volume da chamada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -62,46 +72,50 @@ msgstr ""
"Caracteres para adicionar depois do apelido quando usar completamento de "
"apelidos (tab) em bate-papo em grupo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Tema para a janela de bate-papo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Chat window theme variant"
+msgstr "Variante do tema da janela de conversa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Lista, separada por vírgulas, de idiomas de verificação ortográfica para "
"usar (ex: \"en, fr, nl\")."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "Lista de contatos compacta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "Devem ser utilizados gerenciadores de conexão"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "Critério de ordenação da lista de contatos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Desabilitar notificações quando ausente"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Desabilitar sons quando ausente"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Exibir eventos recebidos na área de status"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -109,292 +123,303 @@ msgstr ""
"Exibe eventos recebidos na área de status. Se falso, apresenta-os "
"imediatamente ao usuário."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "O Empathy pode publicar a localização do usuário"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "O Empathy pode usar o GPS para adivinhar a localização"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "O Empathy pode usar a rede para adivinhar a localização"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Pasta padrão de download do Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "O Empathy migrou os registros do butterfly"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "O Empathy deve definir como ausente automaticamente quando ocioso"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Conectar-se automaticamente ao iniciar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "O Empathy deve reduzir a precisão da localização"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Habilitar notificação para novas mensagens"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "Habilitar verificador ortográfico"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Ocultar janela principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "Oculta a janela principal."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "Caractere de completamento de apelidos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Abre novos bate-papos em janelas separadas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Caminho do tema do Adium para utilizar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Caminho do tema do Adium para usar se o tema usado para este bate-papo é do "
"Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "Reproduz um som quando receber mensagens"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "Reproduz um som para novas conversas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "Reproduz um som para mensagens enviadas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "Reproduz um som quando um contato conectar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "Reproduz um som quando um contato desconectar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "Reproduz um som quando conectarmos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "Reproduz um som quando desconectarmos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "Mostra notificações se a janela de bate-papo não estiver em foco"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Mostra notificações quando um contato conecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Mostra notificações quando um contato desconecta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Show Balance in contact list"
+msgstr "Mostrar créditos na lista de contatos"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "Mostra avatares"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "Mostra lista de contatos nas salas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "Mostra dica sobre como fechar a janela principal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "Mostra contatos desconectados"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Exibir protocolos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "Idiomas para verificação ortográfica"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "A pasta padrão onde salvar os arquivos transferidos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "O último diretório onde uma imagem de avatar foi escolhida."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "A posição da janela de bate-papo no painel lateral"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
"A posição armazenada (em pixels) da janela de bate-papo no painel lateral."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"A variação do tema que é usada para exibir a conversa em janelas de bate-"
+"papo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Usa smileys gráficos"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Usa sons de notificação"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Usa tema para salas de bate-papo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Publica a localização do usuário para seus contatos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Usa o GPS para adivinhar a localização."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Usa a rede de celular para adivinhar a localização."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Usa a rede para adivinhar a localização."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Pergunta sobre migrar os registros do butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Conecta automaticamente às suas contas ao iniciar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Deve ir ao modo ausente automaticamente se o usuário estiver ocioso."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Reduz a precisão de localização por razões de privacidade."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Habilita ferramentas de desenvolvedor WebKit, como o Web Inspector."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
"Usa gerenciadores de conexão para desconectar/reconectar automaticamente."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
"ortográfica."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Converte os smileys para imagens gráficas durante as conversas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Reproduz ou não um som de notificação para contatos conectando-se à rede."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Reproduz ou não um som de notificação para contatos desconectando-se da rede."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "Reproduzir um som de notificação para eventos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Reproduzir um som de notificação para mensagens recebidas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "Reproduzir um som de notificação para novas conversas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Reproduzir um som de notificação para mensagens enviadas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Mostra uma notificação quando um contato estiver desconectado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Mostra uma notificação quando um contato conectar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -402,37 +427,41 @@ msgstr ""
"Mostra uma notificação quando receber uma nova mensagem mesmo se a janela de "
"bate papo estiver aberta, mas não estiver com o foco."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Mostra uma notificação quando receber uma nova mensagem."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show account balances in the contact list."
+msgstr "Mostra os créditos das contas na lista de contatos."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Mostra os contatos que estão desconectados na lista de contatos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "Mostra uma notificação quado estiver ausente ou ocupado."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Mostra os protocolos para contatos na lista de contatos."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Mostra a lista de contatos nas salas de bate-papo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "Mostra a lista de contatos no modo compacto."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -440,11 +469,11 @@ msgstr ""
"Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
"\" na barra do título."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "Usa o tema em salas de bate-papo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -460,7 +489,7 @@ msgstr "Gerencia contas de mensagem e VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "Contas de Mensagem e VoIP"
@@ -480,6 +509,22 @@ msgstr "O arquivo selecionado não é um arquivo regular"
msgid "The selected file is empty"
msgstr "O arquivo selecionado é vazio"
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Chamada perdida de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Chamou %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Chamada de %s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Tipo de soquete sem suporte"
@@ -508,151 +553,144 @@ msgstr "Erro ao tentar transferir o arquivo"
msgid "The other participant is unable to transfer the file"
msgstr "O outro participante não pode transferir o arquivo"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Motivo desconhecido"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Disponível"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Ocupado"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Ausente"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Invisível"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "Desconectado"
#. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:224
+msgctxt "presence"
msgid "Unknown"
msgstr "Desconhecido"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Nenhum motivo especificado"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "O status está definido como desconectado"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "Erro de rede"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "Falha de autenticação"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Erro de criptografia"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "Nome já em uso"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Certificado não fornecido"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "Certificado não confiável"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "Certificado expirado"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Certificado não ativado"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Certificado com nome de máquina incorreto"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Certificado com impressão digital incorreto"
# self-signed - Deixei como próprio
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Certificado próprio"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "Erro de certificado"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "Criptografia não disponível"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "Certificado inválido"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "A conexão foi recusada"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "Não é possível estabelecer conexão"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "A conexão foi perdida"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "Este recurso já está conectado ao servidor"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"A conexão foi substituída por uma nova conexão usando os mesmos recursos"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "A conta já existe no servidor"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "O servidor está atualmente muito ocupado para lidar com a conexão"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "O certificado foi revogado"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente "
"fraco"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:348
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -661,153 +699,135 @@ msgstr ""
"certificado do servidor excede os limites impostos pela biblioteca de "
"criptografia"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Pessoas por perto"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! japonês"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "Bate-papo Facebook"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d segundo atrás"
msgstr[1] "%d segundos atrás"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d minuto atrás"
msgstr[1] "%d minutos atrás"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d hora atrás"
msgstr[1] "%d horas atrás"
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d dia atrás"
msgstr[1] "%d dias atrás"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d semana atrás"
msgstr[1] "%d semanas atrás"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d mês atrás"
msgstr[1] "%d meses atrás"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "no futuro"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Todos"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Todas as contas"
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Conta"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "Senha"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porta"
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "A conta %s é editada através do Minhas contas web."
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "A conta %s não pode ser editada no Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "Iniciar Minhas contas web"
#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Nome de usuário:"
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "C_onectar"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Conta:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Habilitado"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "Esta conta já existe no servidor"
# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "Criar uma nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "_Cancelar"
@@ -816,19 +836,19 @@ msgstr "_Cancelar"
#. * 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:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s em %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "Conta no %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "Nova conta"
@@ -840,6 +860,7 @@ msgstr "<b>Exemplo:</b> MeuNomeExibido"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -853,7 +874,7 @@ msgstr "Avançado"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "Se_nha:"
@@ -863,7 +884,7 @@ msgstr "Se_nha:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Lembrar senha"
@@ -873,7 +894,7 @@ msgstr "Lembrar senha"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -950,77 +971,83 @@ msgstr "Qual é o seu UIN do ICQ?"
msgid "What is your ICQ password?"
msgstr "Qual é a sua senha do ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Auto"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UPD"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Registrar"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Opções"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Nenhum"
# Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Codificação de caracteres:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "Rede"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Rede:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Apelido:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Senha:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Mensagem de saída:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Nome verdadeiro:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Servidores"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Qual é o seu apelido do IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Qual rede IRC?"
@@ -1155,58 +1182,63 @@ msgid "Discover the STUN server automatically"
msgstr "Descobrir o servidor STUN automaticamente"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorar erros TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Intervalo (segundos)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Opções Keep-Alive"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "Roteamento frouxo"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Mecanismo:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "Opções de miscelânea"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "Opções transversais de NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Porta:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "Opções de Proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Servidor STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Servidor:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Transporte:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Qual é a senha da sua conta SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "Qual é o seu ID de conexão do SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "_Nome de usuário:"
@@ -1230,29 +1262,37 @@ msgstr "I_D do Yahoo!:"
msgid "_Room List locale:"
msgstr "Local da l_ista da sala:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "Não foi possível converter a imagem"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr ""
"Seu sistema não oferece suporte a nenhum dos formatos de imagem aceitos"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Não foi possível salvar o puxbuf em png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "Selecione sua imagem de avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Tirar uma foto..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "Nenhuma imagem"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Imagens"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Todos os arquivos"
@@ -1260,35 +1300,61 @@ msgstr "Todos os arquivos"
msgid "Click to enlarge"
msgstr "Clique para ampliar"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "Ocorreu um erro ao iniciar a chamada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "O contato especificado não suporta chamadas"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "O contato especificado está desconectado."
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "O contato especificado é inválido"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Chamadas de emergência não são suportadas por este protocolo"
+
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Falhou ao abrir bate-papo privado"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Tópico sem suporte nesta conversa"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Você não está autorizado a alter o tópico"
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "\"%s\" não é um identificador de contato válido"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: limpa todas as mensagens da conversa atual"
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tópico>: define o tópico da conversa atual"
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID da sala de bate-papo>: entra em uma nova sala de bate-papo"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID da sala de bate-papo> Entra em uma nova sala de bate-papo"
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1296,23 +1362,23 @@ msgstr ""
"/part [<ID sala de bate-papo>] [<motivo>]: abandonar a sala de bate-papo, "
"por padrão a sala atual"
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID do contato> [<mensagem>]: abre um bate-papo privado"
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID do contato> [<mensagem>]: abre um bate-papo privado"
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <apelido>: altera o seu apelido no servidor atual"
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mensagem>: envia uma mensagem de AÇÃO para a conversa atual"
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1322,7 +1388,11 @@ msgstr ""
"enviar uma mensagem iniciando com \"/\". Por exemplo: \"/say /join é "
"utilizado para entrar em uma nova sala de bate-papo\""
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID do contato>: exibe informações sobre um contato"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1330,98 +1400,113 @@ msgstr ""
"/help [<comando>]: mostra todos os comandos suportados. Se <comando> estiver "
"definido, será exibido instruções de uso."
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Utilização: %s"
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Comando desconhecido"
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconhecido; veja /help para os comandos disponíveis"
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr "Créditos insuficientes para enviar mensagens"
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "incapaz"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "contato inválido"
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "permissão negada"
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "mensagem muito longa"
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "não implementado"
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "desconhecido"
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Erro enviando mensagem \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Erro ao enviar mensagem: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tópico:"
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Tópico definido como: %s"
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Nenhum tópico definido"
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Sem sugestões)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Adicionar \"%s\" ao dicionário"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Adicionar \"%s\" ao dicionário %s"
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Inserir smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Enviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Sugestões de ortografia"
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Falha ao receber os registros recentes"
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
@@ -1429,12 +1514,12 @@ msgstr "%s desconectou"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulso por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulso"
@@ -1442,17 +1527,17 @@ msgstr "%s foi expulso"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi banido por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s foi banido"
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s saiu da sala"
@@ -1462,105 +1547,127 @@ msgstr "%s saiu da sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s entrou na sala"
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s é agora conhecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "Desconectado"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Deseja armazenar esta senha?"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Lembrar"
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Agora nao"
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Repetir"
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Senha errada; por favor, tente novamente:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Esta sala é protegida por uma senha:"
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Entrar"
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Conversa"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "Identificador inválido ou desconhecido"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "Bloqueio de contatos temporariamente indisponível"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "Bloqueio de contatos indisponível"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "Permissão negada"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "Impossível bloquear o contato"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "Editar contatos bloqueados"
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Conta:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contatos _bloqueados"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Copiar endereço do link"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "Abrir _link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
@@ -1579,13 +1686,13 @@ msgid "New Contact"
msgstr "Novo contato"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "Bloquear %s?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr ""
@@ -1593,12 +1700,12 @@ msgstr ""
"novamente?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "_Bloquear"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "_Reportar este contato como abusivo"
@@ -1624,122 +1731,121 @@ msgstr "Sem grupo"
msgid "Favorite People"
msgstr "Amigos prediletos"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Você realmente deseja remover o grupo \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "Removendo grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_Remover"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Você realmente deseja remover o contato \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "Removendo contato"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Adicionar Contato..."
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "_Bloquear contato"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Bate-papo"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Chamada de áudio"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "Chamada de _vídeo"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "_Conversas anteriores"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Enviar arquivo"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Compartilhar minha área de trabalho"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Favoritos"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Infor_mações"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Convidando você para esta sala"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "Conv_idar para sala de bate-papo"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "Pesquisar contatos"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "Pesquisar: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "_Adicionar Contato"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "Nenhum contato encontrado"
@@ -1747,179 +1853,202 @@ msgstr "Nenhum contato encontrado"
msgid "Select a contact"
msgstr "Selecionar contato..."
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Nome completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefone:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Endereço de e-mail:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Site da web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Aniversário:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Última atividade:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Conectado a partir de:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Mensagem de ausência:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canais:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "Código ISO do país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "CEP:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Endereço:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Construção:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Andar:"
# Evitar colisão com _Salvar
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Descrição:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Nível de eficácia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Erro na vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Erro na horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Direção:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Taxa de subida:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Atualizado pela última vez em:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Localização"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y em %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Salvar avatares"
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Não foi possível salvar o avatar"
@@ -1929,7 +2058,7 @@ msgstr "<b>Localização</b> em (data)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Apelido:"
@@ -1949,7 +2078,7 @@ msgstr "Detalhes do contato"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Identificação:"
@@ -1966,11 +2095,11 @@ msgstr "SO:"
msgid "Version:"
msgstr "Versão:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Grupos"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1978,46 +2107,46 @@ msgstr ""
"Selecione os grupos nos quais este contato aparecerá. Observe que você pode "
"selecionar mais de um grupo ou nenhum grupo."
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_Adicionar grupo"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Selecionar"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Grupo"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "A seguinte identidade será bloqueada:"
msgstr[1] "As seguintes identidades serão bloqueadas:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "Não é possível bloquear a seguinte identidade:"
msgstr[1] "Não é possível bloquear as seguintes identidades:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "Contatos agrupados"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "Selecionar contato para agrupar"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "Visualização de Novo contato"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
msgstr ""
"Contatos selecionados na lista da esquerda serão conectados todos juntos."
@@ -2025,28 +2154,34 @@ 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "Agr_upar contatos…"
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "Apagar e _bloquear"
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2055,7 +2190,7 @@ msgstr ""
"Deseja realmente remover o contato agrupado \"%s\"? Note que isso irá "
"remover todos os contatos que constituem este contato agrupado."
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2139,65 +2274,202 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Desconectar"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Histórico"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Pesquisar"
+
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Conversa em %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Conversa com %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Chamada durou %s, encerrada às %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Hoje"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Qualquer hora"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Qualquer um"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Quem"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Quando"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Qualquer coisa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
+msgstr "Conversas de texto"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Chamadas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Chamadas recebidas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Chamadas realizadas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Chamadas não atendidas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "O que"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Tem certeza que deseja deletar todos os registros das conversas anteriores?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "_Limpar tudo"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Deletar de:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Carregando...</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversas"
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Chamar"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Procurar próximo"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Bate-papo"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Procurar para trás"
+msgid "Delete All History..."
+msgstr "Deletar todo o histórico..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversas anteriores"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vídeo"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Pesquisar"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "Arquivo"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Por:"
+msgid "page 2"
+msgstr "página 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "ID do contato:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "Ba_te-papo"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Nova conversa"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Enviar _vídeo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "Ch_amar"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Nova chamada"
@@ -2216,34 +2488,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Mensagens personalizadas..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Editar mensagens personalizadas..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "Clique para remover este estado como favorito"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "Clique para fazer deste estado um favorito"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Definir estado"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "Define sua presença e estado atual"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Mensagens personalizadas..."
@@ -2256,6 +2528,14 @@ msgstr "Mensagens personalizadas..."
msgid "New %s account"
msgstr "Nova conta %s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Procurar próximo"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Procurar para trás"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Localizar:"
@@ -2308,35 +2588,38 @@ msgstr "Chamada de voz realizada"
msgid "Voice call ended"
msgstr "Chamada de voz finalizada"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Digite a mensagem personalizada"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "Editar mensagens personalizadas"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Salvar _nova mensagem de status"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "_Remover"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Salvar mensagens de status"
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mensagem editada às %s"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+msgid "Normal"
+msgstr "Normal"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Clássico"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Simples"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Limpo"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Azul"
@@ -2416,19 +2699,19 @@ msgstr "Lembrar esta escolha para conexões futuras"
msgid "Certificate Details"
msgstr "Detalhes do certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "Não foi possível abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1748
msgid "Select a file"
msgstr "Selecionar um arquivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1820
msgid "Insufficient free space to save file"
msgstr "Espaço livre insuficiente para salvar o arquivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1828
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2437,7 +2720,7 @@ msgstr ""
"É necessário %s de espaço livre para salvar este arquivo, mas apenas está "
"disponível %s. Selecione outra localização."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Recebendo arquivo de %s"
@@ -2625,23 +2908,23 @@ msgstr "Nenhuma mensagem de erro"
msgid "Instant Message (Empathy)"
msgstr "Mensageiro Instantâneo (Empathy)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Não conectar ao iniciar"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Não mostrar a lista de contatos ou qualquer outro diálogo ao iniciar"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Cliente de mensagens instantâneas Empathy"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Erro ao contatar o gerenciador de conta"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2705,7 +2988,8 @@ msgstr ""
"Jonh Wendell <wendell@bani.com.br>\n"
"Vladimir Melo <vmelo@gnome.org>\n"
"André Gondim <andregondim@ubuntu.com>\n"
-"Henrique P. Machado <hpmachado@gnome.org>"
+"Henrique P. Machado <hpmachado@gnome.org>\n"
+"Felipe Borges <felipe10borges@gmail.com>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
@@ -2803,8 +3087,8 @@ msgid "Select the accounts you want to import:"
msgstr "Selecione as contas que você deseja importar:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Sim"
@@ -2879,34 +3163,34 @@ msgstr "Existem modificações da sua conta %s que ainda não foram salvas."
msgid "Your new account has not been saved yet."
msgstr "Sua nova conta ainda não foi salva."
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "Conectando..."
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "Desconectado — Nenhuma conexão de rede"
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "Status desconhecido"
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "Desconectado — Conta desabilitada"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2914,16 +3198,16 @@ msgstr ""
"Você está prestes a criar uma nova conta, o que descartará\n"
"suas modificações. Você tem certeza que deseja prosseguir?"
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Você deseja remover %s do seu computador?"
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr "Isso não removerá sua conta no servidor."
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2932,15 +3216,15 @@ msgstr ""
"suas modificações. Você tem certeza que deseja prosseguir?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Habilitar"
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "_Desabilitar"
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2949,18 +3233,22 @@ msgstr ""
"suas modificações. Você tem certeza que deseja prosseguir?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "_Adicionar…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Carregando informações de conta"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Nenhum protocolo instalado"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Protocolo:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2968,19 +3256,15 @@ msgstr ""
"Para adicionar uma nova conta, é necessário primeiro instalar um backend "
"para cada protocolo que você deseja usar."
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Adicionar…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_Importar…"
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr "- Cliente de autenticação do Empathy"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Cliente de autenticação do Empathy"
@@ -2988,94 +3272,116 @@ msgstr "Cliente de autenticação do Empathy"
msgid "People nearby"
msgstr "Pessoas por perto"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- Cliente de áudio/vídeo do Empathy"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Cliente de áudio/vídeo do Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Brilho"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gama"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "_Painel lateral"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Entrada de áudio"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Teclado"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Detalhes"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
msgstr "Chamada de %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Chamar"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "O endereço IP como visto pela máquina"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "O endereço IP como visto por um servidor na Internet"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "O endereço IP do par como visto pelo outro lado"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "O endereço IP de um servidor de retransmissão"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "O endereço IP do grupo de multicast"
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "Detalhes técnicos"
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3084,7 +3390,8 @@ msgstr ""
"O aplicativo %s não reconhece nenhum dos formatos de áudio com suporte em "
"seu computador"
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3093,7 +3400,8 @@ msgstr ""
"O aplicativo %s não reconhece nenhum dos formatos de vídeo com suporte em "
"seu computador"
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3102,25 +3410,29 @@ msgstr ""
"Não foi possível realizar uma conexão para %s. Você deve estar em uma rede "
"que não permite conexões diretas."
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "Ocorreu uma falha de rede"
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Os formatos de áudio necessários para esta chamada não estão instalados no "
"seu computador"
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Os formatos de vídeo necessários para esta chamada não estão instalados no "
"seu computador"
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3131,147 +3443,170 @@ msgstr ""
"\"%s\">reporte este erro</a> e anexe os registros gerados na janela "
"\"Depuração\" no menu Ajuda."
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
msgstr "Ocorreu uma falha no mecanismo de chamada"
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "Alcançado o fim do fluxo"
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
msgstr "Não foi possível realizar uma transmissão de áudio"
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
msgstr "Não foi possível realizar uma transmissão de vídeo"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Áudio"
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar o contato novamente"
-
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Câmera desligada"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec de decodificação:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Câmera ligada"
+msgid "Disable camera"
+msgstr "_Desabilitar câmera"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec de decodificação:"
+msgid "Display the dialpad"
+msgstr "Exibir o teclado"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desabilitar a câmera e parar o envio de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec de codificação:"
#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Habilitar a câmera e enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Desligar"
#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Habilitar a câmera, mas não enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Desligar a chamada atual"
#: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Codec de codificação:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Apresentação local:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Desligar"
+msgid "Maximise me"
+msgstr "Maximizar-me"
#: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Desligar a chamada atual"
+msgid "Minimise me"
+msgstr "Minimizar-me"
#: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Apresentação local:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Apresentação remota:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Pré-visualizar"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Enviar áudio"
#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Rediscar"
+msgid "Send Video"
+msgstr "Enviar _vídeo"
#: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Apresentação remota:"
+msgid "Show dialpad"
+msgstr "Mostrar teclado"
#: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar áudio"
+msgid "Start a video call"
+msgstr ""
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Alternar transmissão de áudio"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+msgid "Toggle video transmission"
+msgstr "Alternar transmissão de vídeo"
#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desligado"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
+msgid "Unknown"
+msgstr "Desconhecido"
#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo ligado"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "Chamada de vídeo"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Visualização de vídeo"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Chamar"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d não lida)"
msgstr[1] "%s (%d não lidas)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e %u outro)"
msgstr[1] "%s (e %u outros)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d não lido de outros)"
msgstr[1] "%s (%d não lido de outros)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d não lido de todos)"
msgstr[1] "%s (%d não lido de todos)"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Enviando %d mensagem"
+msgstr[1] "Enviando %d mensagens"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Digitando uma mensagem."
@@ -3283,10 +3618,6 @@ msgstr "_Limpar"
msgid "C_ontact"
msgstr "C_ontato"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Bate-papo"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Inserir _smiley"
@@ -3307,7 +3638,7 @@ msgstr "Mover aba para a _direita"
msgid "Notify for All Messages"
msgstr "Notificar todas as mensagens"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "_Sumário"
@@ -3319,15 +3650,11 @@ msgstr "_Conversa"
msgid "_Detach Tab"
msgstr "_Destacar aba"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Editar"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "Marcar sala de bate-papo como _favorita"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "Aj_uda"
@@ -3351,15 +3678,15 @@ msgstr "_Abas"
msgid "_Undo Close Tab"
msgstr "_Desfazer fechar aba"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Nome"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Sala"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Conectar automaticamente"
@@ -3367,90 +3694,95 @@ msgstr "Conectar automaticamente"
msgid "Manage Favorite Rooms"
msgstr "Gerenciar salas favoritas"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "Recebendo chamada de vídeo"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Recebendo chamada"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s está chamando você via vídeo, você quer responder?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s está chamando você, você quer responder?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Recebendo chamada de %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_Rejeitar"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "R_esponder"
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_Responder com vídeo"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "Recebendo chamada de vídeo de %s"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Convite de sala"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Convite para entrar em %s"
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s está convidando você para entrar em %s"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_Recusar"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "E_ntrar"
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s o convidou para entrar em %s"
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Você foi convidado para entrar em %s"
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Recebendo transferência de arquivo de %s"
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Senha requerida"
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s gostaria de ter permissão para ver quando vocês estiver online"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3461,106 +3793,102 @@ msgstr ""
# Esperando comentário do desenvolvedor explicando o que é a mensagem.
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
# Esperando comentário do desenvolvedor explicando o que é a mensagem.
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Desconhecido"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s de %s em %s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Recebendo \"%s\" de %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Enviando \"%s\" para %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Erro recebendo \"%s\" de %s"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Erro recebendo arquivo"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Erro enviando \"%s\" para %s"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Erro enviando arquivo"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" recebido de %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" enviado para %s"
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Transferência de arquivo concluída"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Aguardando a resposta do outro participante"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Verificando integridade de \"%s\""
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Fazendo hash de \"%s\""
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Arquivo"
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Restando"
@@ -3597,39 +3925,55 @@ msgstr "Protocolo"
msgid "Source"
msgstr "Origem"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "Forneça a senha"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Desconectar"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Nenhuma correspondência encontrada"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Editar conta"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Fechar"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Recarregar %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Recarregar os créditos da conta"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "Recarregar..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "Contato"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
msgstr "Lista de contatos"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
@@ -3638,86 +3982,90 @@ msgid "Contacts on a _Map"
msgstr "Contatos no _mapa"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "Créditos"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "Procurar na _lista de contatos"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Entrar em _favoritos"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Gerenciar favoritos"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "Tamanho no_rmal"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nova _chamada..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Tamanho normal com _avatares"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "P_referências"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Exibir p_rotocolos"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Ordenar por _nome"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Ordenar por _status"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "Cont_as"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "Contatos _bloqueados"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "Tamanho _compacto"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "_Depuração"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Transferências de arquivos"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "E_ntrar..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nova conversa..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "Contatos _desconectados"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "Informação _pessoal"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Sala"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "_Procurar por contatos…"
@@ -3731,7 +4079,7 @@ msgstr "Membros"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3744,16 +4092,16 @@ msgstr ""
"Senha requerida: %s\n"
"Membros: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Não"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Não é possível iniciar a listagem de salas"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "Não foi possível parar a listagem de salas"
@@ -3791,39 +4139,79 @@ msgstr "Lista de salas"
msgid "_Room:"
msgstr "Sa_la:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "Mensagem recebida"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "Mensagem enviada"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "Nova conversa"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "O contato está conectado"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "O contato está desconectado"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "Conta conectada"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "Conta desconectada"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "Idioma"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:719
+msgid "Juliet"
+msgstr "Julieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Romeo"
+msgstr "Romeu"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:732
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ó Romeu, Romeu, porque haverias de ser tu, Romeu?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:735
+msgid "Deny thy father and refuse thy name;"
+msgstr "Renega o teu pai e recusa o teu nome;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:738
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Ou se não queres, jura-me que me amas"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "And I'll no longer be a Capulet."
+msgstr "E deixarei de ser um Capuleto."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:744
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Devo continuar a ouvi-la, ou posso falar agora?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "Juliet has disconnected"
+msgstr "Julieta desconectou"
+
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "Preferências"
@@ -3831,67 +4219,75 @@ msgstr "Preferências"
msgid "Appearance"
msgstr "Aparência"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Comportamento"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "T_ema do bate-papo:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Desabilitar notificações quando ausente ou _ocupado"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Desabilitar sons quando _ausente ou ocupado"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Exibir eventos recebidos na área de notificação"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Habilitar notificações quando um contato conectar"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Habilitar notificações quando um contato desconectar"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Habilitar verificação ortográfica para os idiomas:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Geral"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Fontes de localização:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Registro de conversas"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notificações"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Reproduzir sons para eventos"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Privacidade"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -3901,23 +4297,23 @@ msgstr ""
"sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
"precisão de 1 casa decimal."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "Mostrar _smileys como imagens"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "_Mostrar lista de contatos nas salas"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Sons"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Verificação de ortografia"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -3925,44 +4321,48 @@ msgstr ""
"A lista de idiomas representa somente os idiomas para os quais você já "
"possui dicionários instalados."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "Conectar automati_camente ao iniciar "
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "Telefone _celular"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "Ha_bilitar balões de notificação"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "H_abilitar sons de notificação"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Rede (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_Abrir novos bate-papos em janelas separadas"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publicar a localização para os meus contatos"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Reduzir a precisão de localização"
@@ -3974,7 +4374,55 @@ msgstr "Status"
msgid "_Quit"
msgstr "Sai_r"
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Chamar o contato novamente"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Câmera desligada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Câmera ligada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desabilitar a câmera e parar o envio de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Habilitar a câmera e enviar vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Habilitar a câmera, mas não enviar vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Pré-visualizar"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Rediscar"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vídeo desligado"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Vídeo ligado"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Visualização de vídeo"
+
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Visualização do mapa de contatos"
@@ -4042,16 +4490,16 @@ msgstr ""
"O gerenciador de conexões selecionado não suporta a extensão de depuração "
"remota."
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "Convidar participante"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
msgstr "Escolha um contato para convidar para a conversa:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "Convidar"
@@ -4092,34 +4540,90 @@ msgstr "Depurador do Empathy"
msgid "- Empathy Chat Client"
msgstr "- Cliente de mensagens instantâneas Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "Responder"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Rejeitar"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Responder"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Responder com vídeo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Recusar"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Aceitar"
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Chamada perdida de %s"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Proporcionar"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s tentou te ligar enquanto você estava em outra chamada."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1005
+#, c-format
+msgid "Call with %d participants"
+msgstr "Chamada com %d participantes"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:1904
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:1905
+msgid "On hold"
+msgstr "Em espera"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Diferenciar _maiúsculas/minúsculas"
+
+#~ msgid "All"
+#~ msgstr "Todos"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Habilitado"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversas"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Conversas anteriores"
+
+#~ msgid "_For:"
+#~ msgstr "_Por:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Digite a mensagem personalizada"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Salvar _nova mensagem de status"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Salvar mensagens de status"
diff --git a/po/sv.po b/po/sv.po
index 126025053..969152b88 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-18 22:57+0200\n"
-"PO-Revision-Date: 2011-07-18 23:09+0100\n"
+"POT-Creation-Date: 2011-08-08 08:22+0200\n"
+"PO-Revision-Date: 2011-08-08 08:22+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -41,378 +41,386 @@ msgid "Always open a separate chat window for new chats."
msgstr "Öppna alltid ett separat fönster för nya chattar."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Samtalsvolym"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Samtalsvolym, som en procentandel."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid "Character to add after nickname when using nick completion (tab) in group chat."
msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Chattfönstertema"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "Temavariant för chattfönster"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "Kompakt kontaktlista"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "Anslutningshanterare ska användas"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "Sorteringskriteria för kontaktlista"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "Standardkatalog att välja en profilbild från"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Inaktivera popupnotifieringar under frånvaro"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Inaktivera ljud under frånvaro"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Visa inkommande händelser i statusytan"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Display incoming events in the status area. If false, present them to the user immediately."
msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy kan publicera användarens plats"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy kan använda GPS:en för att gissa platsen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy kan använda nätverket för att gissa platsen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Standardhämtningsmapp för Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy har migrerat butterfly-loggar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy ska ansluta automatiskt vid uppstart"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy bör minska precisionen för platsen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "Aktivera utvecklingsverktyg för WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Aktivera popupnotifieringar för nya meddelanden"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "Aktivera stavningskontroll"
# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
# inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Dölj huvudfönstret"
# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
# inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "Dölj huvudfönstret."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "Tecken för smeknamnskomplettering"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Öppna nya chattar i separata fönster"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Sökväg för Adium-temat att använda"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "Spela upp ljud för inkommande meddelanden"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "Spela upp ett ljud för nya samtal"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "Spela upp ljud för utgående meddelanden"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "Spela upp ljud när en kontakt loggar in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "Spela upp ett ljud när en kontakt loggar ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "Spela upp ljud när vi loggar in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "Spela upp ljud när vi loggar ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Visa popupnotifieringar när en kontakt loggar in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Visa popupnotifieringar när en kontakt loggar ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
msgstr "Visa saldo i kontaktlista"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "Visa profilbilder"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "Visa kontaktlista i rum"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "Visa tips om att stänga huvudfönstret"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "Visa frånkopplade kontakter"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Visa protokoll"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "Rättstavningsspråk"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "Standardmappen att spara filöverföringar i."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "Den senaste katalogen som en profilbild valdes från."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "Positionen för chattfönstrets sidopanel"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Det tema som används för att visa samtal i chattfönster."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The theme variant that is used to display the conversation in chat windows."
msgstr "Den temavariant som används för att visa samtalet i chattfönster."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Använd grafiska smilisar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Använd notifieringsljud"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Använd tema för chattrum"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Huruvida Empathy har migrerat butterfly-loggar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to check words typed against the languages you want to check with."
msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Huruvida kontaktlistan ska visas i chattrum."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "Huruvida temat för chattrum ska användas."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
@@ -701,66 +709,67 @@ msgstr "i framtiden"
msgid "All accounts"
msgstr "Alla konton"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:694
msgid "Password"
msgstr "Lösenord"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1166
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Kontot %s är redigerbart via Mina webbkonton."
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1172
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Kontot %s kan inte redigeras i Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Launch My Web Accounts"
msgstr "Starta Mina webbkonton"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1532
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Användarnamn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "A_pply"
msgstr "V_erkställ"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1880
msgid "L_og in"
msgstr "L_ogga in"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1954
msgid "This account already exists on the server"
msgstr "Detta konto finns redan på servern"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1957
msgid "Create a new account on the server"
msgstr "Skapa ett nytt konto på servern"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2149
msgid "Ca_ncel"
msgstr "Av_bryt"
@@ -769,19 +778,19 @@ msgstr "Av_bryt"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2427
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s på %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2453
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2457
msgid "New account"
msgstr "Nytt konto"
@@ -793,6 +802,7 @@ msgstr "<b>Exempel:</b> MittSkärmnamn"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -935,43 +945,47 @@ msgstr "Options"
msgid "None"
msgstr "Ingen"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Teckenuppsättning:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Nätverk"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Nätverk:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Smeknamn:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Lösenord:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Avslutningsmeddelande:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Verkligt namn:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Servrar"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Vad är ditt IRC-smeknamn?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Vilket IRC-nätverk?"
@@ -1241,179 +1255,179 @@ msgstr "Den valda kontakten är inte giltig"
msgid "Emergency calls are not supported on this protocol"
msgstr "Nödsamtal stöds inte med detta protokollet"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Misslyckades med att öppna privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Ämne stöds inte för detta samtal"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Du tillåts inte att ändra ämnet"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "\"%s\" är inte ett giltigt kontakt-id"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
msgstr "/part [<chattrummets ID>] [<anledning>]: lämna chattrummet, det aktuella som standard"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <kontakt-id>: visa information om en kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Användning: %s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Okänt kommando"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Okänt kommando; se /help för tillgängliga kommandon"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "otillräckliga medel på kontot för att skicka meddelande"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "inte kapabel"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "frånkopplad"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "ogiltig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "åtkomst nekad"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "för långt meddelande"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "inte implementerat"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "okänt"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fel vid sändning av meddelandet \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Fel vid sändning av meddelande: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1508
#: ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Ämne:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Ämnet inställt till: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Inget ämne definierat"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Inga förslag)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Lägg till \"%s\" till ordbok"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Lägg till \"%s\" till %s-ordboken"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Infoga smilis"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
msgid "_Send"
msgstr "_Skicka"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "Sta_vningsförslag"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Misslyckades med att hämta senaste loggar"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s har kopplat från"
@@ -1421,12 +1435,12 @@ msgstr "%s har kopplat från"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s sparkades ut av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s sparkades ut"
@@ -1434,17 +1448,17 @@ msgstr "%s sparkades ut"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s blev bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s blev bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s har lämnat rummet"
@@ -1454,71 +1468,70 @@ msgstr "%s har lämnat rummet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s har gått in i rummet"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s är nu känd som %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
#: ../src/empathy-event-manager.c:1241
-#: ../src/empathy-call-window.c:1858
+#: ../src/empathy-call-window.c:1704
msgid "Disconnected"
msgstr "Frånkopplad"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Vill du lagra detta lösenord?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Kom ihåg"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Inte nu"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Försök igen"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Felaktigt lösenord. Försök igen:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Detta rum är skyddat med ett lösenord:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Gå in"
-#: ../libempathy-gtk/empathy-chat.c:3755
+#: ../libempathy-gtk/empathy-chat.c:3797
#: ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2105
msgid "Connected"
msgstr "Ansluten"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "Samtal"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1933,7 +1946,7 @@ msgstr "Höjd:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Plats"
@@ -2259,6 +2272,7 @@ msgid "Text chats"
msgstr "Textchattar"
#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "Samtal"
@@ -2297,7 +2311,8 @@ msgstr "<span size=\"x-large\">Läser in...</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "Ring"
@@ -2315,12 +2330,13 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "Video"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
#: ../src/empathy-chat-window.ui.h:12
#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
@@ -2588,20 +2604,20 @@ msgstr "Certifikatinformation"
msgid "Unable to open URI"
msgstr "Kunde inte öppna uri"
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
msgid "Select a file"
msgstr "Välj en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
msgid "Insufficient free space to save file"
msgstr "Otillräckligt med ledigt utrymme för att spara filen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
#, c-format
msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
msgstr "%s ledigt utrymme krävs för att spara denna fil men endast %s finns tillgängligt. Välj en annan plats."
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
#, c-format
msgid "Incoming file from %s"
msgstr "Inkommande fil från %s"
@@ -2790,23 +2806,23 @@ msgstr "Inget felmeddelande"
msgid "Instant Message (Empathy)"
msgstr "Snabbmeddelanden (Empathy)"
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
msgid "Don't connect on startup"
msgstr "Anslut inte vid uppstart"
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart"
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
msgid "- Empathy IM Client"
msgstr "- Empathy snabbmeddelandeklient"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
msgid "Error contacting the Account Manager"
msgstr "Fel vid anslutning till kontohanteraren"
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2986,8 +3002,8 @@ msgid "Your new account has not been saved yet."
msgstr "Ditt nya konto har inte sparats än."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801
-#: ../src/empathy-call-window.c:880
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:653
msgid "Connecting…"
msgstr "Ansluter..."
@@ -3101,184 +3117,171 @@ msgstr "- Ljud/Videoklienten Empathy"
msgid "Empathy Audio/Video Client"
msgstr "Ljud/Videoklienten Empathy"
-#: ../src/empathy-streamed-media-window.c:478
-#: ../src/empathy-call-window.c:458
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-streamed-media-window.c:481
-#: ../src/empathy-call-window.c:461
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Ljusstyrka"
-#: ../src/empathy-streamed-media-window.c:484
-#: ../src/empathy-call-window.c:464
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589
-#: ../src/empathy-call-window.c:569
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Volym"
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "_Sidopanel"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Ljudingång"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Videoingång"
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Knappsats"
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1250
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1043
#, c-format
msgid "Call with %s"
msgstr "Ring med %s"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1447
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1287
msgid "The IP address as seen by the machine"
msgstr "IP-adressen som den ses av datorn"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1449
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1289
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adressen som den ses av en server på Internet"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1451
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1291
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adressen för klienten som den ses av andra sidan"
-#: ../src/empathy-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1453
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1293
msgid "The IP address of a relay server"
msgstr "IP-adressen för en reläserver"
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1295
msgid "The IP address of the multicast group"
msgstr "IP-adressen för multicast-gruppen"
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Okänt"
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Okänt"
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Okänt"
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Okänt"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Ansluten — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2167
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2023
msgid "Technical Details"
msgstr "Tekniska detaljer"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2205
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2061
#, c-format
msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2210
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2066
#, c-format
msgid "%s's software does not understand any of the video formats supported by your computer"
msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2072
#, 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 "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2222
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2078
msgid "There was a failure on the network"
msgstr "Det inträffade ett fel på nätverket"
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2226
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2082
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
-#: ../src/empathy-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2229
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2085
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2241
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2097
#, 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 "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2106
msgid "There was a failure in the call engine"
msgstr "Det uppstod ett fel i samtalsmotorn"
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2253
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2109
msgid "The end of the stream was reached"
msgstr "Slutet på strömmen nåddes"
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2293
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2149
msgid "Can't establish audio stream"
msgstr "Kan inte etablera ljudström"
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2303
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2159
msgid "Can't establish video stream"
msgstr "Kan inte etablera videoström"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Ljud"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring upp kontakten igen"
-
#: ../src/empathy-call-window.ui.h:3
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
@@ -3321,56 +3324,82 @@ msgid "Minimise me"
msgstr "Minimera mig"
#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring igen"
-
-#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Fjärrkandidat:"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Skicka ljud"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
msgid "Send Video"
msgstr "Skicka video"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
msgid "Show dialpad"
msgstr "Visa knappsats"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Starta ett videosamtal"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Starta ett röstsamtal"
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Växla ljudöverföring"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
msgid "Toggle video transmission"
msgstr "Växla videoöverföring"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1813
-#: ../src/empathy-call-window.c:1814
-#: ../src/empathy-call-window.c:1815
-#: ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:1659
+#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1661
+#: ../src/empathy-call-window.c:1662
msgid "Unknown"
msgstr "Okänt"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video call"
+msgstr "Videosamtal"
+
+#: ../src/empathy-call-window.ui.h:23
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Ring"
-#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-main-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Visa"
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "I_nnehåll"
+
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "_Felsökning"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../src/empathy-call-window.ui.h:28
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "_Settings"
+msgstr "_Inställningar"
#: ../src/empathy-chat-window.c:480
#: ../src/empathy-chat-window.c:500
@@ -3444,11 +3473,6 @@ msgstr "Flytta flik till _höger"
msgid "Notify for All Messages"
msgstr "Notifiera för alla meddelanden"
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "I_nnehåll"
-
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "_Samtal"
@@ -3461,11 +3485,6 @@ msgstr "_Koppla loss flik"
msgid "_Favorite Chat Room"
msgstr "_Favoritchattrum"
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Hjälp"
-
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "_Nästa flik"
@@ -3779,11 +3798,11 @@ msgstr "Fyll på..."
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
msgid "Contact List"
msgstr "Kontaktlista"
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
msgid "Show and edit accounts"
msgstr "Visa och redigera konton"
@@ -3850,10 +3869,6 @@ msgstr "_Blockerade kontakter"
msgid "_Compact Size"
msgstr "_Kompakt storlek"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Felsökning"
-
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Fi_löverföringar"
@@ -3883,6 +3898,11 @@ msgstr "_Rum"
msgid "_Search for Contacts…"
msgstr "_Sök efter kontakter..."
+#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "_View"
+msgstr "_Visa"
+
#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
msgstr "Chattrum"
@@ -3943,79 +3963,79 @@ msgstr "Rumslista"
msgid "_Room:"
msgstr "_Rum:"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:171
msgid "Message received"
msgstr "Meddelande togs emot"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:172
msgid "Message sent"
msgstr "Meddelandet skickat"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:173
msgid "New conversation"
msgstr "Nytt samtal"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:174
msgid "Contact goes online"
msgstr "Kontakt ansluter"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:175
msgid "Contact goes offline"
msgstr "Kontakt kopplar från"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:176
msgid "Account connected"
msgstr "Kontot anslutet"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:177
msgid "Account disconnected"
msgstr "Kontot frånkopplat"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:480
msgid "Language"
msgstr "Språk"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:730
msgid "Juliet"
msgstr "Julia"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:737
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:743
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "Romeo, min Romeo, var är du Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:746
msgid "Deny thy father and refuse thy name;"
msgstr "Förneka din fader och vägra ditt namn;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:749
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Eller om du icke, men var svurit min kärlek"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:752
msgid "And I'll no longer be a Capulet."
msgstr "Och jag kommer inte längre att vara en Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:755
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Skall jag höra mer, eller ska jag tala?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:758
msgid "Juliet has disconnected"
msgstr "Julia har kopplat från"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1164
msgid "Preferences"
msgstr "Inställningar"
@@ -4023,132 +4043,140 @@ msgstr "Inställningar"
msgid "Appearance"
msgstr "Utseende"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Beteende"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "Chatt_ema:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Inaktivera notifieringar under fr_ånvaro eller upptagen"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Inaktivera ljud under fr_ånvaro eller upptagen"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Visa inkommande händelser i notifieringsytan"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Aktivera notifieringar när en kontakt ansluter"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Aktivera notifieringar när en kontakt kopplar från"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Aktivera rättstavning för språk:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Allmänt"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Ingångsnivå"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Ingångsvolym"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Platskällor:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Logga samtal"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notifieringar"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Spela upp ljud för händelser"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Integritet"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "Visa _smilisar som bilder"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "Visa kontakt_lista i rum"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Ljud"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Stavningskontroll"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid "The list of languages reflects only the languages for which you have a dictionary installed."
msgstr "Listan visar endast språk som du har en ordlista installerad för."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Teman"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "Variant:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "Anslut _automatiskt vid uppstart"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_Mobiltelefon"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Aktivera bubbelnotifieringar"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Aktivera ljudnotifieringar"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Nätverk (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_Öppna nya chattar i separata fönster"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publicera platsen till mina kontakter"
#. 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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Minska precision för plats"
@@ -4160,6 +4188,10 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Avsluta"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Ring upp kontakten igen"
+
#: ../src/empathy-streamed-media-window.ui.h:3
msgid "Camera Off"
msgstr "Kamera av"
@@ -4184,6 +4216,10 @@ msgstr "Aktivera kameran med överför ingen video"
msgid "Preview"
msgstr "Förhandsvisning"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Ring igen"
+
#: ../src/empathy-streamed-media-window.ui.h:19
msgid "V_ideo"
msgstr "V_ideo"
@@ -4204,77 +4240,77 @@ msgstr "Videoförhandsvisning"
msgid "Contact Map View"
msgstr "Kartvy för kontakter"
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
msgid "Save"
msgstr "Spara"
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
msgid "Debug Window"
msgstr "Felsökningsfönster"
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
msgid "Pause"
msgstr "Gör paus"
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
msgid "Level "
msgstr "Nivå "
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
msgid "Debug"
msgstr "Felsökning"
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1520
-#: ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1610
msgid "Message"
msgstr "Meddelande"
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
msgid "Warning"
msgstr "Varning"
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
msgid "Critical"
msgstr "Kritiskt"
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
msgid "Error"
msgstr "Fel"
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
msgid "Time"
msgstr "Tid"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
msgid "Domain"
msgstr "Domän"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
msgid "Level"
msgstr "Nivå"
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
msgid "The selected connection manager does not support the remote debugging extension."
msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "Bjud in deltagare"
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
msgid "Choose a contact to invite into the conversation:"
msgstr "Välj en kontakt att bjuda in till samtalet:"
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
msgid "Invite"
msgstr "Bjud in"
@@ -4302,7 +4338,15 @@ msgstr "- Empathy-konton"
msgid "Empathy Accounts"
msgstr "Empathy-konton"
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Visa en specifik tjänst"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy-felsökare"
+
+#: ../src/empathy-debugger.c:114
msgid "Empathy Debugger"
msgstr "Empathy-felsökare"
@@ -4348,26 +4392,34 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:787
-#: ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:560
+#: ../src/empathy-call-window.c:574
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:1257
+#: ../src/empathy-call-window.c:1050
#, c-format
msgid "Call with %d participants"
msgstr "Samtal med %d deltagare"
+#: ../src/empathy-call-window.c:1952
+msgid "On hold"
+msgstr "Väntar"
+
+#: ../src/empathy-call-window.c:1955
+msgid "Mute"
+msgstr "Tyst"
+
+#: ../src/empathy-call-window.c:1957
+msgid "Duration"
+msgstr "Längd"
+
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2104
+#: ../src/empathy-call-window.c:1960
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2105
-msgid "On hold"
-msgstr "Väntar"
-
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "_Matcha skiftläge"
@@ -4573,9 +4625,6 @@ msgstr "_Matcha skiftläge"
#~ msgid "The contact's avatar token. Empty means contact has no avatar."
#~ msgstr "Kontaktens avatarsymbol. Tom betyder att kontakten saknar avatar."
-#~ msgid "Megaphone"
-#~ msgstr "Megaphone"
-
#~ msgid "Talk!"
#~ msgstr "Prata!"
@@ -4673,9 +4722,6 @@ msgstr "_Matcha skiftläge"
#~ msgid "Import Accounts..."
#~ msgstr "Importera konton..."
-#~ msgid "Settings"
-#~ msgstr "Inställningar"
-
#~ msgid "Type:"
#~ msgstr "Typ:"
@@ -5009,9 +5055,6 @@ msgstr "_Matcha skiftläge"
#~ msgid "Start a voice or video conversation with this contact"
#~ msgstr "Starta röst- eller videosamtal med denna kontakt"
-#~ msgid "Start Call"
-#~ msgstr "Påbörja samtal"
-
#~ msgid "gtk-cut"
#~ msgstr "Klipp ut"
@@ -5039,12 +5082,6 @@ msgstr "_Matcha skiftläge"
#~ msgid "Yahoo! account settings"
#~ msgstr "Inställningar för Yahoo!-konto"
-#~ msgid "Input"
-#~ msgstr "Ingång"
-
-#~ msgid "Mute"
-#~ msgstr "Tyst"
-
# Det måste finnas ett bättre ord
#~ msgid "Output"
#~ msgstr "Utgång"
diff --git a/po/uk.po b/po/uk.po
index 9f8d29e11..4971c7968 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-09 23:16+0300\n"
-"PO-Revision-Date: 2011-05-09 23:45+0300\n"
+"POT-Creation-Date: 2011-07-29 16:12+0300\n"
+"PO-Revision-Date: 2011-07-29 19:45+0300\n"
"Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
"Language-Team: translation@linux.org.ua\n"
"Language: uk\n"
@@ -42,53 +42,65 @@ msgid "Always open a separate chat window for new chats."
msgstr "Завжди відкривати нову бесіду у новому вікні."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Гучність виклику"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Гучність виклику, у відсотках."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
"Символ для додавання після псевдоніму, якщо у бесіді використовується "
-"автодоповнення псевдонімів клавішею Tab."
+"автоматичне доповнення псевдонімів клавішею Tab."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Тема вікна бесіди"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Chat window theme variant"
+msgstr "Варіант теми вікна бесіди"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Список мов, що використовуються при перевірці орфографії, розділених комами "
-"(наприклад «en, ru, uk»)."
+"Список мов, що використовуються при перевірянні орфографії, розділених комами "
+"(наприклад, «en, ru, uk»)."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
-msgstr "Список контактів компактно"
+msgstr "Щільний список контактів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "Не слід використовувати менеджери з'єднань"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
-msgstr "Критерій сортування списку контактів"
+msgstr "Критерій упорядкування списку контактів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "Каталог, що використовується для вибору зображень аватарів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Вимкнути контекстні сповіщення у стані «відійшов»"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Вимкнути звуки у стані «відійшов»"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Показувати вхідні події в ділянці стану"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -96,335 +108,340 @@ msgstr ""
"Показувати вхідні події в ділянці стану. Якщо ні, то представити їх "
"користувачу негайно."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy може публікувати місцевість користувачів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy може використовувати GPS для визначення місцевості."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr ""
"Empathy може використовувати стільникову мережу для визначення місцевості"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy може використовувати мережу для припущень щодо місцевості"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
-msgstr "Типова тека для завантаження файлів"
+msgstr "Типова тека для звантаження файлів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy переніс журнал повідомлень MSN"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy слід автоматично переходити в режим очікування"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "З'єднуватися під час запуску"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy має послабити точність визначення місцевості"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
-"Empathy має використовувати аватар співрозмовника, як значок вікна із бесідою"
+"Empathy має використовувати аватар контакту, як піктограму вікна із бесідою"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
-msgstr "Увімкнути інструменти розробки WebKit"
+msgstr "Увімкнути засіб розроблення WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Ввімкнути контекстні сповіщення для нових повідомлень"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
-msgstr "Увімкнути перевірку орфографії"
+msgstr "Увімкнути перевіряння орфографії"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Сховати головне вікно"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "Сховати головне вікно."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
-msgstr "Символ автодоповнення псевдоніму"
+msgstr "Символ автоматичне доповнення псевдоніму"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Відкривати нові бесіди у новому вікні"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Шлях до теми Adium"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Шлях до теми Adium для використання у чаті Adium."
+msgstr "Шлях до теми Adium для використання у балачці Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "Відтворити звук при отриманні повідомлення"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
-msgstr "Відтворити звук для нової бесіди"
+msgstr "Відтворити звук для нової розмови"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "Відтворити звук при відправленні повідомлення"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
-msgstr "Відтворити звук при появі співрозмовнику в мережі"
+msgstr "Відтворити звук при появі контакту в мережі"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
-msgstr "Відтворити звук при відключенні співрозмовника"
+msgstr "Відтворити звук при від'єднанні контакту"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
-msgstr "Відтворити звук вході"
+msgstr "Відтворити звук при вході"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "Відтворити звук при виході"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
-msgstr "Контекстні сповіщення, коли чат не в фокусі"
+msgstr "Контекстні сповіщення, коли балачка не в фокусі"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Контекстні сповіщення, коли контакт увійде"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Контекстні сповіщення, коли контакт вийде"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
-msgstr "Показувати баланс у списку контактів"
+msgstr "Показувати залишок у списку контактів"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "Показувати аватари"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
-msgstr "Показати список співрозмовників у кімнаті"
+msgstr "Показати список контактів у кімнаті"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "Показувати підтвердження про закриття головного вікна"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
-msgstr "Показувати відсутніх співрозмовників"
+msgstr "Показувати відсутні контакти"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Показати протокол:"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
-msgstr "Перевірка правопису для мов"
+msgstr "Перевіряння правопису для мов"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "Типова тека для збереження вхідних файлів."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
-msgstr "Останній каталог, з якого обирались зображення аватарів."
+msgstr "Останній каталог, з якого брались зображення аватарів."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
-msgstr "Позиція бокової панелі вікна розмови"
+msgstr "Позиція бокової панелі вікна балачки"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Збережена позиція (в пікселях) бокової панелі вікна балачки."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Ця тема використовується для діалогу у вікні бесіди."
+msgstr "Ця тема використовується для вікна бесіди."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варіант теми, який використовується для показу розмов у вікні балачки."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Використовувати графічні емоційки"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Використовувати звуки"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Використовувати тему для бесід"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Чи показувати місцевості вашим співрозмовникам."
+msgstr "Чи показувати місцевості вашим контактам."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Чи використовувати GPS для визначення місцевості."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Чи використовувати мобільну мережу для визначення місцевості."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Чи використовувати комп'ютерну мережу для визначення місцевості."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Чи був перенос журналу MSN."
+msgstr "Чи було переміщення журналу MSN."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Автоматично підключати облікові записи при запуску."
+msgstr "Автоматично з'єднувати облікові записи при запуску."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Чи слід іти в режим очікування, коли користувач бездіяльний."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Чи слід зменшити точність визначення місцевості задля конфіденційності."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Чи використовувати аватари співрозмовників як значки вікон із бесідами"
+msgstr "Чи використовувати аватари контактів як піктограми вікон із бесідами"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Чи вмикати інструменти розробки WebKit, такі як Web Inspector."
+msgstr "Чи вмикати такі засоби розроблення WebKit, як Web Inspector."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-"Чи використовувати менеджер з'єднань для автоматичного встановлення/розриву "
+"Чи використовувати менеджер з'єднань для автоматичного встановлення/розривання "
"зв'язку."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
-msgstr "Перевіряти набрані слова за списком мов для перевірки орфографії."
+msgstr "Перевіряти набрані слова за списком мов для перевіряння орфографії."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Перетворювати текстові емоційки на графічне представлення."
+msgstr "Перетворювати текстові емоційки у графічні."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Чи відтворювати звуковий сигнал при вході співрозмовника у мережу."
+msgstr "Чи відтворювати звуковий сигнал при вході контакту в мережу."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Чи відтворювати звуковий сигнал при виході співрозмовника з мережі."
+msgstr "Чи відтворювати звуковий сигнал при виході контакту з мережі."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "Чи відтворювати звукові сигнали при подіях."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "Чи відтворювати звуковий сигнал для нової бесіди."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Чи відтворювати звуковий сигнал при відправленні повідомлення."
+msgstr "Чи відтворювати звуковий сигнал при надсиланні повідомлення."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "Чи відтворювати звуковий сигнал при вході у мережу."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "Чи відтворювати звуковий сигнал при виході з мережі."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Чи відтворювати звукові сигнали у станах «відійшов» або «зайнятий»."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Чи показувати контекстні сповіщення при надходженні нового повідомлення."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
-msgstr "Чи показувати баланси облікових записів у списку контактів."
+msgstr "Чи показувати залишок облікових записів у списку контактів."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Чи показувати аватари для співрозмовників у списку та вікні чату."
+msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Чи показувати недоступних у мережі користувачів у списку контактів."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Чи показувати аватари для співрозмовників у списку та вікні чату."
+msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Чи показувати список контактів у кімнаті."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
-msgstr "Показувати список контактів стисненим або ні."
+msgstr "Чи показувати список контактів стисненим."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -432,19 +449,19 @@ msgstr ""
"Чи показувати повідомлення про закриття головного вікна кнопкою «x» у "
"заголовку."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
-msgstr "Використовувати теми для вікон бесід чи ні."
+msgstr "Чи використовувати теми для вікон бесід."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
"the contact list by state."
msgstr ""
-"Критерій для впорядковування списку співрозмовників. Типово впорядковується "
-"за іменем співрозмовника — «name». При значенні «state» список буде "
-"впорядковано на статусом."
+"Критерій для впорядковування списку контактів. Типово впорядковується "
+"за псевдонімом контакту — «name». При значенні «state» список буде "
+"впорядковано за станом."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -452,29 +469,45 @@ msgstr "Керування обліковими записами повідом
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
-msgstr "Облікові записи повідомлень та VoIP"
+msgstr "Листування й облікові записи VoIP"
#: ../libempathy/empathy-ft-handler.c:825
msgid "File transfer completed, but the file was corrupted"
-msgstr "Передачу файла завершено, але файл пошкоджено"
+msgstr "Передавання файла завершено, але файл пошкоджено"
#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
-msgstr "Передача файлів не працює для віддалених співрозмовників"
+msgstr "Передача файлів не працює для віддалених контактів"
#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
-msgstr "Обраний файл не є звичайним файлом"
+msgstr "Вибраний файл не є звичайним файлом"
#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
-msgstr "Обраний файл пустий"
+msgstr "Вибраний файл порожній"
+
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Пропущений виклик від %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Викликано %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Виклик від %s"
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
-msgstr "Такий тип сокету не підтримується"
+msgstr "Такий тип гнізда не підтримується"
#: ../libempathy/empathy-tp-file.c:387
msgid "No reason was specified"
@@ -482,15 +515,15 @@ msgstr "Причину не вказано"
#: ../libempathy/empathy-tp-file.c:390
msgid "The change in state was requested"
-msgstr "Запрошено заміну стану"
+msgstr "Запит на заміну стану"
#: ../libempathy/empathy-tp-file.c:393
msgid "You canceled the file transfer"
-msgstr "Ви скасували передачу файлу "
+msgstr "Ви скасували передачу файла "
#: ../libempathy/empathy-tp-file.c:396
msgid "The other participant canceled the file transfer"
-msgstr "Інший учасник передачі файлу її скасував"
+msgstr "Інший учасник скасував передавання файла"
#: ../libempathy/empathy-tp-file.c:399
msgid "Error while trying to transfer the file"
@@ -500,141 +533,142 @@ msgstr "Помилка при спробі передати файл"
msgid "The other participant is unable to transfer the file"
msgstr "Інший учасник не може передати файл"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Невідома причина"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Доступний"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Зайнятий"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Відійшов"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Невидимий"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
-msgstr "Не у мережі"
+msgstr "Поза мережею"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:317
+#: ../libempathy/empathy-utils.c:224
msgctxt "presence"
msgid "Unknown"
msgstr "Невідомо"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Причину не вказано"
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
-msgstr "Встановлено статус «не у мережі»"
+msgstr "Встановлено стан «поза мережею»"
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "Помилка мережі"
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
-msgstr "Аутентифікація завершилась невдало"
+msgstr "Не вдалось аутентифікувати"
-#: ../libempathy/empathy-utils.c:364 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Помилка шифрування"
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
-msgstr "Ім'я вже використовується"
+msgstr "Псевдонім уже використовується"
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Сертифікат недоступний"
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
-msgstr "Сертифікат не має довіри"
+msgstr "Сертифікат ненадійний"
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "Сертифіката застарів"
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Сертифікат не активовано"
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Сертифікат з помилкою у назві вузла"
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Відбитки сертифікатів не збігаються"
-#: ../libempathy/empathy-utils.c:380 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Самопідписаний сертифікат"
-#: ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
-msgstr "Помилка сертифікату"
+msgstr "Помилка сертифіката"
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "Шифрування не доступне"
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "Сертифікат недійсний"
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "У з'єднанні відмовлено"
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
-msgstr "З'єднання не можливо встановити"
+msgstr "З'єднання неможливо встановити"
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "З'єднання втрачено"
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "Цей ресурс уже з'єднано з сервером"
-#: ../libempathy/empathy-utils.c:428
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "З'єднання замінено на нове з'єднання через той самий ресурс"
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "Цей обліковий запис уже існує на сервері"
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "Сервер зараз зайнятий, щоб обробити з'єднання"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "Сертифікат анульовано"
-#: ../libempathy/empathy-utils.c:437
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Сертифікат використовує небезпечний алгоритм шифрування або криптографічно "
"ненадійний."
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:348
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -642,24 +676,24 @@ msgstr ""
"Довжина сертифіката сервера або глибина ланцюжка сертифіката сервера "
"перевищує обмеження криптографічної бібліотеки"
-#: ../libempathy/empathy-utils.c:603
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Люди поблизу"
-#: ../libempathy/empathy-utils.c:608
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! Японія"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:638
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
-msgstr "Час Facebook"
+msgstr "Балачка Facebook"
-#: ../libempathy/empathy-time.c:100
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
@@ -667,7 +701,7 @@ msgstr[0] "%d секунду тому"
msgstr[1] "%d секунди тому"
msgstr[2] "%d секунд тому"
-#: ../libempathy/empathy-time.c:105
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
@@ -675,7 +709,7 @@ msgstr[0] "%d хвилину тому"
msgstr[1] "%d хвилини тому"
msgstr[2] "%d хвилин тому"
-#: ../libempathy/empathy-time.c:110
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
@@ -683,7 +717,7 @@ msgstr[0] "%d годину тому"
msgstr[1] "%d години тому"
msgstr[2] "%d годин тому"
-#: ../libempathy/empathy-time.c:115
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -691,7 +725,7 @@ msgstr[0] "%d день тому"
msgstr[1] "%d дні тому"
msgstr[2] "%d днів тому"
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
@@ -699,7 +733,7 @@ msgstr[0] "%d тиждень тому"
msgstr[1] "%d тижня тому"
msgstr[2] "%d тижнів тому"
-#: ../libempathy/empathy-time.c:125
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
@@ -707,75 +741,75 @@ msgstr[0] "%d місяць тому"
msgstr[1] "%d місяця тому"
msgstr[2] "%d місяців тому"
-#: ../libempathy/empathy-time.c:130
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "в майбутньому"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Усі"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Усі облікові записи"
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Обліковий запис"
-#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "Пароль"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Сервер"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Порт"
-#: ../libempathy-gtk/empathy-account-widget.c:753
-#: ../libempathy-gtk/empathy-account-widget.c:810
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1151
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Обліковий запис %s — змінено через сайт."
-#: ../libempathy-gtk/empathy-account-widget.c:1157
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Обліковий запис %s неможливо редагувати в Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1177
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "Запустити мій обліковий запис із сайту"
-#: ../libempathy-gtk/empathy-account-widget.c:1515
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
-msgstr "Користувача:"
+msgstr "Користувач:"
-#: ../libempathy-gtk/empathy-account-widget.c:1833
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "_Застосувати"
-#: ../libempathy-gtk/empathy-account-widget.c:1863
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "_Увійти"
-#: ../libempathy-gtk/empathy-account-widget.c:1937
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "Цей обліковий запис вже існує на сервері"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "Створити новий обліковий запис на сервері"
-#: ../libempathy-gtk/empathy-account-widget.c:2132
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "_Скасувати"
@@ -784,19 +818,19 @@ msgstr "_Скасувати"
#. * 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:2410
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s на %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2436
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "Обліковий запис %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2440
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "Новий обліковий запис"
@@ -808,6 +842,7 @@ msgstr "<b>Приклад:</b> MyScreenName"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -821,7 +856,7 @@ msgstr "Додатково"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "_Пароль:"
@@ -831,7 +866,7 @@ msgstr "_Пароль:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Запам'ятати пароль"
@@ -841,7 +876,7 @@ msgstr "Запам'ятати пароль"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -849,7 +884,7 @@ msgstr "Запам'ятати пароль"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "Screen _Name:"
-msgstr "_Ім'я(на екрані):"
+msgstr "_Екранний псевдонім:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM password?"
@@ -917,76 +952,84 @@ msgstr "Ідентифікатор користувача (UIN) у ICQ?"
msgid "What is your ICQ password?"
msgstr "Пароль у ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Автоматично"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Register"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Параметри"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Немає"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Кодування:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "Мережа"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Мережа:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Псевдонім:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Пароль:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Повідомлення при виході:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Справжнє ім'я:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Сервери"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Який ваш псевдонім у IRC?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Яка мережа IRC?"
@@ -1026,10 +1069,10 @@ msgid ""
"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.\n"
"Якщо ви facebook.com/<b>badger</b>, введіть <b>badger</b>.\n"
"Використовуйте <a href=\"http://www.facebook.com/username/\">цю сторінку</a> "
-"для вибору імені Facebook, якщо у вас його немає."
+"для вибору користувача Facebook, якщо у вас його немає."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Use old SS_L"
@@ -1041,7 +1084,7 @@ msgstr "Пароль у Facebook?"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Facebook username?"
-msgstr "Ім'я користувача у Facebook?"
+msgstr "Користувач у Facebook?"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google ID?"
@@ -1101,7 +1144,7 @@ msgstr "_Прізвище:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "_Ім'я (для співрозмовників):"
+msgstr "_Публічне прізвисько:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
@@ -1109,7 +1152,7 @@ msgstr "<b>Приклад:</b> user@my.sip.server"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
msgid "Authentication username:"
-msgstr "Ім'я для аутентифікації:"
+msgstr "Користувач для аутентифікації:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover Binding"
@@ -1120,60 +1163,65 @@ msgid "Discover the STUN server automatically"
msgstr "Відкрийте для себе сервер STUN автоматично"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ігнорувати помилки TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Інтервал (у секундах)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
-msgstr "Keep-Alive Опції"
+msgstr "Параметри утримування з'єднання"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
-msgstr "Вільна маршрутизація"
+msgstr "Вільне маршрутизування"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Механізм:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
-msgstr "Інші опції"
+msgstr "Інші параметри"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
-msgstr "Опції NAT Traversal"
+msgstr "Параметри NAT Traversal"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Порт:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
-msgstr "Опції проксі"
+msgstr "Параметри проксі"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Сервер STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Сервер:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Транспорт"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Пароль до облікового запису у SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "Ідентифікатор облікового запису у SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
-msgstr "_Ім'я користувача:"
+msgstr "_Користувач:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "I_gnore conference and chat room invitations"
@@ -1195,87 +1243,121 @@ msgstr "Yahoo! I_D:"
msgid "_Room List locale:"
msgstr "_Локаль списку бесід:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
-msgstr "Не можу конвертувати зображення"
+msgstr "Неможливо перетворити зображення"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "Ваша система не підтримує жодного відомого формату зображень"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Неможливо зберегти pixbuf у png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
-msgstr "Виберіть зображення Вашого аватару"
+msgstr "Виберіть зображення вашого аватару"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Зробити знімок…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "Немає зображення"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Зображення"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Усі файли"
#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
-msgstr "Клацніть для збільшення"
+msgstr "Натисніть для збільшення"
+
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "Помилка виклику"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "Вказаний контакт не підтримує виклики"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "Вказаний контакт поза мережею"
-#: ../libempathy-gtk/empathy-chat.c:668
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "Вказаний контакт недійсний"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Екстрені виклики не підтримуються цим протоколом"
+
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Не вдалось відкрити приватну кімнату"
-#: ../libempathy-gtk/empathy-chat.c:733
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Тема не підтримується у цій бесіді"
-#: ../libempathy-gtk/empathy-chat.c:739
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "У вас немає прав змінювати тему"
-#: ../libempathy-gtk/empathy-chat.c:948
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "«%s» — недійсний ідентифікатор контакту"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: очистити всі повідомлення з поточної бесіди"
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: встановити тему поточної бесіди"
-#: ../libempathy-gtk/empathy-chat.c:954
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: приєднатися до нової кімнати розмов"
-#: ../libempathy-gtk/empathy-chat.c:957
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: приєднатися до нової кімнати розмов"
-#: ../libempathy-gtk/empathy-chat.c:962
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr ""
"/part [<chat room ID>] [<reason>]: покинути кімнату бесіди, типово теперішню"
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: відкрити приватну бесіду"
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: відкрити приватну бесіду"
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: змінити назву на поточному сервері"
-#: ../libempathy-gtk/empathy-chat.c:976
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <message>: відправити повідомлення ACTION до поточної бесіди"
+msgstr "/me <message>: надіслати повідомлення ACTION до поточної бесіди"
-#: ../libempathy-gtk/empathy-chat.c:979
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1283,9 +1365,13 @@ msgid ""
msgstr ""
"/say <message>: надіслати <message> до поточної бесіди. це використовується "
"для надсилання нового повідомлення, що починається з '/'. Наприклад: \"/"
-"скажіть /join щоб приєднатись до нової кімнати розмов\""
+"скажіть /join для приєднання до нової кімнати розмов\""
-#: ../libempathy-gtk/empathy-chat.c:984
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: показує інформацію про контакт"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1293,113 +1379,113 @@ msgstr ""
"/help [<command>]: показати довідку. Якщо визначено <command>, показати "
"синтаксис команди."
-#: ../libempathy-gtk/empathy-chat.c:994
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Використання: %s"
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Невідома команда"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Невідома команда; для виводу списку доступних команд введіть /help"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1299
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
-msgstr "недостатня збалансованість для надсилання повідомлення"
+msgstr "недостатній залишок для надсилання повідомлення"
-#: ../libempathy-gtk/empathy-chat.c:1301
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "не здатен"
-#: ../libempathy-gtk/empathy-chat.c:1308
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
-msgstr "не у мережі"
+msgstr "поза мережею"
-#: ../libempathy-gtk/empathy-chat.c:1311
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "неправильний контакт"
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "відмовлено у доступі"
-#: ../libempathy-gtk/empathy-chat.c:1317
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "надто довге повідомлення"
-#: ../libempathy-gtk/empathy-chat.c:1320
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "не реалізовано"
-#: ../libempathy-gtk/empathy-chat.c:1324
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "невідомо"
-#: ../libempathy-gtk/empathy-chat.c:1330
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Помилка при надсиланні повідомлення «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1334
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "Помилка надсилання повідомлення: %s"
-#: ../libempathy-gtk/empathy-chat.c:1395 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Тема:"
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Тема: %s"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Тему не встановлено"
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Нема пропозицій)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1984
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Додати «%s» до словника"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Додати «%s» до словника %s"
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
-msgstr "Вставити посмішку"
+msgstr "Вставити емоційку"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2096
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Надіслати"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2131
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Пропозиції з правопису"
-#: ../libempathy-gtk/empathy-chat.c:2220
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
-msgstr "Не вдається отримати останні журнали"
+msgstr "Не вдалось одержати останні журнали"
-#: ../libempathy-gtk/empathy-chat.c:2331
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s від'єднано"
@@ -1407,30 +1493,30 @@ msgstr "%s від'єднано"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2338
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
-msgstr "%1$s був викинутий користувачем %2$s"
+msgstr "%1$s викинено користувачем %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2341
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
-msgstr "%s був викинутий"
+msgstr "%s викинено"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2349
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
-msgstr "%1$s був заблокований користувачем %2$s"
+msgstr "%1$s заблоковано користувачем %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2352
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s заблоковано"
-#: ../libempathy-gtk/empathy-chat.c:2356
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s покинув кімнату"
@@ -1440,94 +1526,94 @@ msgstr "%s покинув кімнату"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2365
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2390
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s приєднався до бесіди"
-#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s тепер відомий як %s"
-#: ../libempathy-gtk/empathy-chat.c:2554
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1116
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "Від'єднаний"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3202
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Зберегти цей пароль?"
-#: ../libempathy-gtk/empathy-chat.c:3208
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Запам'ятати"
-#: ../libempathy-gtk/empathy-chat.c:3218
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Не зараз"
-#: ../libempathy-gtk/empathy-chat.c:3262
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Повторити"
-#: ../libempathy-gtk/empathy-chat.c:3266
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Неправильний пароль; введіть пароль ще раз:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3383
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Цю кімнату захищено паролем:"
-#: ../libempathy-gtk/empathy-chat.c:3410
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Увійти"
-#: ../libempathy-gtk/empathy-chat.c:3602 ../src/empathy-event-manager.c:1137
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "З'єднаний"
-#: ../libempathy-gtk/empathy-chat.c:3657
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
-msgstr "Бесіда"
+msgstr "Розмова"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3662
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "Невідомий або помилковий ідентифікатор"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "Блокування контакту тимчасово недоступно "
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "Блокування контакту недоступне"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "Відмовлено у доступі"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "Неможливо заблокувати контакт"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "Редагувати заблоковані контакти"
@@ -1535,22 +1621,26 @@ msgstr "Редагувати заблоковані контакти"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Обліковий запис:"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Заблоковані контакти"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:996
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Копіювати адресу посилання"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1003
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Відкрити посилання"
@@ -1563,7 +1653,7 @@ msgstr "%A %B %d %Y"
#: ../libempathy-gtk/empathy-contact-dialogs.c:299
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
-msgstr "Редагувати інформацію про співрозмовника"
+msgstr "Редагувати інформацію про контакт"
#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
@@ -1575,29 +1665,29 @@ msgid "New Contact"
msgstr "Новий контакт"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "Заблокувати %s?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "Блокувати «%s» з контактів знову?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "За_блокувати"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
-msgstr[0] "_Звинуватити цей контакт у образі"
-msgstr[1] "_Звинуватити ці контакти у образі"
-msgstr[2] "_Звинуватити ці контакти у образі"
+msgstr[0] "_Звинуватити цей контакт в образі"
+msgstr[1] "_Звинуватити ці контакти в образі"
+msgstr[2] "_Звинуватити ці контакти в образі"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
@@ -1605,7 +1695,7 @@ msgstr "_Вирішити пізніше"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
msgid "Subscription Request"
-msgstr "Запис на підписку"
+msgstr "Запит на підписку"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
msgid "_Block User"
@@ -1619,105 +1709,104 @@ msgstr "Без групи"
msgid "Favorite People"
msgstr "Улюблені люди"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Вилучити групу «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2389
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
-msgstr "Видалення групи"
+msgstr "Вилучення групи"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2444
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "В_илучити"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2508
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Вилучити контакт «%s» з вашого списку?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2529
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
-msgstr "Видалення контакту"
+msgstr "Вилучення контакту"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
+#: ../libempathy-gtk/empathy-contact-menu.c:220
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Додати контакт…"
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "За_блокувати контакт"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:536
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
-msgstr "_Розмова"
+msgstr "_Балачка"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:625
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
-msgstr "_Голосовий виклик"
+msgstr "_Аудіовиклик"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:667
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
-msgstr "_Відео виклик"
+msgstr "_Відеовиклик"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:710
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
-msgstr "Переглянути _попередні бесіди"
+msgstr "_Попередні бесіди"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:751
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Надіслати файл"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:793
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Оприлюднити мою стільницю"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1751
-#: ../libempathy-gtk/empathy-individual-menu.c:828
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Улюблений"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:856
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Інфор_мація"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
-msgstr "_Правка"
+msgstr "З_міни"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:1037
-#: ../src/empathy-chat-window.c:986
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Запрошення до цієї кімнати"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1084
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "_Запросити до кімнати"
@@ -1740,180 +1829,203 @@ msgstr "Не знайдено жодного контакту"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
-msgstr "Обрати контакт"
+msgstr "Вибрати контакт"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Повне ім'я:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Номер телефону:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Адреса електронної пошти:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Сайт:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "День народження:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Востаннє помічений:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "На зв'язку вже:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Повідомлення за відсутності:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Канали:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
-msgstr "ISO код країни:"
+msgstr "Код ISO країни:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "Країна:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Регіон:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Місто:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Район:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
-msgstr "Індекс:"
+msgstr "Поштовий індекс:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Вулиця:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Дім:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Квартира:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Кімната:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Текст:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Опис:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "Адреса (URI):"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Рівень точності:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Помилка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Вертикальна помилка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Горизонтальна помилка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Швидкість:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Азимут:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Швидкість підйому:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Останнє оновлення о:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Довгота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Широта:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Висота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:861
-#: ../libempathy-gtk/empathy-contact-widget.c:876
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Місцевість"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:878
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:930
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y у %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1012
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Зберегти аватар"
-#: ../libempathy-gtk/empathy-contact-widget.c:1068
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Неможливо зберегти аватар"
@@ -1923,7 +2035,7 @@ msgstr "<b>Місцевість</b> у (дата)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Псевдонім:"
@@ -1938,19 +2050,19 @@ msgstr "Програма:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
-msgstr "Подробиці про співрозмовника"
+msgstr "Подробиці про контакт"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Ідентифікатор:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr "Інформацію запитано&…"
+msgstr "Запит на інформацію…"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
@@ -1960,40 +2072,40 @@ msgstr "ОС:"
msgid "Version:"
msgstr "Версія:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Група"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
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:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_Додати групу"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Вибрати"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1770
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Група"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "Такий ідентифікатор буде заблоковано:"
msgstr[1] "Такі ідентифікатори буде заборонено:"
msgstr[2] "Такі ідентифікатори буде заборонено:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "Такий ідентифікатор неможливо заборонити:"
@@ -2001,53 +2113,53 @@ msgstr[1] "Такі ідентифікатори неможливо заборо
msgstr[2] "Такі ідентифікатори неможливо заборонити:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "Пов'язані контакти"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "Вибрати контакт для посилання"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "Перегляд нового контакту"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:582
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:904
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Редагувати"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:930
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Сполучити контакт…"
-#: ../libempathy-gtk/empathy-individual-view.c:2351
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "Вилучити і за_блокувати"
-#: ../libempathy-gtk/empathy-individual-view.c:2517
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2056,7 +2168,7 @@ msgstr ""
"Вилучити сполучений контакт «%s»? Зауважте, це вилучить усі контакти, які "
"складають список цього сполученого контакту."
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2140,38 +2252,174 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Роз'єднати"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Дата"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Історія"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Показати"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Пошук"
+
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Балачка в %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Балачка з %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
-#. Tab Label
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Виклик прийнято в %s, закінчено о %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Сьогодні"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Вчора"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Будь-коли"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Будь-хто"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Хто"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Коли"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Будь-що"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
+msgstr "Текстова балачка"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Виклики"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Вхідні виклики"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Вихідні виклики"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Пропущені виклики"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "Що"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Вилучити всі журнали з попередньої розмови?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "Очистити все"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Вилучити з:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Завантаження…</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Бесіди"
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Виклик"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Знайти наступне"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Балачка"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Знайти попереднє"
+msgid "Delete All History..."
+msgstr "Вилучити всю історію…"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Переглянути попередні бесіди"
+msgid "Profile"
+msgstr "Профіль"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Відео"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Пошук"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "З_міни"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Файл"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Для:"
+msgid "page 2"
+msgstr "сторінка 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
@@ -2180,25 +2428,25 @@ msgstr "Ідентифікатор контакту:"
#. add chat button
#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
-msgstr "_Розмова"
+msgstr "_Балачка"
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
-msgstr "Нова бесіда"
+msgstr "Нова розмова"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Надіслати _відео"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "_Виклик"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Новий Виклик"
@@ -2217,34 +2465,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Інше повідомлення…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Редагувати інші повідомлення…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
-msgstr "Клацніть, щоб прибрати статут \"улюблений\""
+msgstr "Клацніть, щоб прибрати стан «улюблений»"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
-msgstr "Клацніть, щоб встановити статут \"улюблений\""
+msgstr "Клацніть, щоб встановити стан «улюблений»"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Встановити стан"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
-msgstr "Встановіть Вашу наявність та поточний стан"
+msgstr "Встановіть вашу присутність та поточний стан"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Власні повідомлення…"
@@ -2255,7 +2503,15 @@ msgstr "Власні повідомлення…"
#: ../libempathy-gtk/empathy-protocol-chooser.c:584
#, c-format
msgid "New %s account"
-msgstr "Новий обліковий рахунок %s"
+msgstr "Новий обліковий запис %s"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Знайти наступне"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Знайти попереднє"
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
@@ -2263,7 +2519,7 @@ msgstr "Знайти:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
-msgstr "Збігається регістр"
+msgstr "З урахуванням регістру"
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
@@ -2271,31 +2527,31 @@ msgstr "Фразу не знайдено"
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
-msgstr "Отримання миттєвих повідомлень"
+msgstr "Одержано миттєві повідомлення"
#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
-msgstr "Надсилання миттєвих повідомлень"
+msgstr "Надіслані миттєві повідомлення"
#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
-msgstr "Вхідне запрошення до чату "
+msgstr "Вхідне запрошення до балачки "
#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
-msgstr "Співрозмовник підключений "
+msgstr "Контакт під'єднано "
#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
-msgstr "Співрозмовник відключений"
+msgstr "Контакт від'єднано"
#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
-msgstr "Підключений до серверу"
+msgstr "Під'єднано до сервера"
#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
-msgstr "Відключений від сервера"
+msgstr "Від'єднано від сервера"
#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
@@ -2309,39 +2565,38 @@ msgstr "Вихідний голосовий виклик"
msgid "Voice call ended"
msgstr "Голосовий виклик закінчено"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Вставити типове повідомлення"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
-msgstr "Редагувати типові повідомлення..."
+msgstr "Редагувати власні повідомлення"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Зберегти _новий стан"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Вилучити"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Збережений стан"
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Повідомлення змінено в %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1462
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "Звичайна"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Класична"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Проста"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Ясна"
-#: ../libempathy-gtk/empathy-theme-manager.c:71
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Блакитна"
@@ -2367,7 +2622,7 @@ 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."
@@ -2384,7 +2639,7 @@ msgstr "Сертифікат криптографічно ненадійний."
#: ../libempathy-gtk/empathy-tls-dialog.c:184
msgid "The certificate length exceeds verifiable limits."
-msgstr "Довжина сертифіката перевищує обмеження перевірки."
+msgstr "Довжина сертифіката перевищує обмеження перевіряння."
#: ../libempathy-gtk/empathy-tls-dialog.c:188
msgid "The certificate is malformed."
@@ -2416,19 +2671,19 @@ msgstr "Запам'ятати вибір для подальших з'єднан
msgid "Certificate Details"
msgstr "Подробиці про сертифікат"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "Неможливо відкрити URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1748
msgid "Select a file"
-msgstr "Обрати файл"
+msgstr "Вибрати файл"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1820
msgid "Insufficient free space to save file"
msgstr "Недостатньо вільного місця для збереження файла"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1828
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2437,7 +2692,7 @@ msgstr ""
"Потрібно %s вільного місця для збереження цього файла, проте доступно лише "
"%s. Будь ласка, виберіть інакше місце."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Вхідний файл з %s"
@@ -2611,11 +2866,11 @@ msgstr "В'єтнамська"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
msgid "The selected contact cannot receive files."
-msgstr "Обраний контакт не отримує файли."
+msgstr "Вибраний контакт не може одержувати файли."
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
msgid "The selected contact is offline."
-msgstr "Обраний файл не у мережі"
+msgstr "Вибраний контакт поза мережею"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
msgid "No error message"
@@ -2625,23 +2880,23 @@ msgstr "Немає повідомлення про помилку"
msgid "Instant Message (Empathy)"
msgstr "Миттєві повідомлення (Empathy)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Не з'єднуватися під час запуску"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Не показувати список співрозмовників чи інші вікна під час запуску"
+msgstr "Не показувати список контактів чи інші вікна під час запуску"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
-msgstr "- клієнт миттєвих повідомлень Empathy"
+msgstr "— клієнт обміну миттєвими повідомленнями Empathy"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Помилка менеджера облікових записів"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2661,9 +2916,9 @@ msgid ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"Empathy - вільна програма, ви можете розповсюджувати та/або змінювати його "
+"Empathy — вільна програма, ви можете розповсюджувати та/або змінювати її "
"на умовах Універсальної Публічної Ліцензії GNU, що опублікована Фондом "
-"вільного програмного забезпечення, або версії 2 Ліцензії, або (на ваш "
+"вільних програмних засобів, або версії 2 Ліцензії, або (на ваш "
"розсуд) будь-якої старшої версії."
#: ../src/empathy-about-dialog.c:85
@@ -2689,7 +2944,7 @@ msgstr ""
#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
-msgstr "Програма для швидкого обміну повідомленнями для GNOME"
+msgstr "Програма швидкого обміну повідомленнями для GNOME"
#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
@@ -2701,15 +2956,15 @@ msgstr ""
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
-msgstr "Помилка при імпорті облікових рахунків"
+msgstr "Помилка при імпортуванні облікових записів"
#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
-msgstr "Помилка при розборі даних облікових рахунків."
+msgstr "Помилка при аналізуванні даних облікових записів."
#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
-msgstr "Помилка при створенні облікових рахунків."
+msgstr "Помилка при створенні облікових записів."
#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
@@ -2725,9 +2980,9 @@ 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 ""
-"ВИ можете або повернутись назад та спробувати ввести дані вашого облікового "
-"рахунку або завершити помічника та додати облікові рахунки потім у меню "
-"Правка."
+"Ви можете або повернутись назад та спробувати ввести дані вашого облікового "
+"запису або завершити помічника та додати облікові записи потім у меню "
+"«Зміни»."
#: ../src/empathy-account-assistant.c:220
#: ../src/empathy-account-assistant.c:1271
@@ -2736,27 +2991,27 @@ msgstr "Виникла помилка"
#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
-msgstr "Який тип облікового рахунку для чату ви маєте?"
+msgstr "Який тип облікового запису для балачки ви маєте?"
#: ../src/empathy-account-assistant.c:473
msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Маєте будь-який інший обліковий рахунок чату, який треба налаштувати?"
+msgstr "Маєте будь-який інший обліковий запис балачки, який треба налаштувати?"
#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
-msgstr "Введіть параметри облікового рахунку"
+msgstr "Введіть подробиці облікового запису"
#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
-msgstr "Який тип облікового рахунку для чату створити?"
+msgstr "Який тип облікового запису для балачки створити?"
#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
-msgstr "Маєте будь-які інші облікові рахунки чату?"
+msgstr "Маєте будь-які інші облікові запису для балачки?"
#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
-msgstr "Введіть параметри нового облікового рахунку"
+msgstr "Введіть параметри нового облікового запису"
#: ../src/empathy-account-assistant.c:612
msgid ""
@@ -2765,10 +3020,10 @@ msgid ""
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
msgstr ""
-"Empathy підтримує чат зі іншими особами у онлайн та з друзями і колегами, "
+"Empathy підтримує балачки з іншими особами у мережі та з друзями і колегами, "
"які користуються Google Talk, AIM, Windows Live та багатьма іншими "
-"програмами для чату. Якщо у вас є мікрофон чи веб-камера, ви також можете "
-"робити голосові та відео дзвінки."
+"програмами спілкування. Якщо у вас є мікрофон чи веб-камера, ви також можете "
+"робити голосові та відеовиклики."
#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
@@ -2776,23 +3031,23 @@ msgstr "У вас є обліковий запис, який ви викорис
#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
-msgstr "Так, імпортувати параметри облікового рахунку з "
+msgstr "Так, імпортувати параметри облікового запису з "
#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
-msgstr "Так, я введу параметри рахунку вручну"
+msgstr "Так, я введу параметри облікового запису вручну"
#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
-msgstr "Ні, я хочу створити новий рахунок"
+msgstr "Ні, я бажаю створити новий обліковий запис"
#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
-msgstr "Ні, я просто хочу бачити людей, які у онлайні поблизу"
+msgstr "Ні, я просто бажаю бачити людей, які у мережі й поблизу"
#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
-msgstr "Виберіть обліковий запис для імпорту:"
+msgstr "Виберіть обліковий запис для імпортування:"
#: ../src/empathy-account-assistant.c:813
#: ../src/empathy-new-chatroom-dialog.c:555
@@ -2814,16 +3069,16 @@ msgstr ""
"Empathy може автоматично знайти людей, приєднаних до тієї ж мережі, що й ви. "
"Якщо ви хочете використовувати цю можливість, відмітьте, що наведена нижче "
"інформація є коректною. Ви можете змінити цю інформацію пізніше або вимкнути "
-"цю можливість, використовуючи діалогове вікно «Облікові записи»."
+"цю можливість, використовуючи вікно «Облікові записи»."
#: ../src/empathy-account-assistant.c:1091
#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
-msgstr "Pvsyb->Облікові записи"
+msgstr "Зміни->Облікові записи"
#: ../src/empathy-account-assistant.c:1107
msgid "I do _not want to enable this feature for now"
-msgstr "Ні, я _не хочу зараз вмикати цю функцію"
+msgstr "Ні, я _не бажаю зараз вмикати цю функцію"
#: ../src/empathy-account-assistant.c:1143
msgid ""
@@ -2835,15 +3090,15 @@ msgstr ""
"Ви не можете спілкуватися з людьми, приєднаними до вашої локальної мережі, "
"оскільки не встановлено telepathy-salut. Якщо вам потрібна ця можливість, "
"встановіть пакет telepathy-salut та створіть обліковий запис «Люди поблизу» "
-"у діалоговому вікні «Облікові записи»"
+"у вікні «Облікові записи»"
#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
-msgstr "не встановлено telepathy-salut"
+msgstr "Не встановлено telepathy-salut"
#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Облікові записи обміну повідомленнями та VoIP"
+msgstr "Листування та облікові записи VoIP"
#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
@@ -2862,16 +3117,16 @@ msgstr "Введіть персональну інформацію"
#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
-msgstr "Є незбережені зміни у вашому обліковому рахунку %s."
+msgstr "Є незбережені зміни у вашому обліковому записі %s."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
-msgstr "Новий обліковий рахунок ще не було збережено."
+msgstr "Новий обліковий запис ще не збережено."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "З'єднання…"
@@ -2887,23 +3142,23 @@ msgstr "Від'єднаний — %s"
#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
-msgstr "Не у мережі — Немає з'єднання з мережею"
+msgstr "Поза мережею — немає з'єднання з мережею"
#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
-msgstr "Невідомий статус"
+msgstr "Невідомий стан"
#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
-msgstr "Не у мережі — Обліковий запис вимкнено"
+msgstr "Поза мережею — Обліковий запис вимкнено"
#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr ""
-"Ви намагаєтесь створити новий обліковий рахунок, що призведе до\n"
-"відкидання змін. Дійсно хочете продовжити?"
+"Ви намагаєтесь створити новий обліковий запис, що призведе до\n"
+"відкидання змін. Продовжити?"
#: ../src/empathy-accounts-dialog.c:1192
#, c-format
@@ -2912,15 +3167,15 @@ msgstr "Вилучити «%s» з комп'ютера?"
#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
-msgstr "Це не призведе до видалення облікового запису на сервері."
+msgstr "Це не призведе до вилучення облікового запису на сервері."
#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr ""
-"Ви намагаєтесь обрати інший обліковий запис, що призведе до \n"
-"відкидання змін. Ви дійсно хочете продовжити?"
+"Ви намагаєтесь вибрати інший обліковий запис, що призведе до \n"
+"відкидання змін. Продовжити?"
#. Menu items: to enabled/disable the account
#: ../src/empathy-accounts-dialog.c:1643
@@ -2937,35 +3192,35 @@ msgid ""
"your changes. Are you sure you want to proceed?"
msgstr ""
"Ви намагаєтесь закрити вікно, що призведе до \n"
-"відкидання змін. Ви дійсно хочете продовжити?"
+"відкидання змін. Продовжити?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Додати…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Завантаження інформатизації про обліковий запис"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Немає встановлених протоколів"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Протокол:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
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:5
-msgid "_Add…"
-msgstr "_Додати…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
-msgstr "_Імпорт…"
+msgstr "_Імпортувати…"
#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
@@ -2979,159 +3234,167 @@ msgstr "Клієнт аутентифікація Empathy"
msgid "People nearby"
msgstr "Люди поблизу"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "— аудіо- та відеоклієнт Empathy"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Аудіо- та відеоклієнт Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Контраст"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Яскравість"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Гамма"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "Гучність"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
-msgstr "_Контур"
+msgstr "_Бічна панель"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "Звуковий вхід"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "Відеовхід"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
-msgstr "Табло набору номеру"
+msgstr "Панель набору"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Подробиці"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
-msgstr "Дзвонити з %s"
+msgstr "Виклик з %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "_Виклик"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "Адреса IP, яку показано на машині"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "Адреса IP, яку показано на сервері через інтернет"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "Адреса IP вузла, яку показано по ту сторону"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "Адреса IP сервера ретрансляції"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "Адреса IP групової трансляції"
-#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Невідомо"
-#: ../src/empathy-streamed-media-window.c:1909
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Невідомо"
-#: ../src/empathy-streamed-media-window.c:1912
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Невідомо"
-#: ../src/empathy-streamed-media-window.c:1915
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Невідомо"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "З'єднання — %d:%02dm "
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "Технічні подробиці"
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
-"Програмне забезпечення %s не розуміє формати звуку, що підтримуються вашим "
+"Програма %s не розпізнає аудіоформати, що підтримуються вашим "
"комп'ютером"
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-"Програмне забезпечення %s не розуміє відеоформати, що підтримуються вашим "
+"Програма %s не розпізнає відеоформати, що підтримуються вашим "
"комп'ютером"
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, 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-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "Помилка мережі"
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-"Формати аудіо, що потрібні для цього виклику, не встановлено на вашому "
+"Аудіоформати, що потрібні для цього виклику, не встановлено на вашому "
"комп'ютері"
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Відеоформати, що потрібні для цього виклику, не встановлено на вашому "
"комп'ютері"
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3139,124 +3402,130 @@ msgid ""
"the Help menu."
msgstr ""
"Щось трапилось з компонентом Telepathy. <a href=\"%s\">Повідомте про цю "
-"помилку</a> та прикріпіть журнали, зібрані з вікна налагодження у меню "
+"помилку</a> та прикріпіть журнали, зібрані з вікна зневадження у меню "
"«Довідка»."
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
-msgstr "Помилка у механізмі виклику"
+msgstr "Помилка у рушії виклику"
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "Досягнуто кінця потоку"
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
-msgstr "Не вдається встановити аудіопотік"
+msgstr "Не вдалось встановити аудіопотік"
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
-msgstr "Не вдається встановити відеопотік"
+msgstr "Не вдалось встановити відеопотік"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Аудіо"
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Викликати контакт знову"
-
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Вимкнути камеру"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Кодек декодування:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Увімкнути камеру"
+msgid "Disable camera"
+msgstr "Вимкнути камеру"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек декодування:"
+msgid "Display the dialpad"
+msgstr "Показати панель набору"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Вимкнути камеру та зупинити передачу відео"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Кодек кодування:"
#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Увімкнути камеру та передавати відео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Розірвати зв'язок"
#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Увімкнути камеру але не передавати відео"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Завершити поточний виклик"
#: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек кодування:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Локальні кандидати:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Розірвати зв'язок"
+msgid "Maximise me"
+msgstr "Розгорнути мене"
#: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершити поточний дзвінок"
+msgid "Minimise me"
+msgstr "Згорнути мене"
#: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальні кандидати:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Віддалений кандидат:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Попередній перегляд"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Надіслати звук"
#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набрати номер"
+msgid "Send Video"
+msgstr "Надіслати відео"
#: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Віддалений кандидат:"
+msgid "Show dialpad"
+msgstr "Показати панель набору"
#: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Надіслати звук"
+msgid "Start a video call"
+msgstr "Зробити відеовиклик"
#: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Вимкнути передачу звуку"
+msgid "Start an audio call"
+msgstr "Зробити аудіовиклик"
#: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Невідомо"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Перемкнути передавання звуку"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Відео"
+msgid "Toggle video transmission"
+msgstr "Перемкнути передавання відео"
#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Відео"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Вимкнути відео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
+msgid "Unknown"
+msgstr "Невідомо"
#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Увімкнути відео"
+msgid "Video call"
+msgstr "Відеовиклик"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Попередній перегляд відео"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Виклик"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
-msgstr "_Перегляд"
+msgstr "П_ерегляд"
#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
@@ -3312,15 +3581,11 @@ msgstr "О_чистити"
#: ../src/empathy-chat-window.ui.h:2
msgid "C_ontact"
-msgstr "_Співрозмовник"
-
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Розмова"
+msgstr "_Контакт"
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
-msgstr "Вставити _посмішку"
+msgstr "Вставити _емоційку"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
@@ -3328,15 +3593,15 @@ msgstr "Запросити _учасника…"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
-msgstr "Перемістити закладку _ліворуч"
+msgstr "Перемістити вкладку _ліворуч"
#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
-msgstr "Перемістити закладку _праворуч"
+msgstr "Перемістити вкладку _праворуч"
#: ../src/empathy-chat-window.ui.h:8
msgid "Notify for All Messages"
-msgstr "Сповіщати на всі повідомлення"
+msgstr "Сповіщати про всі повідомлення"
#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
@@ -3344,15 +3609,11 @@ msgstr "_Зміст"
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
-msgstr "_Бесіда"
+msgstr "_Розмова"
#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
-msgstr "_Відокремити закладку"
-
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "З_міни"
+msgstr "_Відокремити вкладку"
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
@@ -3372,25 +3633,25 @@ msgstr "_Попередня закладка"
#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
-msgstr "Показати _список співрозмовників"
+msgstr "Показати _список контактів"
#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
-msgstr "_Закладки"
+msgstr "_Вкладки"
#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
msgstr "_Повернути закриті вкладки"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
-msgstr "Ім'я:"
+msgstr "Назва"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Кімната"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Автоматичне з'єднання"
@@ -3398,90 +3659,95 @@ msgstr "Автоматичне з'єднання"
msgid "Manage Favorite Rooms"
msgstr "Керування улюбленими кімнатами"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
-msgstr "Вхідний відео виклик"
+msgstr "Вхідний відеовиклик"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Вхідний виклик"
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
-msgstr "Відеодзвінок від %s, відповісти?"
+msgstr "Відеовиклик від %s, відповісти?"
-#: ../src/empathy-event-manager.c:509
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
-msgstr "Дзвінок від %s, хочете відповісти?"
+msgstr "Виклик від %s, відповісти?"
-#: ../src/empathy-event-manager.c:512 ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Вхідний виклик від %s"
-#: ../src/empathy-event-manager.c:537
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "Від_хилити"
-#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_Відповісти"
-#: ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_Відповісти через відео"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "Вхідний відеовиклик від %s"
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Кімната запрошення"
-#: ../src/empathy-event-manager.c:736
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Запрошення приєднатись до %s"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
-msgstr "%s запрошує Вас ввійти у %s"
+msgstr "%s запрошує вас увійти у %s"
-#: ../src/empathy-event-manager.c:751
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "Від_хилити"
-#: ../src/empathy-event-manager.c:756
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Увійти"
-#: ../src/empathy-event-manager.c:783
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
-msgstr "%s запросив Вас ввійти у %s"
+msgstr "%s запросив вас увійти у %s"
-#: ../src/empathy-event-manager.c:789
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Вас запрошено приєднатись до %s"
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
-msgstr "Вхідний передача файлу від %s"
+msgstr "Вхідне передавання файла від %s"
-#: ../src/empathy-event-manager.c:1010 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Потрібно пароль"
-#: ../src/empathy-event-manager.c:1066
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s потребує дозволу, щоб знати, коли ви в мережі"
-#: ../src/empathy-event-manager.c:1070
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3521,69 +3787,65 @@ msgstr "%s з %s"
#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
-msgstr "Приймається \"%s\" від %s"
+msgstr "Одержується «%s» від %s"
#. translators: first %s is filename, second %s is the contact name
#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
-msgstr "Відправляється \"%s\" до %s"
+msgstr "Надсилається «%s» до %s"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
-msgstr "Помилка приймання \"%s\" від %s"
+msgstr "Помилка одержання «%s» від %s"
#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
-msgstr "Помилка прийому файлу"
+msgstr "Помилка одержання файла"
#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
-msgstr "Помилка відправлення \"%s\" до %s"
+msgstr "Помилка надсилання «%s» до %s"
#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
-msgstr "Помилка відправлення файлу"
+msgstr "Помилка надсилання файла"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
-msgstr "\"%s\" надійшов від %s"
+msgstr "«%s» одержано від %s"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
-msgstr "\"%s\" надіслано до %s"
+msgstr "«%s» надіслано до %s"
#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
-msgstr "Передачу файлу завершено"
+msgstr "Передавання файла завершено"
#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
-msgstr "Почекати, поки інший учасник відповість"
+msgstr "Очікування на відповідь від іншого учасника"
#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
-msgstr "Перевірка цілісності \"%s\""
+msgstr "Перевіряння цілісності \"%s\""
#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
-msgstr "Хешування \"%s\""
-
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+msgstr "Хешування «%s»"
#: ../src/empathy-ft-manager.c:1038
msgid "File"
@@ -3591,32 +3853,32 @@ msgstr "Файл"
#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
-msgstr "Лишаємось"
+msgstr "Залишилось"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
-msgstr "Передача файлів"
+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:84
msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr ""
-"Не знайдено облікових записів для імпорту. Empathy на цей час підтримує "
-"імпорт контактів лише з Pidgin."
+"Не знайдено облікових записів для імпортування. Empathy на цей момент підтримує "
+"імпортування контактів лише з Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
-msgstr "Імпорт облікових записів"
+msgstr "Імпортування облікових записів"
#. Translators: this is the header of a treeview column
#: ../src/empathy-import-widget.c:301
msgid "Import"
-msgstr "Імпорт:"
+msgstr "Імпортувати"
#: ../src/empathy-import-widget.c:310
msgid "Protocol"
@@ -3626,61 +3888,61 @@ msgstr "Протокол:"
msgid "Source"
msgstr "Джерело"
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "Вкажіть пароль"
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Від'єднати"
-#: ../src/empathy-main-window.c:540
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Збігів не знайдено"
-#: ../src/empathy-main-window.c:695
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Перез'єднати"
-#: ../src/empathy-main-window.c:701
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Редагування облікового запису"
-#: ../src/empathy-main-window.c:707
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Закрити"
#. Translators: this string will be something like:
#. * Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:849
+#: ../src/empathy-main-window.c:928
#, c-format
msgid "Top up %s (%s)..."
msgstr "Поповнити %s (%s)…"
-#: ../src/empathy-main-window.c:924
+#: ../src/empathy-main-window.c:975
msgid "Top up account credit"
msgstr "Поповнити рахунок"
#. top up button
-#: ../src/empathy-main-window.c:999
+#: ../src/empathy-main-window.c:1050
msgid "Top Up..."
msgstr "Поповнити…"
-#: ../src/empathy-main-window.c:1752
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
-msgstr "Співрозмовник"
+msgstr "Контакт"
-#: ../src/empathy-main-window.c:2101
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
-msgstr "Список співрозмовників"
+msgstr "Список контактів"
-#: ../src/empathy-main-window.c:2219
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "Показати та редагувати облікові записи"
#: ../src/empathy-main-window.ui.h:1
msgid "Contacts on a _Map"
-msgstr "Співрозмовники на _карті"
+msgstr "Контакти на _карті"
#: ../src/empathy-main-window.ui.h:2
msgid "Credit Balance"
@@ -3692,11 +3954,11 @@ msgstr "Знайти у _списку контактів"
#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
-msgstr "Підключити _близьких"
+msgstr "Залучити _улюблених"
#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
-msgstr "Налаштувати _близьких"
+msgstr "Налаштувати _улюблених"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
@@ -3720,11 +3982,11 @@ msgstr "Показати _протокол:"
#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
-msgstr "Сортувати за _іменем"
+msgstr "Впорядкувати за _псевдонімом"
#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
-msgstr "Впорядкувати за с_татусом"
+msgstr "Впорядкувати за с_таном"
#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
@@ -3740,11 +4002,11 @@ msgstr "_Компактний розмір"
#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
-msgstr "_Налагодження"
+msgstr "Зневад_ження"
#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
-msgstr "Передача _файлів"
+msgstr "Передавання _файлів"
#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
@@ -3752,7 +4014,7 @@ msgstr "_Увійти…"
#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Нова бесіда…"
+msgstr "_Нова розмова…"
#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
@@ -3800,7 +4062,7 @@ msgstr "Ні"
#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
-msgstr "Неможливо почати перелічування кімнат"
+msgstr "Неможливо перелічити кімнати"
#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
@@ -3808,13 +4070,13 @@ msgstr "Неможливо зупинити перелічування кімн
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "Couldn't load room list"
-msgstr "Не можу загрузити список кімнати"
+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
@@ -3837,79 +4099,79 @@ msgstr "Список бесід"
msgid "_Room:"
msgstr "_Кімната:"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "Надійшло повідомлення"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "Повідомлення надіслано"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
-msgstr "Нова бесіда"
+msgstr "Нова розмова"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
-msgstr "Співрозмовник входить у мережу"
+msgstr "Контакт входить у мережу"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
-msgstr "Співрозмовник виходить з мережі"
+msgstr "Контакт виходить з мережі"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
-msgstr "Обліковий запис підключено"
+msgstr "Обліковий запис під'єднано"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
-msgstr "Обліковий запис відключено"
+msgstr "Обліковий запис від'єднано"
-#: ../src/empathy-preferences.c:450
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "Мова"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:700
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "Джульєтта"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:707
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "Ромео"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:713
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "Ромео! О, навіщо ти Ромео?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr "Зміни своє ім'я, зречися батька;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:719
+#: ../src/empathy-preferences.c:738
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Як ні, то присягни мені в коханні,"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr "І більше я не буду Капулетті."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:744
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Послухать — чи відповісти відразу?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "Джульєтта від'єдналась."
-#: ../src/empathy-preferences.c:962
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "Параметри"
@@ -3917,67 +4179,75 @@ msgstr "Параметри"
msgid "Appearance"
msgstr "Вигляд"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Поведінка"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
-msgstr "Тема оф_ормлення бесіди:"
+msgstr "Т_ема бесіди:"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
-msgstr "Вимкнути сповіщення у стані «_відійшов». або «зайнятий»"
+msgstr "Вимкнути сповіщення у стані «_відійшов» або «зайнятий»"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
-msgstr "Вимкнути звуки у стані «_відійшов». або «зайнятий»"
+msgstr "Вимкнути звуки у стані «_відійшов» або «зайнятий»"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Показувати вхідні події в ділянці сповіщень"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
-msgstr "Показувати сповіщення коли контакт входить в мережу"
+msgstr "Показувати сповіщення, коли контакт входить в мережу"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
-msgstr "Показувати сповіщення коли контакт залишає мережу"
+msgstr "Показувати сповіщення, коли контакт залишає мережу"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
-msgstr "Показувати сповіщення коли вікно _чату не активне"
+msgstr "Показувати сповіщення, коли вікно _чату не активне"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
-msgstr "Увімкнути перевірку орфографії для мов:"
+msgstr "Увімкнути перевіряння орфографії для мов:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
-msgstr "Загальні"
+msgstr "Загальне"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Вхідний рівень"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Вхідна гучність"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Джерела місцевості:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
-msgstr "Журнал бесід"
+msgstr "Журнал розмов"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Сповіщення"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Звукові сигнали при подіях"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Приватність"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -3986,72 +4256,72 @@ msgstr ""
"Зниження точності визначення місцевості дозволяє публікувати лише місто,"
"регіон та країну. Точність GPS координат визначається 1 десятковою позицією."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
-msgstr "Показувати графічні _посмішки"
+msgstr "Показувати _емоційки графічно"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
-msgstr "Показати _список співрозмовників у кімнаті"
+msgstr "Показати _список контактів у кімнаті"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Звуки"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
-msgstr "Перевірка орфографії"
+msgstr "Перевіряння орфографії"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-"<small>У цьому списку показані лише мови, для яких встановлені словники.</"
+"<small>У цьому списку показані лише мови, для яких встановлено словники.</"
"small>"
-#: ../src/empathy-preferences.ui.h:24
-msgid "Theme Variant:"
-msgstr "Варіант теми:"
-
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Теми"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Варіант:"
+
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "_Автоматично з'єднуватись при запуску"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "_Мобільний телефон"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Ввімкнути контекстні сповіщення"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Ввімкнути звукові сповіщення"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Мережа (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
-msgstr "_Відкривати нові бесіди у окремому вікні"
+msgstr "_Відкривати нові бесіди в окремому вікні"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
-msgstr "_Публікувати місцевості моїм співрозмовникам"
+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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "По_низити точність визначення місцевості"
@@ -4063,9 +4333,57 @@ msgstr "Стан"
msgid "_Quit"
msgstr "Ви_йти"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Викликати контакт знову"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Вимкнути камеру"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Увімкнути камеру"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Вимкнути камеру та зупинити передавання відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Увімкнути камеру та передавати відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Увімкнути камеру, але не передавати відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Перегляд"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Повторно набрати номер"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_Відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Вимкнути відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Увімкнути відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Перегляд відео"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
-msgstr "Карта співрозмовників"
+msgstr "Карта контактів"
#: ../src/empathy-debug-window.c:1218
msgid "Save"
@@ -4130,23 +4448,23 @@ msgid ""
msgstr ""
"Вибраний менеджер з'єднань не підтримує розширення віддаленого зневадження "
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "Запросити учасника"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
-msgstr "Виберіть співрозмовника для запрошення до бесіди:"
+msgstr "Виберіть контакт для запрошення до бесіди:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "Запросити"
#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
-"Не показувати діалогові вікна; виконати роботу (наприклад, імпортування) та "
+"Не показувати вікна; виконати роботу (наприклад, імпортування) та "
"вийти"
#: ../src/empathy-accounts.c:187
@@ -4158,7 +4476,7 @@ msgstr ""
#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-"Спочатку виберіть обліковий запис (наприклад, gabble/jabber/"
+"Спочатку виберіть заданий обліковий запис (наприклад, gabble/jabber/"
"foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:193
@@ -4175,51 +4493,96 @@ msgstr "Облікові записи Empathy"
#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
-msgstr "Налагодження Empathy"
+msgstr "Зневадження Empathy"
#: ../src/empathy-chat.c:107
msgid "- Empathy Chat Client"
msgstr "— клієнт балачок Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
-msgstr "Відповісти"
+msgstr "Відгукнутись"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Відкинути"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Відповісти"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Відповісти через відео"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Відхилити"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Прийняти"
-#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:260
msgid "Provide"
msgstr "Надати"
-#: ../src/empathy-call-observer.c:130
+#: ../src/empathy-call-observer.c:135
#, c-format
-msgid "Missed call from %s"
-msgstr "Пропущений виклик від %s"
+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:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr "і"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-window.c:1005
#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s намагався зв'язатись з вами, але ви мали розмову з іншим у той час."
+msgid "Call with %d participants"
+msgstr "Виклик з %d учасниками "
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:1904
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:1905
+msgid "On hold"
+msgstr "В очікуванні"
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
-msgstr "_Збіг регістру"
+msgstr "_З урахуванням регістру"
+
+#~ msgid "All"
+#~ msgstr "Усі"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Conversations"
+#~ msgstr "Бесіди"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Переглянути попередні бесіди"
+
+#~ msgid "_For:"
+#~ msgstr "_Для:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Вставити типове повідомлення"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Зберегти _новий стан"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Збережений стан"
#~ msgid "_Enabled"
#~ msgstr "Увім_кнено"
diff --git a/po/vi.po b/po/vi.po
index 9475a8162..2bc2cddd8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,15 +2,16 @@
# Copyright © 2009 GNOME i18n Project for Vietnamese.
# Clytie Siddall <clytie@riverland.net.au>, 2008-2009.
# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2009,2011.
+# Ngô Chin <ndtrung4419@gmail.com>, 2011.
#
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"
-"POT-Creation-Date: 2011-04-07 10:04+0000\n"
-"PO-Revision-Date: 2011-04-14 18:58+0700\n"
-"Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-08-03 15:08+0000\n"
+"PO-Revision-Date: 2011-08-03 18:28+0700\n"
+"Last-Translator: Ngô Chin <ndtrung4419@gmail.com>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,351 +34,372 @@ msgstr "Trình gửi tin nhắn Empathy"
#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
-msgstr "Trình trò chuyện"
+msgstr "Trình nhắn tin nhanh"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Luôn mở một cửa sổ riêng cho mỗi cuộc trò chuyện mới."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Âm lượng cuộc gọi"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Âm lượng cuộc gọi, theo phần trăm."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
-"Ký tự cần thêm vào đẳng sau tên hiệu khi sử dụng chức năng (thẻ) điền nốt "
-"tên hiệu trong nhóm trò chuyện."
+"Ký tự cần thêm vào sau tên hiệu khi sử dụng chức năng điền nốt tên hiệu "
+"(tab) trong nhóm trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "Sắc thái cửa sổ trò chuyện"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Chat window theme variant"
+msgstr "Sắc thái cửa sổ trò chuyện"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Danh sách ngôn ngữ để kiểm tra chính tả, cách nhau bằng dấu phẩy (v.d. \"en, "
+"Danh sách ngôn ngữ để kiểm tra chính tả, phân cách bằng dấu phẩy (v.d. \"en, "
"fr, ja, vi\")."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "Co lại danh sách liên hệ"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
-msgstr "Nên dùng trình quản lý mạng"
+msgstr "Nên dùng trình quản lý kết nối"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
-msgstr "Tiêu chuẩn sắp xếp danh sách liên hệ"
+msgstr "Tiêu chuẩn sắp xếp danh sách liên lạc"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
-msgstr "Thư mục mặc định từ đó cần chọn một ảnh riêng"
+msgstr "Thư mục mặc định để chọn ảnh đại diện"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "Không tự mở thông báo khi vắng mặt"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "Tắt âm thanh khi vắng mặt"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "Hiện sự kiện đến trong vùng trạng thái"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr ""
-"Hiện sự kiện đến trong vùng trạng thái. Nếu không, hiện cho người dùng ngay "
-"lập tức."
+"Hiện sự kiện đến trong vùng trạng thái. Nếu để false, hiện cho người dùng "
+"ngay lập tức."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy được phép công bố vị trí người dùng"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy được phép dùng GPS để đoán vị trí"
+msgstr "Empathy được phép dùng GPS để xác định vị trí"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy được phép dùng mạng di động để đoán vị trí"
+msgstr "Empathy được phép dùng mạng di động để xác định vị trí"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
-msgstr "Empathy được phép dùng mạng để đoán vị trí"
+msgstr "Empathy được phép dùng mạng để xác định vị trí"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Thư mục tải về mặc định Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy đã chuyển đổi các bản ghi bướm"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
-msgstr "Empathy nên tự động đặt vắng mặt khi rảnh"
+msgstr "Empathy nên tự động đặt vắng mặt khi không hoạt động"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Trình Empathy nên tự động kết nối khi khởi chạy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy nên giảm độ chính xác vị trí địa lý"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
-"Empathy nên dùng ảnh riêng của liên lạc làm biểu tượng cửa sổ trò chuyện"
+"Empathy nên dùng ảnh đại diện của liên lạc làm biểu tượng cửa sổ trò chuyện"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "Bật bộ công cụ phát triển WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "Tự mở thông báo về tin nhắn mới"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "Bật kiểm tra chính tả"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "Ẩn cửa sổ chính"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "Ẩn cửa sổ chính."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "Ký tự điền nốt tên hiệu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "Mở mỗi cuộc trò chuyện mới trong cửa sổ riêng"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Đường dẫn đến sắc thái Adium cần dùng"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Đường dẫn đến sắc thái Adium cần dùng nếu dùng sắc thái Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
-msgstr "Phát âm thanh khi mới nhận tin nhắn"
+msgstr "Phát âm thanh khi nhận tin nhắn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
-msgstr "Phát âm khi cuộc trao đổi bắt đầu"
+msgstr "Phát âm thanh khi bắt đầu cuộc trò chuyện mới"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
-msgstr "Phát âm thanh khi mới gửi tin nhắn"
+msgstr "Phát âm thanh khi gửi tin nhắn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "Phát âm thanh khi một liên lạc đăng nhập"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
-msgstr "Phát âm khi liên lạc đăng xuất"
+msgstr "Phát âm thanh khi một liên lạc đăng xuất"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
-msgstr "Phát âm thanh khi mình đăng nhập"
+msgstr "Phát âm thanh khi chính bạn đăng nhập"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
-msgstr "Phát âm thanh khi mình đăng xuất"
+msgstr "Phát âm thanh khi chính bạn đăng xuất"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "Tự mở thông báo nếu cửa sổ trò chuyện không có tiêu điểm"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "Thông báo khi bạn bè đăng nhập"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "Thông báo khi bạn bè đăng xuất"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Show Balance in contact list"
+msgstr "Hiện số dư tài khoản trong danh sách liên lạc"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
-msgstr "Hiện ảnh riêng"
+msgstr "Hiện ảnh đại diện"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "Hiện danh sách liên lạc trong phòng"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
-msgstr "Gợi ý về đóng cửa sổ chính"
+msgstr "Hiện gợi ý về đóng cửa sổ chính"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "Hiện liên lạc ngoại tuyến"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "Hiện giao thức"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "Ngôn ngữ kiểm tra chính tả"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "Thư mục mặc định vào đó cần lưu tập tin được truyền đến."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
-msgstr "Thư mục cuối cùng từ đó đã chọn một ảnh riêng."
+msgstr "Thư mục chứa ảnh đại diện lần trước."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "Vị trí khung cửa sổ tán gẫu ở bên"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Vị trí được lưu (theo điểm ảnh) của khung cửa sổ tán gẫu ở bên."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Sắc thái được dùng để hiển thị cuộc đối thoại trong cửa sổ trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Sắc thái được dùng để hiển thị cuộc đối thoại trong cửa sổ trò chuyện."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "Dùng biểu tượng xúc cảm"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "Dùng âm thanh thông báo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "Dùng sắc thái cho phòng trò chuyện"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Bật/tắt công bố vị trí người dùng với những liên lạc."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Bật/tắt cho phép Empathy dùng GPS để đoán vị trí."
+msgstr "Bật/tắt cho phép Empathy dùng GPS để xác định vị trí."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Bật/tắt cho phép Empathy dùng mạng di động để đoán vị trí."
+msgstr "Bật/tắt cho phép Empathy dùng mạng di động để xác định vị trí."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
-msgstr "Bật/tắt cho phép Empathy dùng mạng để đoán vị trí."
+msgstr "Bật/tắt cho phép Empathy dùng mạng để xác định vị trí."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Có để Empathy đã chuyển đổi các bản ghi bướm không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
-"Empathy có nên tự động đăng nhập vào các tài khoản của bạn vào lúc khởi "
-"chạy, hay không."
+"Empathy có nên tự động đăng nhập vào các tài khoản của bạn vào lúc khởi chạy "
+"hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-"Empathy có nên tự động đăng nhập vào các tài khoản của bạn vào lúc khởi "
-"chạy, hay không."
+"Empathy có nên tự động đăng nhập vào các tài khoản của bạn vào lúc khởi chạy "
+"hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Bật/tắt buộc Empathy giảm độ chính xác vị trí vì lý do riêng tư."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Dùng ảnh riêng cho liên lạc làm biểu tượng cửa sổ trò chuyện."
+msgstr "Dùng ảnh đại diện cho liên lạc làm biểu tượng cửa sổ trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Bật/tắt bộ công cụ phát triển WebKit, như trình kiểm tra Web."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "Bật/tắt sử dụng trình quản lý kết nối để tự động ngắt/tái kết nối."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Bật/tắt kiểm tra đoạn gõ so với những ngôn ngữ đã chọn hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
-"Bật/tắt chuyển đổi ký tự miêu tả mặt cười thành biểu tượng xúc cảm trong đối "
-"thoại."
+"Bật/tắt chuyển đổi ký tự miêu tả mặt cười thành biểu tượng xúc cảm trong khi "
+"trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Có nên phát âm thanh báo khi liên lạc đăng nhập vào mạng, hay không."
+msgstr "Có nên phát âm thanh báo khi liên lạc đăng nhập vào mạng hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Có nên phát âm thanh báo khi liên lạc đăng xuất ra mạng, hay không."
+msgstr "Có nên phát âm thanh báo khi liên lạc đăng xuất ra mạng hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
-msgstr "Có nên phát âm thanh báo khi sự kiện xảy ra, hay không."
+msgstr "Có nên phát âm thanh báo khi sự kiện xảy ra hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Có nên phát âm thanh báo khi nhận được tin nhắn, hay không."
+msgstr "Có nên phát âm thanh báo khi nhận được tin nhắn hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
-msgstr "Có nên phát âm thanh báo khi nhận được cuộc đối thoại mới, hay không."
+msgstr "Có nên phát âm thanh báo khi nhận được cuộc trò chuyện mới hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Có nên phát âm thanh báo khi gửi tin nhắn, hay không."
+msgstr "Có nên phát âm thanh báo khi gửi tin nhắn hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
-msgstr "Có nên phát âm thanh báo khi đăng nhập vào một mạng, hay không."
+msgstr "Có nên phát âm thanh báo khi đăng nhập vào một mạng hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
-msgstr "Có nên phát âm thanh báo khi đăng xuất ra một mạng, hay không."
+msgstr "Có nên phát âm thanh báo khi đăng xuất ra một mạng hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "Bật/tắt phát âm thanh thông báo khi vắng mặt hoặc bận."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Bật/tắt thông báo khi một liên lạc ngoại tuyén."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Bật tắt thông báo khi một liên lạc trực tuyến."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -385,50 +407,54 @@ msgstr ""
"Có nên hiển thị hay không một thông báo tự mở khi nhận một tin nhắn mới, "
"ngay cả nếu cửa sổ trò chuyện đã mở nhưng không có tiêu điểm."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Có nên phát âm thanh báo khi nhận được một tin nhắn mới, hay không."
+msgstr "Có nên phát âm thanh báo khi nhận được một tin nhắn mới hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show account balances in the contact list."
+msgstr "Chọn có hiện số dư tài khoản trong danh sách liên lạc hay không."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Bật/tắt hiển thị ảnh riêng cho liên lạc trong danh sách liên lạc và cửa sổ "
"trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Bật/tắt hiện danh sách ngoại tuyến trong danh sách liên lạc."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
-msgstr "Có nên phát âm thanh báo khi vắng mặt hay bận, hay không."
+msgstr "Có nên phát âm thanh báo khi vắng mặt/bận hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Bật/tắt hiển thị giao thức trong danh sách liên lạc."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "Bật/tắt hiển thị danh sách liên lạc trong phòng tán gẫu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "Bật/tắt danh sách liên lạc ở chế độ tóm gọn."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr ""
-"Bật/tắt hiển thị hộp thoại thông điệp về việc đóng cửa sổ chính bằng cái nút "
-"« x » trên thanh tựa đề hay không."
+"Có hiển thị hộp thoại thông điệp về việc đóng cửa sổ chính bằng nút \"x\" "
+"trên thanh tựa đề hay không."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "Bật/tắt dùng sắc thái cho phòng trò chuyện."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -444,7 +470,7 @@ msgstr "Quản lý tài khoản tin nhắn và VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "Tài khoản tin nhắn và VoIP"
@@ -464,6 +490,22 @@ msgstr "Tập tin được chọn không phải tập tin bình thường"
msgid "The selected file is empty"
msgstr "Tập tin được chọn là tập tin rỗng"
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Nhỡ cuộc gọi từ %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Gọi cho %s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Cuộc gọi từ %s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Kiểu socket không hỗ trợ"
@@ -492,147 +534,140 @@ msgstr "Gặp lỗi trong khi thử truyền tập tin đó"
msgid "The other participant is unable to transfer the file"
msgstr "Người dự khác không thể truyền tập tin đó"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Lỗi không rõ"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Có mặt"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Bận"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Vắng mặt"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Vô hình"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "Ngoại tuyến"
#. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:224
+msgctxt "presence"
msgid "Unknown"
msgstr "Không rõ"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Không cung cấp lý do"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "Trạng thái được đặt là ngoại tuyến"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "Lỗi mạng"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "Lỗi xác thực"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Lỗi mật mã"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "Tên đang được dùng"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Chứng nhận không được cung cấp"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "Chứng nhận không đáng tin"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
-msgstr "Chứng nhận đã hết hạn dùng"
+msgstr "Chứng nhận đã hết hạn"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Chứng nhận không được kích hoạt"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Tên máy của chứng nhận không tương ứng"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Vân tay của chứng nhận không tương ứng"
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Chứng nhận tự ký"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "Lỗi chứng nhận"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "Không hỗ trợ mã hoá"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "Chứng nhận không hợp lệ"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "Kết nối bị từ chối"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "Không thể thiết lập kết nối"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "Kết nối bị đứt"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "Tài nguyên này đã được kết nối đến máy chủ"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "Kết nối bị thay bằng một kết nối mới dùng cùng tài nguyên"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "Tài khoản này đã có trên máy chủ"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "Máy chủ đang bận không thể xử lý kết nối"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "Chứng nhận bị thu hồi"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "Chứng nhận dùng mật mã yếu hoặc không an toàn"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:348
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -640,146 +675,128 @@ msgstr ""
"Độ dài chứng nhận máy chủ, hoặc độ sâu chuỗi chứng nhận, vượt quá giới hạn "
"của thư viện mật mã"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Người chung quanh"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! Nhật Bản"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
-msgstr "Tán gẫu Facebook"
+msgstr "Facebook Chat"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d giây trước"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d phút trước"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d giờ trước"
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d ngày trước"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d tuần trước"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d tháng trước"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "trong tương lai"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Tất cả"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Mọi tài khoản"
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Tài khoản"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "Mật khẩu"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Máy phục vụ"
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Cổng"
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Tài khoản %s bị sửa bởi My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Không thể sửa tài khoản %s bằng Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "Chạy May Web Accounts"
#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "Tên người dùng:"
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "Á_p dụng"
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "Đăng _nhập"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Tài khoản:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Bật"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "Tài khoản này đã có trên máy chủ"
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "Tạo tài khoản mới trên máy chủ"
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "T_hôi"
@@ -788,19 +805,19 @@ msgstr "T_hôi"
#. * 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:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s trên %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "Tài khoản %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "Tài khoản mới"
@@ -812,6 +829,7 @@ msgstr "<b>Ví dụ:</b> TênHiểnThị"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -825,7 +843,7 @@ msgstr "Cao cấp"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "Mật khẩ_u:"
@@ -835,7 +853,7 @@ msgstr "Mật khẩ_u:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Nhớ mật khẩu"
@@ -845,7 +863,7 @@ msgstr "Nhớ mật khẩu"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -921,76 +939,84 @@ msgstr "UIN ICQ của bạn là gì?"
msgid "What is your ICQ password?"
msgstr "Mật khẩu ICQ của bạn là gì?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Tự động"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Đăng ký"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Tuỳ chọn"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Không"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "Bảng mã:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Phần lớn các máy chủ IRC không yêu cầu mật khẩu nên nếu bạn không chắc chắn "
+"thì đừng nhập mật khẩu vào đây."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "Mạng"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "Mạng:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "Biệt hiệu:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "Mật khẩu:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "Thông điệp thoát:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "Tên thật:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "Máy phục vụ"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "Biệt hiệu IRC của bạn là gì?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "Mạng IRC nào?"
@@ -1124,58 +1150,63 @@ msgid "Discover the STUN server automatically"
msgstr "Tự động phát hiện máy chủ STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Bỏ qua lỗi TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Khoảng lặp (giây)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Tuỳ chọn Keep-Alive (giữ kết nối)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "Định tuyến lỏng lẻo"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Cơ chế:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "Tuỳ chọn linh tinh"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "Tuỳ chọn vượt NAT"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Cổng:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "Tuỳ chọn uỷ nhiệm"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Máy chủ STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Máy phục vụ:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Phương tiện:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Mật khẩu SIP của bạn là gì?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "ID đăng nhập SIP của bạn là gì?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "Tên người _dùng:"
@@ -1199,28 +1230,36 @@ msgstr "I_D Yahoo!:"
msgid "_Room List locale:"
msgstr "_Miền địa phương danh sách phòng:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "Không thể chuyển đổi ảnh"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "Không có định dạng ảnh được hỗ trợ nào trên hệ thống này"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Không thể lưu pixbuf thành tập tin ảnh png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "Chọn ảnh riêng"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Chụp hình..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
-msgstr "Không ảnh"
+msgstr "Không có ảnh"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Ảnh"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Mọi tập tin"
@@ -1228,35 +1267,61 @@ msgstr "Mọi tập tin"
msgid "Click to enlarge"
msgstr "Nhấn để phóng to"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "Không thể bắt đầu cuộc gọi"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "Liên lạc này không hỗ trợ gọi điện"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "Liên lạc này đã ngoại tuyến."
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "Liên lạc này không hợp lệ"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Giao thức này không hỗ trợ cuộc gọi khẩn cấp"
+
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "Lỗi mở trò chuyện riêng tư"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "Chủ đề không được hỗ trợ trong cuộc trò chuyện này"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "Bạn không được phép thay đổi chủ đề trò chuyện"
-#: ../libempathy-gtk/empathy-chat.c:930
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "\"%s\" không phải là ID hợp lệ"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: xoá mọi trao đổi trong cuộc trò chuyện hiện thời"
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <chủ đề>: đặt chủ đề cho cuộc trò chuyện hiện thời"
-#: ../libempathy-gtk/empathy-chat.c:936
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id phòng trò chuyện>: tham gia phòng trò chuyện mới"
-#: ../libempathy-gtk/empathy-chat.c:939
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id phòng trò chuyện>: tham gia phòng trò chuyện mới"
-#: ../libempathy-gtk/empathy-chat.c:944
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1264,25 +1329,25 @@ msgstr ""
"/part [<ID phòng trò chuyện>] [<lý do>]: rời phòng (mặc định là phòng hiện "
"thời)"
-#: ../libempathy-gtk/empathy-chat.c:949
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id liên lạc> [<thông điệp>]: mở trò chuyện riêng tư"
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id liên lạc> <thông điệp>: mở trò chuyện riêng tư"
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <biệt hiệu>: đổi biệt hiệu của bạn trên máy chủ hiện thời"
-#: ../libempathy-gtk/empathy-chat.c:958
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <thông điệp>: gửi thông điệp ACTION (hành động) đến cuộc trò chuyện hiện "
"thời"
-#: ../libempathy-gtk/empathy-chat.c:961
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1292,105 +1357,124 @@ msgstr ""
"gửi thông điệp bắt đầu bằng '/'. Ví dụ \"/sau /join được dùng để tham gia "
"phòng trò chuyện\""
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID liên lạc>: hiện thông tin về một liên lạc"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<lệnh>]: hiện mọi lệnh hỗ trợ. Nếu có <lệnh> thì hiện cách sử dụng."
-#: ../libempathy-gtk/empathy-chat.c:976
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "Cách dùng: %s"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "Lệnh lạ"
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "Lệnh lạ, xem /help để biết danh sách lệnh có thể dùng"
-#: ../libempathy-gtk/empathy-chat.c:1278
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr "Không đủ số dư tài khoản để gửi tin nhắn"
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "không thể"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "ngoại tuyến"
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "liên lạc không hợp lệ"
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "không đủ quyền truy cập"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "tin nhắn quá dài"
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "chưa được thực hiện"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "không rõ"
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
-msgstr "Gặp lỗi khi gửi tin nhắn « %s »: %s"
+msgstr "Gặp lỗi khi gửi tin nhắn '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1359 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Không thể gửi tin nhắn: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Chủ đề:"
-#: ../libempathy-gtk/empathy-chat.c:1371
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "Chủ đề được đặt thành: %s"
-#: ../libempathy-gtk/empathy-chat.c:1373
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "Chưa xác định chủ đề"
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(Không có gợi ý)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1940
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Thêm '%s' vào từ điển"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1977
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Thêm '%s' vào từ điển %s"
-#: ../libempathy-gtk/empathy-chat.c:2034
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "Chèn hình cười"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2052
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
msgid "_Send"
msgstr "_Gửi"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "_Gợi ý chính tả"
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "Lỗi nhận bản ghi gần đây"
-#: ../libempathy-gtk/empathy-chat.c:2287
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s đã ngắt kết nối"
@@ -1398,12 +1482,12 @@ msgstr "%s đã ngắt kết nối"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2294
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s đã đá văng %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s đã bị đá"
@@ -1411,17 +1495,17 @@ msgstr "%s đã bị đá"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s đã cấm %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s đã bị cấm"
-#: ../libempathy-gtk/empathy-chat.c:2312
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s rời phòng"
@@ -1431,105 +1515,126 @@ msgstr "%s rời phòng"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2346
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s vào phòng"
-#: ../libempathy-gtk/empathy-chat.c:2371
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s bây giờ là %s"
-#: ../libempathy-gtk/empathy-chat.c:2510
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1666
msgid "Disconnected"
msgstr "Bị ngắt kết nối"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3140
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "Bạn có muốn lưu mật khẩu không?"
-#: ../libempathy-gtk/empathy-chat.c:3146
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "Nhớ"
-#: ../libempathy-gtk/empathy-chat.c:3156
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "Không phải lúc này"
-#: ../libempathy-gtk/empathy-chat.c:3200
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "Thử lại"
-#: ../libempathy-gtk/empathy-chat.c:3204
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "Mật khẩu sai; vui lòng thử lại:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3321
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "Vào phòng này cần mật khẩu:"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "Vào"
-#: ../libempathy-gtk/empathy-chat.c:3518 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
msgid "Connected"
msgstr "Đã kết nối"
-#: ../libempathy-gtk/empathy-chat.c:3571
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
-msgstr "Cuộc nói chuyện"
+msgstr "Cuộc trò chuyện"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "Định danh lạ hoặc không hợp lệ"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "Tạm thời không thể chặn liên lạc"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "Không hỗ trợ chặn liên lạc"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "Không đủ quyền truy cập"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "Không thể chặn liên lạc"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "Thay đổi liên lạc bị chặn"
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Tài khoản:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Liên lạc bị chặn"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Chép địa chỉ liên kết"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "Mở _liên kết"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
@@ -1548,24 +1653,24 @@ msgid "New Contact"
msgstr "Liên lạc mới"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "Chặn %s chứ?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "Bạn có chắc muốn chặn '%s' lần nữa không?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "_Chặn"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "_Thông báo người dùng lạm dụng"
@@ -1590,122 +1695,121 @@ msgstr "Bỏ nhóm"
msgid "Favorite People"
msgstr "Người ưa thích"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
-msgstr "Bạn có thực sự muốn gỡ bỏ nhóm « %s » không?"
+msgstr "Bạn có thực sự muốn bỏ nhóm '%s' không?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "Đang gỡ bỏ nhóm"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2595
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_Bỏ"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr "Bạn thực sự muốn gỡ bỏ liên lạc « %s » không?"
+msgstr "Bạn thực sự muốn bỏ liên lạc '%s' không?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "Đang gỡ bỏ liên lạc"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "Thê_m liên lạc…"
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "_Chặn liên lạc"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Trò chuyện"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
-msgstr "_Gọi (tiếng)"
+msgstr "_Gọi thoại"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
-msgstr "_Gọi (hình)"
+msgstr "_Gọi video"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
-msgstr "_Cuộc nói chuyện trước"
+msgstr "_Cuộc trò chuyện trước"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Gửi tập tin"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Chia sẻ màn hình làm việc"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Ưa thích"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Thôn_g tin"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Sửa"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Mời bạn vào phòng này"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "Mờ_i vào phòng trò chuyện"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "Tìm liên lạc"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "Tìm: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "Thê_m liên lạc"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "Không tìm thấy liên lạc"
@@ -1713,178 +1817,201 @@ msgstr "Không tìm thấy liên lạc"
msgid "Select a contact"
msgstr "Chọn liên lạc"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Họ tên:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Số điện thoại:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Địa chỉ E-mail:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Trang Web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Ngày sinh:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Lần cuối cùng trực tuyến:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Kết nối từ:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Thông điệp khi vắng mặt:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kênh:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "Mã ISO quốc gia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "Quốc gia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Bang:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Thành phố:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Vùng:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "Mã bưu chính:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Đường:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Toà nhà:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Tầng:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Phòng:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Chữ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Mô tả:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Mức chính xác:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Nhiểu:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Nhiễu dọc (mét):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Nhiễu ngang (mét):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Tốc độ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Mang:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Tốc độ leo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Lần cập nhật cuối:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Kinh độ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Vĩ độ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Cao độ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "Vị trí"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y lúc %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Lưu ảnh riêng"
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Không thể lưu ảnh riêng"
@@ -1894,7 +2021,7 @@ msgstr "<b>Vị trí</b> vào (ngày)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Bí danh:"
@@ -1914,7 +2041,7 @@ msgstr "Chi tiết liên lạc"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Nhận diện:"
@@ -1931,84 +2058,90 @@ msgstr "HĐH:"
msgid "Version:"
msgstr "Phiên bản:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Nhóm"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
"Chọn những nhóm nơi bạn muốn liên lạc này xuất hiện; bạn có khả năng chọn "
-"một hay nhiều nhóm, hay không chọn nhóm (≥0 nhóm)."
+"một hay nhiều nhóm hay không chọn nhóm (≥0 nhóm)."
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_Thêm Nhóm"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Chọn"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Nhóm"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "Danh sách sẽ bị chặn:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "Danh sách không thể bị chặn:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "Liên lạc có kết nối"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "Chọn liên lạc để kết nối"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "Xem thử liên lạc mới"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
msgstr "Liên lạc chọn trong danh sách này bên trái sẽ được liên kết với nhau."
#. 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Sửa"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Kết nối liên lạc…"
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "Xoá và _chặn"
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2017,7 +2150,7 @@ msgstr ""
"Bạn có muốn bỏ liên lạc được liên kết '%s' không? Chú ý điều này sẽ bỏ mọi "
"liên lạc hình thành nên liên lạc liên kết này."
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2099,65 +2232,202 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Bỏ liên kết"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Ngày"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Nhật ký"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Hiện"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat ở %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat với %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Cuộc gọi kéo dài %s, kết thúc lúc %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Hôm nay"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Hôm qua"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Bất kỳ lúc nào"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Bất kỳ ai"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Ai"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Khi nào"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Mọi thứ"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
+msgstr "Các cuộc trò chuyện"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Các cuộc gọi"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Cuộc gọi đến"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Cuộc gọi đi"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Cuộc gọi nhỡ"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "Cái gì"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Bạn có chắc bạn muốn xóa nhật ký mọi cuộc trò chuyện trước đây không?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "Dọn sạch"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Xóa từ:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Đang tải...</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Cuộc nói chuyện"
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Gọi"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Tìm tiếp"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Trò chuyện"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Tìm lùi"
+msgid "Delete All History..."
+msgstr "Xóa sạch nhật ký"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Cuộc nói chuyện trước"
+msgid "Profile"
+msgstr "Hồ sơ"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Tìm kiếm"
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_Sửa"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Tập tin"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Tìm:"
+msgid "page 2"
+msgstr "trang 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "ID liên lạc:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "_Trò chuyện"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
-msgstr "Cuộc nói chuyện mới"
+msgstr "Cuộc trò chuyện mới"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
-msgstr "Truyền _hình"
+msgstr "Gửi _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "_Gọi"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Cuộc gọi mới"
@@ -2176,34 +2446,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Thông điệp riêng…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Sửa thông điệp riêng…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "Nhấn để bỏ trạng thái này khỏi danh sách yêu thích"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "Nhấn để chọn trạng thái này là yêu thích"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Đặt trạng thái"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "Đặt hiện diện và trạng thái"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Thông điệp riêng…"
@@ -2216,6 +2486,14 @@ msgstr "Thông điệp riêng…"
msgid "New %s account"
msgstr "Tài khoản %s mới"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Tìm tiếp"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Tìm lùi"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Tìm:"
@@ -2268,35 +2546,38 @@ msgstr "Cuộc gọi tiếng nói gửi đi"
msgid "Voice call ended"
msgstr "Cuộc gọi tiếng nói đã kết thúc"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Nhập dòng trạng thái riêng"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "Sửa dòng trạng thái riêng"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "_Lưu dòng trạng thái mới"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Bỏ"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Dòng trạng thái đã lưu"
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Tin nhắn được chỉnh sửa lúc %s"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+msgid "Normal"
+msgstr "Bình thường"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Cổ điển"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Đơn giản"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Dọn"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Xanh"
@@ -2371,19 +2652,19 @@ msgstr "Nhớ lựa chọn này cho tương lai"
msgid "Certificate Details"
msgstr "Chi tiết chứng nhận"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "Không thể mở địa chỉ URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
msgid "Select a file"
msgstr "Chọn một tập tin"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
msgid "Insufficient free space to save file"
msgstr "Không đủ chỗ để lưu tập tin"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2391,7 +2672,7 @@ msgid ""
msgstr ""
"Cần %s vùng trống để lưu tập tin này nhưng chỉ có %s. Vui lòng chọn chỗ khác."
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
#, c-format
msgid "Incoming file from %s"
msgstr "Tập tin đến từ %s"
@@ -2405,45 +2686,45 @@ msgstr "Miền địa phương hiện có"
#: ../libempathy-gtk/totem-subtitle-encoding.c:165
#: ../libempathy-gtk/totem-subtitle-encoding.c:167
msgid "Arabic"
-msgstr "A Rập"
+msgstr "Tiếng Ả Rập"
#: ../libempathy-gtk/totem-subtitle-encoding.c:170
msgid "Armenian"
-msgstr "Ác-mê-ni"
+msgstr "Tiếng Ác-mê-ni"
#: ../libempathy-gtk/totem-subtitle-encoding.c:173
#: ../libempathy-gtk/totem-subtitle-encoding.c:175
#: ../libempathy-gtk/totem-subtitle-encoding.c:177
msgid "Baltic"
-msgstr "Ban-tích"
+msgstr "Tiếng Ban-tích"
#: ../libempathy-gtk/totem-subtitle-encoding.c:180
msgid "Celtic"
-msgstr "Xen-tơ"
+msgstr "Tiếng Xen-tơ"
#: ../libempathy-gtk/totem-subtitle-encoding.c:183
#: ../libempathy-gtk/totem-subtitle-encoding.c:185
#: ../libempathy-gtk/totem-subtitle-encoding.c:187
#: ../libempathy-gtk/totem-subtitle-encoding.c:189
msgid "Central European"
-msgstr "Vùng Trung Âu"
+msgstr "Ngôn ngữ Trung Âu"
#: ../libempathy-gtk/totem-subtitle-encoding.c:192
#: ../libempathy-gtk/totem-subtitle-encoding.c:194
#: ../libempathy-gtk/totem-subtitle-encoding.c:196
#: ../libempathy-gtk/totem-subtitle-encoding.c:198
msgid "Chinese Simplified"
-msgstr "Tiếng Hoà phổ thông"
+msgstr "Tiếng Hoa giản thể"
#: ../libempathy-gtk/totem-subtitle-encoding.c:201
#: ../libempathy-gtk/totem-subtitle-encoding.c:203
#: ../libempathy-gtk/totem-subtitle-encoding.c:205
msgid "Chinese Traditional"
-msgstr "Tiếng Hoà truyền thống"
+msgstr "Tiếng Hoa phồn thể"
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
-msgstr "Cợ-rô-a-ti-a"
+msgstr "Tiếng Croatia"
#: ../libempathy-gtk/totem-subtitle-encoding.c:211
#: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -2456,75 +2737,75 @@ msgstr "Ki-rin"
#: ../libempathy-gtk/totem-subtitle-encoding.c:224
msgid "Cyrillic/Russian"
-msgstr "Ki-rin/Nga"
+msgstr "Ki-rin/Tiếng Nga"
#: ../libempathy-gtk/totem-subtitle-encoding.c:227
#: ../libempathy-gtk/totem-subtitle-encoding.c:229
msgid "Cyrillic/Ukrainian"
-msgstr "Ki-rin/U-cợr-ainh"
+msgstr "Ki-rin/Tiếng Ucraina"
#: ../libempathy-gtk/totem-subtitle-encoding.c:232
msgid "Georgian"
-msgstr "Gi-oa-gi-a"
+msgstr "Tiếng Gioóc-gia"
#: ../libempathy-gtk/totem-subtitle-encoding.c:235
#: ../libempathy-gtk/totem-subtitle-encoding.c:237
#: ../libempathy-gtk/totem-subtitle-encoding.c:239
msgid "Greek"
-msgstr "tiếng Hy Lạp"
+msgstr "Tiếng Hy Lạp"
#: ../libempathy-gtk/totem-subtitle-encoding.c:242
msgid "Gujarati"
-msgstr "Gu-gia-ra-ti"
+msgstr "Tiếng Gujarati"
#: ../libempathy-gtk/totem-subtitle-encoding.c:245
msgid "Gurmukhi"
-msgstr "Gổ-mu-khi"
+msgstr "Tiếng Gurmukhi"
#: ../libempathy-gtk/totem-subtitle-encoding.c:248
#: ../libempathy-gtk/totem-subtitle-encoding.c:250
#: ../libempathy-gtk/totem-subtitle-encoding.c:252
#: ../libempathy-gtk/totem-subtitle-encoding.c:254
msgid "Hebrew"
-msgstr "Do Thái"
+msgstr "Tiếng Do Thái"
#: ../libempathy-gtk/totem-subtitle-encoding.c:257
msgid "Hebrew Visual"
-msgstr "Do Thái trực quan"
+msgstr "Tiếng Do Thái trực quan"
#: ../libempathy-gtk/totem-subtitle-encoding.c:260
msgid "Hindi"
-msgstr "Hin-đi"
+msgstr "Tiếng Hin-đi"
#: ../libempathy-gtk/totem-subtitle-encoding.c:263
msgid "Icelandic"
-msgstr "Băng Đảo"
+msgstr "Tiếng Aixơlen"
#: ../libempathy-gtk/totem-subtitle-encoding.c:266
#: ../libempathy-gtk/totem-subtitle-encoding.c:268
#: ../libempathy-gtk/totem-subtitle-encoding.c:270
msgid "Japanese"
-msgstr "Nhật"
+msgstr "Tiếng Nhật"
#: ../libempathy-gtk/totem-subtitle-encoding.c:273
#: ../libempathy-gtk/totem-subtitle-encoding.c:275
#: ../libempathy-gtk/totem-subtitle-encoding.c:277
#: ../libempathy-gtk/totem-subtitle-encoding.c:279
msgid "Korean"
-msgstr "Hàn"
+msgstr "Tiếng Hàn Quốc"
#: ../libempathy-gtk/totem-subtitle-encoding.c:282
msgid "Nordic"
-msgstr "Bắc Âu"
+msgstr "Vùng Bắc Âu"
#: ../libempathy-gtk/totem-subtitle-encoding.c:285
msgid "Persian"
-msgstr "Pha-xi"
+msgstr "Tiếng Ba Tư"
#: ../libempathy-gtk/totem-subtitle-encoding.c:288
#: ../libempathy-gtk/totem-subtitle-encoding.c:290
msgid "Romanian"
-msgstr "Rô-ma-ni"
+msgstr "Tiếng Rô-ma-ni"
#: ../libempathy-gtk/totem-subtitle-encoding.c:293
msgid "South European"
@@ -2532,14 +2813,14 @@ msgstr "Vùng Nam Âu"
#: ../libempathy-gtk/totem-subtitle-encoding.c:296
msgid "Thai"
-msgstr "Thái"
+msgstr "Tiếng Thái"
#: ../libempathy-gtk/totem-subtitle-encoding.c:299
#: ../libempathy-gtk/totem-subtitle-encoding.c:301
#: ../libempathy-gtk/totem-subtitle-encoding.c:303
#: ../libempathy-gtk/totem-subtitle-encoding.c:305
msgid "Turkish"
-msgstr "Thổ Nhĩ Kỳ"
+msgstr "Tiếng Thổ Nhĩ Kỳ"
#: ../libempathy-gtk/totem-subtitle-encoding.c:308
#: ../libempathy-gtk/totem-subtitle-encoding.c:310
@@ -2565,11 +2846,11 @@ msgstr "Tiếng Việt"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
msgid "The selected contact cannot receive files."
-msgstr "Liên lạc được chọn không thể nhận tập tin."
+msgstr "Liên lạc này không thể nhận tập tin."
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
msgid "The selected contact is offline."
-msgstr "Liên lạc được chọn đã ngoại tuyến."
+msgstr "Liên lạc này đã ngoại tuyến."
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
msgid "No error message"
@@ -2577,26 +2858,26 @@ msgstr "Không có thông báo lỗi"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
-msgstr "Tin nhắn nhanh (Empathy)"
+msgstr "Nhắn tin (Empathy)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Không kết nối khi khởi chạy"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
"Không hiển thị danh sách liên lạc hoặc các hộp thoại khác khi khởi chạy"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "— Trình gửi tin nhắn Empathy"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Lỗi liên lạc trình quản lý tài khoản"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2641,7 +2922,7 @@ msgstr ""
"không, hãy viết thư cho Tổ Chức Phần Mềm Tự Do,\n"
"Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor,\n"
-"Boston, MA 02110-1301, USA (Mỹ)."
+"Boston, MA 02110-130159, USA (Mỹ)."
#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
@@ -2717,8 +2998,8 @@ msgid ""
"calls."
msgstr ""
"Với Empathy bạn có thể trò chuyện với bạn bè trực tuyến dùng Google Talk, "
-"AIM, Windows Live và các chương trình trò chuyện trực tuyến khác. Với "
-"microphone và webcam, bạn còn có thể thực hiện gọi điện có hình."
+"AIM, Windows Live và các chương trình trò chuyện trực tuyến khác. Với micrô "
+"và webcam, bạn còn có thể thực hiện cuộc gọi thoại hoặc video."
#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
@@ -2746,8 +3027,8 @@ msgid "Select the accounts you want to import:"
msgstr "Chọn tài khoản bạn muốn nhập:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Có"
@@ -2820,34 +3101,34 @@ msgstr "Có vài thay đổi chưa lưu trong tài khoản %s của bạn."
msgid "Your new account has not been saved yet."
msgstr "Tài khoản mới của bạn chưa được lưu."
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:651
msgid "Connecting…"
msgstr "Đang kết nối…"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "Ngoại tuyến - %s"
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "Đứt kết nối - %s"
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "Ngoại tuyến - Không có kết nối mạng"
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "Trạng thái lạ"
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "Ngoại tuyến - Tài khoản bị tắt"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2855,16 +3136,16 @@ msgstr ""
"Bạn sắp tạo tài khoản mới. Việc này sẽ huỷ toàn\n"
"bộ những thay đổi của bạn. Bạn có muốn tiếp tục không?"
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Bạn có thực sự muốn gỡ bỏ %s không?"
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr "Hành động này sẽ xoá tài khoản của bạn khỏi máy chủ."
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2873,15 +3154,15 @@ msgstr ""
"những thay đổi của bạn. Bạn có muốn tiếp tục không?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Bật"
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "_Tắt"
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2890,18 +3171,22 @@ msgstr ""
"đổi của bạn. Bạn có muốn tiếp tục không?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Thêm…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Đang nạp thông tin liên lạc"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Chưa cài đặt giao thức"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Giao thức:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2909,19 +3194,15 @@ msgstr ""
"Để thêm một tài khoản, trước tiên bạn cần phải cài đặt một hậu phương cho "
"mỗi giao thức cần dùng (v.d. IRC, Yahoo)."
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Thêm…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_Nhập…"
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr "— Trình gửi tin nhắn Empathy"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Trình xác thực Empathy"
@@ -2929,94 +3210,116 @@ msgstr "Trình xác thực Empathy"
msgid "People nearby"
msgstr "Người chung quanh"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
-msgstr "— Trình hình/tiếng Empathy"
+msgstr "- Trình khách thoại/video Empathy"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
-msgstr "Trình hình/tiếng Empathy"
+msgstr "Trình khách thoại/video Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "Độ tương phản"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "Độ sáng"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gama (γ)"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
-msgstr "Âm"
+msgstr "Âm lượng"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "Khung _lề"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
-msgstr "Âm vào"
+msgstr "Đầu vào âm thanh"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
-msgstr "Phim vào"
+msgstr "Đầu vào video"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "Vùng quay số"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "Chi tiết"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1005
#, c-format
msgid "Call with %s"
msgstr "Gọi cho %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Gọi"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1249
msgid "The IP address as seen by the machine"
-msgstr "Địa chỉ IP máy thấy"
+msgstr "Địa chỉ IP máy này nhìn thấy"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1251
msgid "The IP address as seen by a server on the Internet"
-msgstr "Địa chỉ IP máy chủ trên Internet thấy"
+msgstr "Địa chỉ IP mà máy chủ trên Internet thấy"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1253
msgid "The IP address of the peer as seen by the other side"
-msgstr "Địa chỉ IP bên kia thấy"
+msgstr "Địa chỉ IP của peer mà bên kia thấy"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1255
msgid "The IP address of a relay server"
msgstr "Địa chỉ IP của máy chuyển tiếp"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1257
msgid "The IP address of the multicast group"
msgstr "Địa chỉ IP của nhóm multicast"
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Không rõ"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
-msgstr "Có kết nối - %d:%02dm"
+msgstr "Đã kết nối - %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1985
msgid "Technical Details"
msgstr "Chi tiết kỹ thuật"
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2023
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3024,15 +3327,17 @@ msgid ""
msgstr ""
"Phần mềm của %s không hiểu bất kỳ định dạng âm thanh nào mà máy bạn hỗ trợ"
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2028
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-"Phần mềm của %s không hiểu bất kỳ định dạng hình ảnh nào mà máy bạn hỗ trợ"
+"Phần mềm của %s không hiểu bất kỳ định dạng video nào mà máy bạn hỗ trợ"
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2034
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3041,23 +3346,27 @@ msgstr ""
"Không thể tạo kết nối đến %s. Có thể một trong số các bạn nằm trong một mạng "
"không hỗ trợ kết nối trực tiếp."
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2040
msgid "There was a failure on the network"
msgstr "Lỗi mạng"
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2044
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Định dạng âm thanh cần thiết cho cuộc gọi này chưa được cài đặt trên máy tính"
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2047
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-"Định dạng hình ảnh cần thiết cho cuộc gọi này chưa được cài đặt trên máy tính"
+"Định dạng video cần thiết cho cuộc gọi này chưa được cài đặt trên máy tính"
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2059
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3068,143 +3377,167 @@ msgstr ""
"<a href=\"%s\">thông báo lỗi này</a> và đính kèm thông tin từ cửa sổ \"Tìm "
"lỗi\" trong menu Trợ giúp."
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2068
msgid "There was a failure in the call engine"
msgstr "Lỗi trong hệ thống gọi"
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2071
msgid "The end of the stream was reached"
msgstr "Đến cuối luồng"
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2111
msgid "Can't establish audio stream"
msgstr "Không thể tạo luồng âm thanh"
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2121
msgid "Can't establish video stream"
-msgstr "Không thể tạo luồng hình ảnh"
+msgstr "Không thể tạo luồng video"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
-msgstr "Tiếng"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Gọi lại lần nữa"
+msgstr "Âm thanh"
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Tắt máy quay"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec giải mã:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Bật máy quay"
+msgid "Disable camera"
+msgstr "Tắt camera"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec giải mã:"
+msgid "Display the dialpad"
+msgstr "Hiện bảng bấm số điện thoại"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Tắt máy quay và ngừng truyền hình"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec mã hoá:"
#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Bật máy quay và truyền hình"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Ngừng cuộc gọi"
#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Bật máy quay nhưng không truyền hình"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Chấm dứt cuộc gọi hiện tại"
#: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Codec mã hoá:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Ứng cử viên cục bộ:"
#: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Ngừng nói"
+msgid "Maximise me"
+msgstr "Phóng to"
#: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Chấm dứt cuộc gọi hiện tại"
+msgid "Minimise me"
+msgstr "Thu nhỏ"
#: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Ứng cử viên cục bộ:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Ứng cử viên ở xa:"
#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Xem trước"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Truyền tiếng"
#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Gọi lại"
+msgid "Send Video"
+msgstr "Truyền video"
#: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Ứng cử viên ở xa:"
+msgid "Show dialpad"
+msgstr "Hiện bảng bấm số điện thoại"
#: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Truyền tiếng"
+msgid "Start a video call"
+msgstr "Thực hiện cuộc video"
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Thực hiện cuộc gọi thoại"
+
+#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Bật/tắt truyền tiếng"
#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Hình"
+msgid "Toggle video transmission"
+msgstr "Bật/tắt truyền video"
#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Hình"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Tắt hình"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1621 ../src/empathy-call-window.c:1622
+#: ../src/empathy-call-window.c:1623 ../src/empathy-call-window.c:1624
+msgid "Unknown"
+msgstr "Không rõ"
#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Bật hình"
+msgid "Video call"
+msgstr "Gọi video"
#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Xem trước"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Gọi"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Microphone"
+msgstr "_Micrô"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Xem"
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d chưa đọc)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (và %u nữa)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d chưa đọc từ người khác)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d chưa đọc tất cả)"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Đang gửi %d tin nhắn"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Đang gõ tin nhắn."
@@ -3216,10 +3549,6 @@ msgstr "_Dọn"
msgid "C_ontact"
msgstr "_Liên lạc"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Trò chuyện"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "_Chèn hình cười"
@@ -3240,27 +3569,23 @@ msgstr "Dời thẻ sang _phải"
msgid "Notify for All Messages"
msgstr "Thông báo với mọi tin nhắn"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "Mụ_c lục"
#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
-msgstr "_Cuộc nói chuyện"
+msgstr "_Cuộc trò chuyện"
#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "Gỡ _ra thẻ"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Sửa"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "Phòng trò chuyện ư_a thích"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "Trợ g_iúp"
@@ -3284,15 +3609,15 @@ msgstr "_Thẻ"
msgid "_Undo Close Tab"
msgstr "_Phục hồi đóng thẻ"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Tên"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Phòng"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Tự động kết nối"
@@ -3300,90 +3625,95 @@ msgstr "Tự động kết nối"
msgid "Manage Favorite Rooms"
msgstr "Quản lý phòng ưa thích"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
-msgstr "Cuộc gọi hình đến"
+msgstr "Cuộc gọi video đến"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Cuộc gọi gửi đến"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s đang gọi (hình). Bạn có muốn trả lời không?"
+msgstr "%s đang gọi video. Bạn có muốn trả lời không?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s đang gọi. Vạn có muốn đáp ứng không?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Cuộc gọi gửi đến từ %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_Từ chối"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "T_rả lời"
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_Trả lời có video"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
-msgstr "Cuộc gọi gửi đến từ %s"
+msgstr "Cuộc gọi video gửi đến từ %s"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Mời vào phòng"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Mời tham gia %s"
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s mời bạn tham gia %s"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_Từ chối"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
-msgstr "_Vào"
+msgstr "_Tham gia"
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s đã mời bạn tham gia %s"
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Bạn được mời tham gia %s"
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Tập tin gửi đến từ %s"
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Cần mật khẩu"
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s muốn được phép thấy bạn khi trực tuyến"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3393,105 +3723,101 @@ msgstr ""
" Thông điệp: %s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Không rõ"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s trên %s, %s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s trên %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
-msgstr "Đang nhận « %s » từ %s"
+msgstr "Đang nhận \"%s\" từ %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
-msgstr "Đang gửi « %s » cho %s"
+msgstr "Đang gửi \"%s\" cho %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Lỗi nhận \"%s\" từ %s"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Lỗi nhận tập tin"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Lỗi gửi \"%s\" đến %s"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Lỗi gửi tập tin"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
-msgstr "« %s » được nhận từ %s"
+msgstr "\"%s\" được nhận từ %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
-msgstr "« %s » được gửi cho %s"
+msgstr "\"%s\" được gửi cho %s"
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Hoàn tất truyền tập tin"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Đang đợi trả lời từ bên kia"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Đang kiểm tra tính toàn vẹn của \"%s\""
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
-msgstr "Đang tính mã nhận dạng cho \"%s\""
-
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
+msgstr "Đang tính mã hash cho \"%s\""
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Tập tin"
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Còn lại"
@@ -3502,7 +3828,8 @@ msgstr "Truyền tập tin"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr ""
-"Gỡ bỏ khỏi danh sách các việc truyền tập tin là hoàn tất, bị thôi hay bị lỗi"
+"Xóa bỏ những lần truyền tập tin đã hoàn tất, bị ngừng hay bị lỗi khỏi danh "
+"sách"
#: ../src/empathy-import-dialog.c:84
msgid ""
@@ -3510,7 +3837,7 @@ msgid ""
"importing accounts from Pidgin."
msgstr ""
"Không tìm thấy tài khoản có thể nhập vào. Trình Empathy hiện thời chỉ hỗ trợ "
-"chức năng nhập tài khoản từ Pidgin (đã Gaim)."
+"chức năng nhập tài khoản từ Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -3529,39 +3856,55 @@ msgstr "Giao thức"
msgid "Source"
msgstr "Nguồn"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "Cung cấp mật khẩu"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Ngắt kết nối"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Không tìm thấy"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Tái kết nối"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Sửa tài khoản"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Đóng"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Nạp tiền %s (%s)"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Nạp tiền vào tài khoản"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "Nạp tiền..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "Liên lạc"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
msgstr "Danh sách Liên lạc"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "Hiện và sửa tài khoản"
@@ -3570,86 +3913,90 @@ msgid "Contacts on a _Map"
msgstr "Liên lạc trên _bản đồ"
#: ../src/empathy-main-window.ui.h:2
-msgid "Find in Contact _List"
-msgstr "Tìm trong danh sách liên lạc"
+msgid "Credit Balance"
+msgstr "Cân bằng tín dụng"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Tìm trong _danh sách liên lạc"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "_Vào Ưa thích"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Quản lý Ưa thích"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "Cỡ _thường"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "_Cuộc gọi mới…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
-msgstr "Ảnh riêng cỡ _thường"
+msgstr "Cỡ _thường có ảnh đại diện"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "_Tùy thích"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "_Hiện giao thức"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sắp theo tê_n"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
-msgstr "Sắp theo _tình trạng"
+msgstr "Sắp theo _trạng thái"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Tài khoản"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "Liên lạc bị _chặn"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "Cỡ _gọn"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "_Tìm lỗi"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Truyền tập tin"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "_Tham gia…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Cuộc nói chuyện mới…"
+msgstr "_Cuộc trò chuyện mới…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "Liên lạc ng_oại tuyến"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "T_hông tin cá nhân"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Phòng"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "_Tìm liên lạc…"
@@ -3663,7 +4010,7 @@ msgstr "Thành viên"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3676,18 +4023,18 @@ msgstr ""
"Cần mật khẩu: %s\n"
"Thành viên: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Không"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Không thể lấy danh sách phòng"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
-msgstr "Không thể ngừng danh sách phòng"
+msgstr "Không thể ngừng lấy danh sách phòng"
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "Couldn't load room list"
@@ -3719,39 +4066,79 @@ msgstr "Danh sách phòng"
msgid "_Room:"
msgstr "_Phòng:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "Nhận được tin nhắn"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
-msgstr "tin nhắn được gửi"
+msgstr "Tin nhắn được gửi"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
-msgstr "Cuộc trao đổi mới"
+msgstr "Cuộc trò chuyện mới"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "Liên lạc mới trực tuyến"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "Liên lạc mới ngoại tuyến"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "Tài khoản đã kết nối"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "Tài khoản bị ngắt kết nối"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "Ngôn ngữ"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:719
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:732
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ôi Romeo, Romeo, tại sao chàng lại là Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:735
+msgid "Deny thy father and refuse thy name;"
+msgstr "Chàng hãy khước từ cha và vứt bỏ tên họ ấy đi"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:738
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Nếu không thể thì chàng hãy thề yêu em"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "And I'll no longer be a Capulet."
+msgstr "Và em sẽ không còn là người nhà Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:744
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Ta nên nghe thêm hay ta nên mở lời?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "Juliet has disconnected"
+msgstr "Juliet đã ngắt kết nối"
+
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "Tùy thích"
@@ -3759,67 +4146,75 @@ msgstr "Tùy thích"
msgid "Appearance"
msgstr "Diện mạo"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Ứng xử"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "_Sắc thái trò chuyện: "
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "Tắt thông báo khi vắng mặt h_ay bận"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "Tắt phát âm khi vắng mặt h_ay bận"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "Hiện sự kiện đến trong vùng trạng thái"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "Bật thông báo khi liên lạc trực tuyến"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "Bật thông báo khi liên lạc ngoại tuyến"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "Thông báo khi _cửa sổ trò chuyện không có tiêu điểm"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "Bật kiểm tra chính tả cho ngôn ngữ:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "Chung"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Mức đầu vào"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Âm lượng vào"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "Nguồn vị trí:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "Ghi lại cuộc trò chuyện"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Thông báo"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Phát âm về sự kiện"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "Riêng tư"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -3828,23 +4223,23 @@ msgstr ""
"Giảm độ chính xác nghĩa là chỉ công bố vị trí của bạn đến mức thành phố, "
"bang và quốc gia. Toạ độ GPS có thể chính xác đến 1 chữ số."
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "HIện _hình cười dạng ảnh"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "_Hiện danh sách liên lạc trong phòng"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Âm thanh"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "Kiểm tra chính tả"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -3852,44 +4247,48 @@ msgstr ""
"Danh sách ngôn ngữ này phản ánh chỉ những ngôn ngữ cho mà bạn đã cài đặt từ "
"điển."
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "Sắc thái"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Biến thể:"
+
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "Tự động kết nối khi khởi _chạy"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "Điện thoại _di đông"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "_Bật thông báo trong bóng"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "_Phát âm thông báo"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "_Mạng (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "Mở cuộc trò chuyện mới tr_ong cửa sổ riêng"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Công bố vị trí cho bạn bè tôi"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "_Giảm độ chính xác vị trí"
@@ -3901,7 +4300,55 @@ msgstr "Trạng thái"
msgid "_Quit"
msgstr "T_hoát"
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Gọi lại lần nữa"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Tắt máy quay"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Bật máy quay"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Tắt máy quay và ngừng truyền video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Bật máy quay và truyền video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Bật máy quay nhưng không truyền video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Xem trước"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Gọi lại"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_Video"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Tắt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Bật video"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Xem trước"
+
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Xem bản đồ danh sách"
@@ -3919,7 +4366,7 @@ msgstr "Tạm ngừng"
#: ../src/empathy-debug-window.c:1488
msgid "Level "
-msgstr "Cấp "
+msgstr "Mức "
#: ../src/empathy-debug-window.c:1508
msgid "Debug"
@@ -3959,7 +4406,7 @@ msgstr "Phân loại"
#: ../src/empathy-debug-window.c:1564
msgid "Level"
-msgstr "Cấp"
+msgstr "Mức"
#: ../src/empathy-debug-window.c:1601
msgid ""
@@ -3967,16 +4414,16 @@ msgid ""
"extension."
msgstr "Trình quản lý kết nối được chọn không hỗ trợ tìm lỗi từ xa"
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "Mời người tham gia"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
msgstr "Chọn liên lạc muốn mời trò chuyện:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "Mời"
@@ -4016,37 +4463,102 @@ msgstr "Trình gỡ lỗi Empathy"
msgid "- Empathy Chat Client"
msgstr "— Trình trò chuyện Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "Trả lời"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Từ chối"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Trả lời"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Trả lời cuộc gọi có video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Từ chối"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Chấp nhận"
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Nhỡ cuộc gọi từ %s"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Cung cấp"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
-msgstr "%s vừa mới gọi nhưng bạn có một cuộc gọi khác."
+msgstr "%s vừa mới gọi nhưng bạn lại đang nghe một cuộc gọi khác."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:558 ../src/empathy-call-window.c:572
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1012
+#, c-format
+msgid "Call with %d participants"
+msgstr "Gọi cho %d người"
+
+#: ../src/empathy-call-window.c:1914
+msgid "On hold"
+msgstr "Giữ máy"
+
+#: ../src/empathy-call-window.c:1917
+msgid "Mute"
+msgstr "Câm"
+
+#: ../src/empathy-call-window.c:1919
+#| msgid "Location"
+msgid "Duration"
+msgstr "Khoảng thời gian"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:1922
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Phân biệt hoa thường"
+
+#~ msgid "All"
+#~ msgstr "Tất cả"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Bật"
+
+#~ msgid "Date"
+#~ msgstr "Ngày"
+
+#~ msgid "Conversations"
+#~ msgstr "Cuộc nói chuyện"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Cuộc nói chuyện trước"
+
+#~ msgid "_For:"
+#~ msgstr "_Tìm:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Nhập dòng trạng thái riêng"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "_Lưu dòng trạng thái mới"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Dòng trạng thái đã lưu"
#~| msgid "Send and receive instant messages"
#~ msgid "Send and receive messages"
@@ -4061,9 +4573,6 @@ msgstr "%s vừa mới gọi nhưng bạn có một cuộc gọi khác."
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "Đã nhập tài khoản MC 4."
-#~ msgid "Salut account is created"
-#~ msgstr "Tài khoản Salut được tạo"
-
#~ msgid ""
#~ "Whether or not Empathy has asked about importing accounts from other "
#~ "programs."
@@ -4163,9 +4672,6 @@ msgstr "%s vừa mới gọi nhưng bạn có một cuộc gọi khác."
#~ msgid "_Next"
#~ msgstr "_Tiếp"
-#~ msgid "Accounts"
-#~ msgstr "Tài khoản"
-
#~ msgid "Add new"
#~ msgstr "Thêm mới"
@@ -4237,9 +4743,6 @@ msgstr "%s vừa mới gọi nhưng bạn có một cuộc gọi khác."
#~ msgid "_Check Word Spelling..."
#~ msgstr "_Kiểm tra chính tả từ..."
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Chủ đề:</b>"
-
#~ msgid "Group Chat"
#~ msgstr "Trò chuyện nhóm"
@@ -4410,6 +4913,3 @@ msgstr "%s vừa mới gọi nhưng bạn có một cuộc gọi khác."
#~ msgid "Show _avatars"
#~ msgstr "Hiện ảnh _riêng"
-
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Hiện danh sách liên lạc tó_m gọn"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6312c3cbf..5123b90f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,13 +23,14 @@ 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: 2011-06-24 20:23+0000\n"
-"PO-Revision-Date: 2011-06-26 09:47+0000\n"
-"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2011-07-30 17:16+0000\n"
+"PO-Revision-Date: 2011-07-31 18:08+0000\n"
+"Last-Translator: Julius Wong <villahwong@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
@@ -53,395 +54,403 @@ msgid "Always open a separate chat window for new chats."
msgstr "总是为新聊天打开单独的聊天窗口。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#, fuzzy
+msgid "Call volume"
+msgstr "来电:%s"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "聊天窗口主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "聊天窗口主题衍生"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "在状态栏显示呼入事件。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空闲时是否自动离开"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天使用 Adium 主题,使用 Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "当联系人登录时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "当联系人注销时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
msgstr "在联系人列表中显示余额"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "聊天窗口边栏的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天窗口边栏保存的位置(像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
#, fuzzy
-#| msgid "The theme 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.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的帐户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit 开发工具,例如 Web Inspector 是否应该启用。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用连接管理器自动断开连接或重新连接。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为表情图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "是否需要事件提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否为外出消息使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示余额。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "当离开或忙碌时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示协议。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "是否以紧凑模式显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
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.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "是否对聊天室使用主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -476,7 +485,7 @@ msgstr "所选文件是非正常的文件"
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
#, c-format
msgid "Missed call from %s"
msgstr "未接来电:%s"
@@ -484,7 +493,6 @@ msgstr "未接来电:%s"
#. Translators: this is an outgoing call, e.g. 'Called Alice'
#: ../libempathy/empathy-message.c:417
#, c-format
-#| msgid "Call with %s"
msgid "Called %s"
msgstr "与 %s 通话"
@@ -521,161 +529,161 @@ msgstr "当传输这个文件的时候发生错误"
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "离线"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:224
msgctxt "presence"
msgid "Unknown"
msgstr "未知"
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "加密不可用"
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "证书无效"
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "连接被拒绝"
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "无法建立连接"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "连接已丢失"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "该资源已被连接至服务器"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "连接已被使用相同资源的新连接取代"
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "服务器太忙,无法处理当前连接"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "证书已被吊销"
# lainme:证书使用不安全的加密算法或是弱加密的
# xslidian:证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "证书使用不安全的加密算法或者是弱加密的"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:348
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:544
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -721,70 +729,70 @@ msgstr "将来"
#: ../libempathy-gtk/empathy-account-chooser.c:539
#, fuzzy
-#| msgid "Accounts"
msgid "All accounts"
msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "密码"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帐户通过我的网络帐户进行了编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帐户无法在 Empathy 中编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "启动我的网络帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -793,19 +801,19 @@ msgstr "取消(_N)"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 中的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "%s 帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "新建帐户"
@@ -817,6 +825,7 @@ msgstr "<b>例如:</b> 我的屏幕名称"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -959,43 +968,49 @@ msgstr "选项"
msgid "None"
msgstr "无"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "字符集:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "网络"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "网络:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "昵称:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "密码:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "退出消息:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "真名:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "您的 IRC 昵称是什么?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "哪个 IRC 网络?"
@@ -1256,7 +1271,6 @@ msgid "The specified contact doesn't support calls"
msgstr "选择的联系人不支持呼叫"
#: ../libempathy-gtk/empathy-call-utils.c:51
-#| msgid "The selected contact is offline."
msgid "The specified contact is offline"
msgstr "选择的联系人离线"
@@ -1266,67 +1280,65 @@ msgstr "选择的联系人无效"
#: ../libempathy-gtk/empathy-call-utils.c:55
#, fuzzy
-#| msgid "Topic not supported on this conversation"
msgid "Emergency calls are not supported on this protocol"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, fuzzy, c-format
-#| msgid "invalid contact"
msgid "“%s” is not a valid contact ID"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>:设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]:当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>:在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>:向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1335,124 +1347,124 @@ msgstr ""
"/say <消息>:发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]:显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令,请使用 /help 查阅可用命令"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "余额不足,无法发送消息"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "做不到"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "发送消息出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "话题:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "添加“%s”到字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-chat.c:2224
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1460,12 +1472,12 @@ msgstr "%s 已断开连接"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1473,17 +1485,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1493,94 +1505,94 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1869
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1261
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "对话"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (短信)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "未知或无效的识别符"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "联系人屏蔽暂时不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "联系人屏蔽不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
@@ -1595,15 +1607,20 @@ msgstr "编辑屏蔽的联系人"
msgid "Account:"
msgstr "帐户:"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "已屏蔽的联系人(_B)"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "打开链接(_O)"
@@ -1710,48 +1727,48 @@ msgid "_Block Contact"
msgstr "屏蔽联系人"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "发送文件"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "共享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "收藏"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "信息(_M)"
@@ -1761,13 +1778,13 @@ msgid "_Edit"
msgstr "编辑(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
@@ -1823,13 +1840,11 @@ msgstr "生日:"
#.
#: ../libempathy-gtk/empathy-contact-widget.c:346
#, fuzzy
-#| msgid "_Last Name:"
msgid "Last seen:"
msgstr "姓(_L):"
#: ../libempathy-gtk/empathy-contact-widget.c:348
#, fuzzy
-#| msgid "Connected"
msgid "Connected from:"
msgstr "已连接"
@@ -1838,13 +1853,11 @@ msgstr "已连接"
#.
#: ../libempathy-gtk/empathy-contact-widget.c:353
#, fuzzy
-#| msgid "Quit message:"
msgid "Away message:"
msgstr "退出消息:"
#: ../libempathy-gtk/empathy-contact-widget.c:606
#, fuzzy
-#| msgid "Ca_ncel"
msgid "Channels:"
msgstr "取消(_N)"
@@ -1972,7 +1985,7 @@ msgstr "海拔:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "位置"
@@ -2095,25 +2108,25 @@ 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "短信(_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "绑定联系人(_L)…"
@@ -2204,7 +2217,7 @@ msgid ""
"Are you sure you want to unlink these linked contacts? This will completely "
"split the linked contacts into separate contacts."
msgstr ""
-"你确定你要接触这些已绑定的联系人?这将会完全拆分已绑定的联系人为单独的联系"
+"您确定您要接触这些已绑定的联系人?这将会完全拆分已绑定的联系人为单独的联系"
"人。"
#: ../libempathy-gtk/empathy-linking-dialog.c:190
@@ -2212,132 +2225,135 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解除绑定(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:416
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "历史"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "显示"
-#: ../libempathy-gtk/empathy-log-window.c:438
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "搜索"
-#: ../libempathy-gtk/empathy-log-window.c:669
-#: ../libempathy-gtk/empathy-log-window.c:833
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, fuzzy, c-format
+msgid "Chat in %s"
+msgstr "与 %s 通话"
-#: ../libempathy-gtk/empathy-log-window.c:671
+#: ../libempathy-gtk/empathy-log-window.c:948
#, fuzzy, c-format
msgid "Chat with %s"
msgstr "与 %s 通话"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+#, fuzzy
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %B %d %Y"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:790
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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:796
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, fuzzy, c-format
-#| msgid "<b>Topic:</b>"
msgid "<b>%s:</b> %s"
msgstr "<b>话题:</b>"
-#: ../libempathy-gtk/empathy-log-window.c:852
-#: ../libempathy-gtk/empathy-log-window.c:854 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:861
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通话时长:%s,结束于 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1188
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "今天"
-#: ../libempathy-gtk/empathy-log-window.c:1192
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "昨天"
-#: ../libempathy-gtk/empathy-log-window.c:1208
+#: ../libempathy-gtk/empathy-log-window.c:1556
#, fuzzy
-#| msgid "%A %B %d %Y"
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1289
-#: ../libempathy-gtk/empathy-log-window.c:2729
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:1361
-#: ../libempathy-gtk/empathy-log-window.c:1705
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
#, fuzzy
-#| msgid "None"
msgid "Anyone"
msgstr "无"
-#: ../libempathy-gtk/empathy-log-window.c:1985
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2189
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2305
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2307
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "文本聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2309
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
#, fuzzy
-#| msgid "Call"
msgid "Calls"
msgstr "通话"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "来电"
-#: ../libempathy-gtk/empathy-log-window.c:2315
+#: ../libempathy-gtk/empathy-log-window.c:2781
#, fuzzy
-#| msgid "Outgoing voice call"
msgid "Outgoing calls"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "未接来电"
-#: ../libempathy-gtk/empathy-log-window.c:2337
+#: ../libempathy-gtk/empathy-log-window.c:2804
#, fuzzy
-#| msgid "Chat"
msgid "What"
msgstr "聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3506
#, fuzzy
-#| msgid "Are you sure you want to block '%s' from contacting you again?"
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "确定要屏蔽 %s 以阻止他再次联系您吗?"
-#: ../libempathy-gtk/empathy-log-window.c:2970
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "全部清除"
-#: ../libempathy-gtk/empathy-log-window.c:2977
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr ""
@@ -2348,7 +2364,8 @@ msgstr ""
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "通话"
@@ -2358,15 +2375,15 @@ msgid "Chat"
msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "History"
-msgstr "历史"
+msgid "Delete All History..."
+msgstr ""
#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Profile"
-msgstr ""
+msgstr "个人信息"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "视频"
@@ -2399,17 +2416,17 @@ msgid "New Conversation"
msgstr "新建对话"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "发送视频(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "通话(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "新建通话"
@@ -2452,7 +2469,7 @@ msgstr "设置状态"
#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
-msgstr "设置你的状态信息和现在的状态"
+msgstr "设置您的状态信息和现在的状态"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1131
@@ -2534,18 +2551,17 @@ msgstr "编辑自定义状态"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
#, fuzzy
-#| msgid "_Remove"
msgid "Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, fuzzy, c-format
-#| msgid "Message received"
msgid "Message edited at %s"
msgstr "收到了消息"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "普通"
@@ -3096,7 +3112,7 @@ msgid "Your new account has not been saved yet."
msgstr "您的新帐户还没有保存。"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "正在连接..."
@@ -3160,7 +3176,6 @@ msgstr "您将要关闭此窗口,所做的修改将作废。您确定要继续
#: ../src/empathy-accounts-dialog.ui.h:1
#, fuzzy
-#| msgid "_Add…"
msgid "Add…"
msgstr "添加(_A)..."
@@ -3198,162 +3213,157 @@ msgstr "Empathy 认证客户端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy 语音/视频客户端"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy 语音/视频客户端"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "电话键盘"
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "详细信息"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet 上服务器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "另一方所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "未知"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, 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-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3363,150 +3373,129 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>,并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
msgstr "不能建立视频流"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "音频"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "再次呼叫联系人"
-
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相机关闭"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相机开启"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "解码器:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "禁用相机停止发送视频"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "启用相机,并发送视频"
+#: ../src/empathy-call-window.ui.h:4
+#, fuzzy
+msgid "Disable camera"
+msgstr "禁用(_D)"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "启用相机,但不发送视频"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "显示拨号盘"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "编码器:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "挂起"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "挂起当前呼叫"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "本地候选:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "预览"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr ""
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "重拨"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr ""
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "远程候选:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "发送音频"
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+msgid "Send Video"
+msgstr "发送视频(_V)"
+
+#: ../src/empathy-call-window.ui.h:15
+#, fuzzy
+msgid "Show dialpad"
+msgstr "电话键盘"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "开始视频通话"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "开始音频通话"
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "切换音频传输"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
+#, fuzzy
+msgid "Toggle video transmission"
+msgstr "切换音频传输"
+
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "视频(_I)"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "视频关闭"
-
#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "视频开启"
+#, fuzzy
+msgid "Video call"
+msgstr "视频呼叫(_V)"
#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "视频预览"
-
-#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "通话(_C)"
-#: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "电话键盘"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "查看(_V)"
@@ -3617,15 +3606,15 @@ msgstr "标签(_T)"
msgid "_Undo Close Tab"
msgstr "撤销关闭标签(_U)"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "名称"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "聊天室"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "自动连接"
@@ -3633,95 +3622,95 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 视频来电。您想要接听吗?"
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
msgid "_Answer with video"
msgstr ""
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "邀请您加入 %s"
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀请加入 %s"
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
-msgstr "%s 当你在线的时候可见"
+msgstr "%s 当您在线的时候可见"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -4067,79 +4056,79 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "帐户已连接"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "帐户已断开"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "语言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "朱立叶"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "罗密欧"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:738
msgid "Or if thou wilt not, be but sworn my love"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:744
msgid "Shall I hear more, or shall I speak at this?"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "朱立叶已断开连接"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "首选项"
@@ -4147,67 +4136,75 @@ msgstr "首选项"
msgid "Appearance"
msgstr "外观"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "行为"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "聊天主题(_E):"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "离开或忙碌时禁用提示(_A)"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "离开或忙碌时禁用声音(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "再提示区域显示呼入事件"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "当联系人上线时允许提示"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "当联系人离线时允许提示"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "当会话闲置时允许提示"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "允许拼写检查的语言:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "常规"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "输入音量"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "位置来源:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "记录对话"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "提示"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "播放事件声音"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "隐私"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4216,72 +4213,71 @@ msgstr ""
"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
"将精确到一位小数。 "
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "显示表情符号为图形(_S)"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "在聊天室显示联系人列表(_L)"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "声音"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "语言列表仅反映已安装的字典"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "主题"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
#, fuzzy
-#| msgid "Theme Variant:"
msgid "Variant:"
msgstr "主题变量:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "启动时自动连接(_A) "
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "手机(_C)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "允许气泡通知(_E)"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "启用声音通知(_E)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "网络(_N)(IP,Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天(_O)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
@@ -4293,6 +4289,54 @@ msgstr "状态"
msgid "_Quit"
msgstr "退出(_Q)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "相机关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "相机开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "启用相机,并发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "启用相机,但不发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "预览"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "重拨"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "视频关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "视频开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "视频预览"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "联系地图视图"
@@ -4421,7 +4465,7 @@ msgstr "接听"
#: ../src/empathy-notifications-approver.c:227
msgid "Answer with video"
-msgstr ""
+msgstr "以视频应答"
#: ../src/empathy-notifications-approver.c:235
#: ../src/empathy-notifications-approver.c:245
@@ -4437,25 +4481,29 @@ msgstr "接受"
msgid "Provide"
msgstr "提供"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1005
#, fuzzy, c-format
-#| msgid "Call with %s"
msgid "Call with %d participants"
msgstr "与 %s 通话"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:1904
#, fuzzy, c-format
-#| msgid "Connected — %d:%02dm"
msgid "%s — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:1905
msgid "On hold"
msgstr ""
@@ -4463,6 +4511,10 @@ msgstr ""
msgid "_Match case"
msgstr "区分大小写(_M)"
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "电话键盘"
+
#~ msgid "All"
#~ msgstr "全部"
@@ -4631,7 +4683,7 @@ msgstr "区分大小写(_M)"
#~ msgid ""
#~ "An invitation was offered for service %s, but you don't have the needed "
#~ "application to handle it"
-#~ msgstr "一个由 %s 服务提供邀请,但是你不需要应用程序处理它"
+#~ msgstr "一个由 %s 服务提供邀请,但是您不需要应用程序处理它"
#~ msgid "Can't set an empty display name"
#~ msgstr "无法设置为空显示名称"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 516a060b3..5d8ad5fe6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 3.1.2\n"
+"Project-Id-Version: empathy 3.1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-02 06:35+0800\n"
-"PO-Revision-Date: 2011-07-02 06:35+0800\n"
+"POT-Creation-Date: 2011-07-29 16:08+0800\n"
+"PO-Revision-Date: 2011-07-29 16:09+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"Language: zh_TW\n"
@@ -40,397 +40,403 @@ msgid "Always open a separate chat window for new chats."
msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#, fuzzy
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "%s 的來電"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在羣組聊天中使用網名補齊 (tab) 時要加到網名之後的字符。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "聊天視窗佈景主題"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "聊天視窗佈景主題樣式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "精簡聯絡人清單"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "使用連線管理程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "聯絡人清單排序準則"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "用來選擇大頭貼圖片的預設目錄"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "當狀態為離開時停用彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "當狀態為離開時停用音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "在狀態區域顯示收到事件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接呈現給使用者。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy 可以發布使用者的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 可以利用 GPS 來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 可以利用流動電話網絡基地臺來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 可以利用網絡來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Empathy 預設下載資料夾"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已轉移 butterfly 日誌"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy 當閒置時應該自動設為離開"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 啟動時自動連線"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy 應降低位置的準確度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 要使用聯絡人的大頭貼做為聊天視窗圖示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "啟用 WebKit 開發者工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "啟用新訊息的彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "啟用拼字檢查程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "隱藏主視窗"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "隱藏主視窗。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "網名補齊字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "在個別視窗開啟新的聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "要使用的 Adium 佈景主題路徑"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "收到訊息時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "當開啟新的談話時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "送出訊息時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "當聯絡人登入時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "當有聯絡人登出時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "當我們登入時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "當我們登出時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天視窗失去焦點則彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "當聯絡人登入時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "當聯絡人登出時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-#, fuzzy
-#| msgid "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
-msgstr "於聯絡人清單內顯示"
+msgstr "於聯絡人清單內顯示餘額"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "在聊天室顯示聯絡人清單"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "關閉主視窗時顯示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "顯示離線聯絡人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "上次選擇大頭貼圖片的目錄。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "聊天視窗側窗格的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用來顯示在聊天視窗中談話的佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "在聊天室使用佈景主題"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy 是否使用 GPS 來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy 是否使用流動電話網絡來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy 是否使用網絡來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否應轉移 butterfly 日誌。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Empathy 是否基於私隱的理由減低位置的準確度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用連線管理程式自動斷線或重新連線。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否以你設定的語言檢查輸入有無錯字。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "是否將談話中的表情符號轉換為圖片形式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否播放音效來通知有聯絡人登入網絡。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否播放音效來通知有聯絡人登出網絡。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "是否播放音效來通知有事件發生。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否播放音效來通知有收到訊息。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否播放音效來通知新的談話。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否播放音效來通知有送出訊息。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "當登入某網絡時是否播放音效。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "當登出某網絡時是否播放音效。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "當聯絡人離線時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "當聯絡人上線時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "當收到新訊息時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-#, fuzzy
-#| msgid "Whether to show protocols for contacts in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
-msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
+msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室中顯示聯絡人清單。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "是否以精簡模式顯示聯絡人清單。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
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.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "是否為聊天室使用佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -707,66 +713,67 @@ msgstr "未來"
msgid "All accounts"
msgstr "所有帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帳號已透過我的網絡帳號修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帳號無法於 Empathy 內修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "啟動我的網絡帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "登入(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -775,19 +782,19 @@ msgstr "取消(_N)"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 上的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "新增帳號"
@@ -799,6 +806,7 @@ msgstr "<b>範例:</b>MyScreenName"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -941,43 +949,49 @@ msgstr "選項"
msgid "None"
msgstr "無"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "字集:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "網絡"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "網絡:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "網名:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "密碼:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "離開訊息:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "真實姓名:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "你的 IRC 網名是?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "哪個 IRC 網絡?"
@@ -1248,187 +1262,185 @@ msgstr "指定的聯絡人無效"
msgid "Emergency calls are not supported on this protocol"
msgstr "此協定不支援緊急通話功能"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "開啟私人聊天失敗"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "「%s」不是有效的聯絡人 ID"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/part [<聊天室 ID>] [<原因>]:離開聊天室,預設為目前的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>:更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <聯絡人 ID>:顯示聯絡人的相關資訊"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
-#, fuzzy
-#| msgid "Insufficient free space to save file"
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
-msgstr "空間不足以儲存檔案"
+msgstr "餘額不足以傳送訊息"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "無法"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤:%s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "傳送訊息時發生錯誤:%s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(沒有建議)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "加入「%s」至字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "加入「%s」至 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-chat.c:2224
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "傳送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1436,12 +1448,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1449,17 +1461,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1469,69 +1481,69 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經參加此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "已斷線"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "你想要儲存此密碼?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "記住"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "現在不要"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "參加"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "談話"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1572,20 +1584,18 @@ msgid "Account:"
msgstr "帳號:"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
-#| msgid "_Blocked Contacts"
msgid "Blocked Contacts"
msgstr "被封鎖的聯絡人"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "開啟連結(_O)"
@@ -1692,48 +1702,48 @@ msgid "_Block Contact"
msgstr "封鎖聯絡人(_B)"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "傳送檔案"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "分享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "喜好"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "資訊(_M)"
@@ -1743,13 +1753,13 @@ msgid "_Edit"
msgstr "編輯(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1946,7 +1956,7 @@ msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "位置"
@@ -2069,25 +2079,25 @@ 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
@@ -2183,119 +2193,128 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:419
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "歷史"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "顯示"
-#: ../libempathy-gtk/empathy-log-window.c:441
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "搜尋"
-#: ../libempathy-gtk/empathy-log-window.c:676
-#: ../libempathy-gtk/empathy-log-window.c:840
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%Y %B %d %A"
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "於 %s 內聊天"
-#: ../libempathy-gtk/empathy-log-window.c:678
+#: ../libempathy-gtk/empathy-log-window.c:948
#, c-format
msgid "Chat with %s"
msgstr "與 %s 聊天中"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Y %B %d %A"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:797
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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:803
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:859
-#: ../libempathy-gtk/empathy-log-window.c:861 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:868
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通話時間 %s,結束於 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "今日"
-#: ../libempathy-gtk/empathy-log-window.c:1199
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "昨日"
-#: ../libempathy-gtk/empathy-log-window.c:1215
+#: ../libempathy-gtk/empathy-log-window.c:1556
msgctxt ""
msgid "%e %B %Y"
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgstr "%Y %B %e"
-#: ../libempathy-gtk/empathy-log-window.c:1296
-#: ../libempathy-gtk/empathy-log-window.c:2736
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr "任何時間"
-#: ../libempathy-gtk/empathy-log-window.c:1368
-#: ../libempathy-gtk/empathy-log-window.c:1712
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
msgid "Anyone"
msgstr "任一個"
-#: ../libempathy-gtk/empathy-log-window.c:1992
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr "誰"
-#: ../libempathy-gtk/empathy-log-window.c:2196
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr "何時"
-#: ../libempathy-gtk/empathy-log-window.c:2312
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr "任何事"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "文字聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "通話"
-#: ../libempathy-gtk/empathy-log-window.c:2321
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "來電"
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2781
msgid "Outgoing calls"
msgstr "播出"
-#: ../libempathy-gtk/empathy-log-window.c:2323
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "漏接來電"
-#: ../libempathy-gtk/empathy-log-window.c:2344
+#: ../libempathy-gtk/empathy-log-window.c:2804
msgid "What"
msgstr "什麼"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3506
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "你確定要刪除過往談話的所有紀錄嗎?"
-#: ../libempathy-gtk/empathy-log-window.c:3043
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "清除全部"
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr "刪除從:"
@@ -2306,7 +2325,8 @@ msgstr "<span size=\"x-large\">正在載入...</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "通話"
@@ -2317,32 +2337,28 @@ msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "Delete All History..."
-msgstr ""
+msgstr "刪除所有歷史..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "History"
-msgstr "歷史"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
msgid "Profile"
msgstr "個人檔案"
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "視像"
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
msgid "_File"
msgstr "檔案(_F)"
-#: ../libempathy-gtk/empathy-log-window.ui.h:10
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "page 2"
msgstr "頁面 2"
@@ -2361,17 +2377,17 @@ msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "傳送視像(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "新增通話"
@@ -2500,12 +2516,12 @@ msgstr "編輯自選訊息"
msgid "Remove"
msgstr "移除"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
msgstr "訊息編輯於 %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "一般"
@@ -3027,7 +3043,7 @@ msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "連線中…"
@@ -3133,162 +3149,157 @@ msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視像用戶端"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視像用戶端"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "視像輸入"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "互聯網上的伺服器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "多點廣播羣組的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "未知"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, 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-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "這個網絡上有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3296,148 +3307,127 @@ msgid ""
"the Help menu."
msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
msgstr "無法建立視像串流"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "音訊"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "再播打聯絡人一次"
-
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相機關閉"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相機開啟"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "解碼用編解碼器:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "停用相機並中止傳送視像"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "啟用相機並送出視像"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "停用相機"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "啟用相機但不要送出視像"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "顯示播號盤"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "編碼用編解碼器:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "掛斷"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "掛斷目前通話"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "本機候選:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "預覽"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "將我最大化"
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "重撥"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "將我最小化"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "遠端候選:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "傳送音訊"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "傳送視像"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "顯示播號盤"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr ""
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "切換音訊傳播"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
+msgid "Toggle video transmission"
+msgstr "切換視像傳播"
+
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
msgid "Unknown"
msgstr "不明"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "視像(_I)"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "視像關閉"
-
#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "視像開啟"
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "視像通話(_V)"
#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "視像預覽"
-
-#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "播號盤(_d)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "檢視(_V)"
@@ -3820,18 +3810,16 @@ msgstr "關閉"
#: ../src/empathy-main-window.c:928
#, c-format
msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "加值 %s (%s)..."
#: ../src/empathy-main-window.c:975
-#, fuzzy
-#| msgid "Salut account is created"
msgid "Top up account credit"
-msgstr "帳號"
+msgstr "加值帳號額度"
#. top up button
#: ../src/empathy-main-window.c:1050
msgid "Top Up..."
-msgstr ""
+msgstr "加值..."
#: ../src/empathy-main-window.c:1817
msgid "Contact"
@@ -3851,7 +3839,7 @@ msgstr "聯絡人地圖(_M)"
#: ../src/empathy-main-window.ui.h:2
msgid "Credit Balance"
-msgstr ""
+msgstr "儲值餘額"
#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
@@ -4000,79 +3988,79 @@ msgstr "聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "聯絡人上線"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "聯絡人離線"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "語言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "祝英台"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "梁山伯"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "白玉環與蝴蝶墜,為何不能夫妻配?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr "豈知你我自作主,無人當它是聘媒。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:738
msgid "Or if thou wilt not, be but sworn my love"
msgstr "豈知好事成虛話,棒打鴛鴦兩離分。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr "爹爹許了馬家婚,心已碎,意難伸。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:744
msgid "Shall I hear more, or shall I speak at this?"
msgstr "將來有命終相見,無命今生不相逄。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "祝英台已斷線"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "偏好設定"
@@ -4080,137 +4068,145 @@ msgstr "偏好設定"
msgid "Appearance"
msgstr "外觀"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "行為"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "聊天佈景主題(_E):"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "當狀態為離開或忙碌時停用通知(_D)"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "當狀態為離開或忙碌時停用音效(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "在通知區域顯示收到事件"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "當聯絡人上線時啟用通知"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "當聯絡人離線時啟用通知"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "當聊天視窗失去焦點時啟用通知(_C)"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "為語言啟用拼字檢查:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "一般"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "位置來源:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "紀錄談話"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "通知"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "播放事件音效"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "私隱"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 的座標準確度將會降為個位數。"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "將表情符號以圖片顯示(_S)"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "在聊天室顯示聯絡人清單(_L)"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "音效"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "拼字檢查"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "佈景主題"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "樣式:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "啟動時自動連線(_A)"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "手機(_C)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "啟用氣泡式通知(_E)"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "啟用音效通知(_E)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "網絡 (IP, Wi-Fi)(_N)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "在個別視窗開啟新的聊天(_O)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
@@ -4222,6 +4218,54 @@ msgstr "狀態"
msgid "_Quit"
msgstr "結束(_Q)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再播打聯絡人一次"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "相機關閉"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "相機開啟"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "停用相機並中止傳送視像"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "啟用相機並送出視像"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "啟用相機但不要送出視像"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "預覽"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "重撥"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "視像(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "視像關閉"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "視像開啟"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "視像預覽"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "聯絡人地圖檢視"
@@ -4370,18 +4414,24 @@ msgstr "提供"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 剛剛播打給你,但你正與他人通話。"
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr "訊"
+
+#: ../src/empathy-call-window.c:1005
#, c-format
msgid "Call with %d participants"
msgstr "與 %d 參與者通話"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:1904
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:1905
msgid "On hold"
msgstr "保留"
@@ -4389,6 +4439,9 @@ msgstr "保留"
msgid "_Match case"
msgstr "比對大小寫(_M)"
+#~ msgid "_Dialpad"
+#~ msgstr "播號盤(_d)"
+
#~ msgid "All"
#~ msgstr "全部"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4da2806c8..f4a100c18 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 3.1.2\n"
+"Project-Id-Version: empathy 3.1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-02 06:35+0800\n"
-"PO-Revision-Date: 2011-06-25 16:54+0800\n"
+"POT-Creation-Date: 2011-07-29 16:08+0800\n"
+"PO-Revision-Date: 2011-07-25 01:04+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"Language: zh_TW\n"
@@ -40,397 +40,403 @@ msgid "Always open a separate chat window for new chats."
msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#, fuzzy
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "%s 的來電"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在群組聊天中使用暱稱補齊 (tab) 時要加到暱稱之後的字元。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "聊天視窗佈景主題"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "聊天視窗佈景主題樣式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "精簡連絡人清單"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "使用連線管理程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "連絡人清單排序準則"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "用來選擇大頭貼圖片的預設目錄"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "當狀態為離開時停用彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "當狀態為離開時停用音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "在狀態區域顯示收到事件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接呈現給使用者。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy 可以發布使用者的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 可以利用 GPS 來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 可以利用行動電話網路基地臺來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 可以利用網路來推測位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Empathy 預設下載資料夾"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已轉移 butterfly 日誌"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy 當閒置時應該自動設為離開"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 啟動時自動連線"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy 應降低位置的準確度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "啟用 WebKit 開發者工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "啟用新訊息的彈出式通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "啟用拼字檢查程式"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "隱藏主視窗"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "隱藏主視窗。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "暱稱補齊字元"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "在個別視窗開啟新的聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "要使用的 Adium 佈景主題路徑"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "收到訊息時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "當開啟新的談話時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "送出訊息時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "當連絡人登入時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "當有連絡人登出時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "當我們登入時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "當我們登出時播放音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天視窗失去焦點則彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "當連絡人登入時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "當連絡人登出時彈出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-#, fuzzy
-#| msgid "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
-msgstr "於聯絡人清單內顯示"
+msgstr "於聯絡人清單內顯示餘額"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "在聊天室顯示連絡人清單"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "關閉主視窗時顯示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "顯示離線連絡人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "上次選擇大頭貼圖片的目錄。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "聊天視窗側窗格的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用來顯示在聊天視窗中談話的佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "在聊天室使用佈景主題"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy 是否使用 GPS 來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy 是否使用行動電話網路來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy 是否使用網路來推測位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否應轉移 butterfly 日誌。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用連線管理程式自動斷線或重新連線。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否以您設定的語言檢查輸入有無錯字。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "是否將談話中的表情符號轉換為圖片形式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否播放音效來通知有連絡人登入網路。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否播放音效來通知有連絡人登出網路。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "是否播放音效來通知有事件發生。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否播放音效來通知有收到訊息。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否播放音效來通知新的談話。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否播放音效來通知有送出訊息。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "當登入某網路時是否播放音效。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "當登出某網路時是否播放音效。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "當連絡人離線時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "當連絡人上線時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "當收到新訊息時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-#, fuzzy
-#| msgid "Whether to show protocols for contacts in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
-msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
+msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否在連絡人清單中顯示離線的連絡人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室中顯示連絡人清單。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "是否以精簡模式顯示連絡人清單。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
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.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "是否為聊天室使用佈景主題。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -709,66 +715,67 @@ msgstr "未來"
msgid "All accounts"
msgstr "所有帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帳號已透過我的網路帳號修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帳號無法於 Empathy 內修改。"
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "啟動我的網路帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "登入(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -777,19 +784,19 @@ msgstr "取消(_N)"
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 上的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "新增帳號"
@@ -801,6 +808,7 @@ msgstr "<b>範例:</b>MyScreenName"
#: ../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:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -943,43 +951,49 @@ msgstr "選項"
msgid "None"
msgstr "無"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "字集:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+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:4
msgid "Network"
msgstr "網路"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "網路:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "暱稱:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "密碼:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "離開訊息:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "真實姓名:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "您的 IRC 暱稱是?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "哪個 IRC 網路?"
@@ -1251,62 +1265,62 @@ msgstr "指定的聯絡人無效"
msgid "Emergency calls are not supported on this protocol"
msgstr "此協定不支援緊急通話功能"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "開啟私人聊天失敗"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "「%s」不是有效的連絡人 ID"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:參加新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/part [<聊天室 ID>] [<原因>]:離開聊天室,預設為目前的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>:變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1315,11 +1329,11 @@ msgstr ""
"/say <訊息>:送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說:「/say /join 是用來參加新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <聯絡人 ID>:顯示聯絡人的相關資訊"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1327,115 +1341,113 @@ msgstr ""
"/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
-#, fuzzy
-#| msgid "Insufficient free space to save file"
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
-msgstr "空間不足以儲存檔案"
+msgstr "餘額不足以傳送訊息"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "無法"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤:%s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "傳送訊息時發生錯誤:%s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(沒有建議)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "加入「%s」至字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "加入「%s」至 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-chat.c:2224
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "傳送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1443,12 +1455,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1456,17 +1468,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1476,69 +1488,69 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經參加此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "已斷線"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "您想要儲存此密碼?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "記住"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "現在不要"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "參加"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "談話"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1579,20 +1591,18 @@ msgid "Account:"
msgstr "帳號:"
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
-#| msgid "_Blocked Contacts"
msgid "Blocked Contacts"
msgstr "被封鎖的聯絡人"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "開啟連結(_O)"
@@ -1699,48 +1709,48 @@ msgid "_Block Contact"
msgstr "封鎖聯絡人(_B)"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "傳送檔案"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "分享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "喜好"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "資訊(_M)"
@@ -1750,13 +1760,13 @@ msgid "_Edit"
msgstr "編輯(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1953,7 +1963,7 @@ msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:629
#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "位置"
@@ -2077,25 +2087,25 @@ 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
@@ -2194,119 +2204,128 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:419
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "歷史"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "顯示"
-#: ../libempathy-gtk/empathy-log-window.c:441
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "搜尋"
-#: ../libempathy-gtk/empathy-log-window.c:676
-#: ../libempathy-gtk/empathy-log-window.c:840
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%Y %B %d %A"
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "於 %s 內聊天"
-#: ../libempathy-gtk/empathy-log-window.c:678
+#: ../libempathy-gtk/empathy-log-window.c:948
#, c-format
msgid "Chat with %s"
msgstr "與 %s 聊天中"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Y %B %d %A"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:797
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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:803
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:859
-#: ../libempathy-gtk/empathy-log-window.c:861 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:868
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通話時間 %s,結束於 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "今日"
-#: ../libempathy-gtk/empathy-log-window.c:1199
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "昨日"
-#: ../libempathy-gtk/empathy-log-window.c:1215
+#: ../libempathy-gtk/empathy-log-window.c:1556
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%Y %B %e"
-#: ../libempathy-gtk/empathy-log-window.c:1296
-#: ../libempathy-gtk/empathy-log-window.c:2736
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr "任何時間"
-#: ../libempathy-gtk/empathy-log-window.c:1368
-#: ../libempathy-gtk/empathy-log-window.c:1712
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
msgid "Anyone"
msgstr "任一個"
-#: ../libempathy-gtk/empathy-log-window.c:1992
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr "誰"
-#: ../libempathy-gtk/empathy-log-window.c:2196
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr "何時"
-#: ../libempathy-gtk/empathy-log-window.c:2312
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr "任何事"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "文字聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "通話"
-#: ../libempathy-gtk/empathy-log-window.c:2321
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "來電"
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2781
msgid "Outgoing calls"
msgstr "播出"
-#: ../libempathy-gtk/empathy-log-window.c:2323
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "漏接來電"
-#: ../libempathy-gtk/empathy-log-window.c:2344
+#: ../libempathy-gtk/empathy-log-window.c:2804
msgid "What"
msgstr "什麼"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3506
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "您確定要刪除過往談話的所有紀錄嗎?"
-#: ../libempathy-gtk/empathy-log-window.c:3043
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "清除全部"
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr "刪除從:"
@@ -2317,7 +2336,8 @@ msgstr "<span size=\"x-large\">正在載入...</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "通話"
@@ -2328,32 +2348,28 @@ msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "Delete All History..."
-msgstr ""
+msgstr "刪除所有歷史..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "History"
-msgstr "歷史"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
msgid "Profile"
msgstr "個人檔案"
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "視訊"
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
msgid "_File"
msgstr "檔案(_F)"
-#: ../libempathy-gtk/empathy-log-window.ui.h:10
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "page 2"
msgstr "頁面 2"
@@ -2372,17 +2388,17 @@ msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "傳送視訊(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "新增通話"
@@ -2511,12 +2527,12 @@ msgstr "編輯自訂訊息"
msgid "Remove"
msgstr "移除"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
msgstr "訊息編輯於 %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "一般"
@@ -3057,7 +3073,7 @@ msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "連線中…"
@@ -3163,162 +3179,157 @@ msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視訊用戶端"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視訊用戶端"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "視訊輸入"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "網際網路上的伺服器看見的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "多點廣播群組的 IP 位址"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "未知"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, 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-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "這個網路上有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3328,148 +3339,127 @@ msgstr ""
"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
"從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
msgstr "無法建立視訊串流"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "音訊"
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "再播打聯絡人一次"
-
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相機關閉"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相機開啟"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "解碼用編解碼器:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "停用相機並中止傳送視訊"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "啟用相機並送出視訊"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "停用相機"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "啟用相機但不要送出視訊"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "顯示播號盤"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "編碼用編解碼器:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "掛斷"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "掛斷目前通話"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "本機候選:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "預覽"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "將我最大化"
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "重撥"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "將我最小化"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "遠端候選:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "傳送音訊"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "傳送視訊"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "顯示播號盤"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr ""
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "切換音訊傳播"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
+msgid "Toggle video transmission"
+msgstr "切換視訊傳播"
+
+#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
msgid "Unknown"
msgstr "不明"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "視訊(_I)"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "視訊關閉"
-
#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "視訊開啟"
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "視訊通話(_V)"
#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "視訊預覽"
-
-#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "播號盤(_d)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "檢視(_V)"
@@ -3852,18 +3842,16 @@ msgstr "關閉"
#: ../src/empathy-main-window.c:928
#, c-format
msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "加值 %s (%s)..."
#: ../src/empathy-main-window.c:975
-#, fuzzy
-#| msgid "Salut account is created"
msgid "Top up account credit"
-msgstr "帳號"
+msgstr "加值帳號額度"
#. top up button
#: ../src/empathy-main-window.c:1050
msgid "Top Up..."
-msgstr ""
+msgstr "加值..."
#: ../src/empathy-main-window.c:1817
msgid "Contact"
@@ -3883,7 +3871,7 @@ msgstr "連絡人地圖(_M)"
#: ../src/empathy-main-window.ui.h:2
msgid "Credit Balance"
-msgstr ""
+msgstr "儲值餘額"
#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
@@ -4033,79 +4021,79 @@ msgstr "聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "連絡人上線"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "連絡人離線"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "語言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "祝英台"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "梁山伯"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "白玉環與蝴蝶墜,為何不能夫妻配?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr "豈知你我自作主,無人當它是聘媒。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:738
msgid "Or if thou wilt not, be but sworn my love"
msgstr "豈知好事成虛話,棒打鴛鴦兩離分。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr "爹爹許了馬家婚,心已碎,意難伸。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:744
msgid "Shall I hear more, or shall I speak at this?"
msgstr "將來有命終相見,無命今生不相逄。"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "祝英台已斷線"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "偏好設定"
@@ -4113,67 +4101,75 @@ msgstr "偏好設定"
msgid "Appearance"
msgstr "外觀"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "行為"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "聊天佈景主題(_E):"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "當狀態為離開或忙碌時停用通知(_D)"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "當狀態為離開或忙碌時停用音效(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "在通知區域顯示收到事件"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "當連絡人上線時啟用通知"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "當連絡人離線時啟用通知"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "當聊天視窗失去焦點時啟用通知(_C)"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "為語言啟用拼字檢查:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "一般"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "位置來源:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "紀錄談話"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "通知"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "播放事件音效"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "隱私"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
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 "
@@ -4182,70 +4178,70 @@ msgstr ""
"降低位置準確度意指除了你所在的城市、洲和國家會被公開之外,不會提供其他訊息。"
"GPS 的座標準確度將會降為個位數。"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "將表情符號以圖片顯示(_S)"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "在聊天室顯示連絡人清單(_L)"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "音效"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "拼字檢查"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "佈景主題"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "樣式:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "啟動時自動連線(_A)"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "手機(_C)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "啟用氣泡式通知(_E)"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "啟用音效通知(_E)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "網路 (IP, Wi-Fi)(_N)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "在個別視窗開啟新的聊天(_O)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
@@ -4257,6 +4253,54 @@ msgstr "狀態"
msgid "_Quit"
msgstr "結束(_Q)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再播打聯絡人一次"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "相機關閉"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "相機開啟"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "停用相機並中止傳送視訊"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "啟用相機並送出視訊"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "啟用相機但不要送出視訊"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "預覽"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "重撥"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "視訊(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "視訊關閉"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "視訊開啟"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "視訊預覽"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "連絡人地圖檢視"
@@ -4405,18 +4449,24 @@ msgstr "提供"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 剛剛播打給您,但您正與他人通話。"
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr "訊"
+
+#: ../src/empathy-call-window.c:1005
#, c-format
msgid "Call with %d participants"
msgstr "與 %d 參與者通話"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:1904
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:1905
msgid "On hold"
msgstr "保留"
@@ -4424,6 +4474,9 @@ msgstr "保留"
msgid "_Match case"
msgstr "比對大小寫(_M)"
+#~ msgid "_Dialpad"
+#~ msgstr "播號盤(_d)"
+
#~ msgid "All"
#~ msgstr "全部"
diff --git a/po/zu.po b/po/zu.po
index d0217e3ec..057851310 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -1,21 +1,24 @@
# Zulu translation for empathy
# This file is distributed under the same license as the empathy package.
# Abel Motha, Translate.org.za <sedric@translate.org.za>, 2010, 2011.
+# Priscilla Mahlangu <priny@translate.org.za>, 2011.
+# F Wolff <friedel@translate.org.za>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2011-02-18 10:06+0000\n"
-"PO-Revision-Date: 2011-02-18 18:01+0200\n"
-"Last-Translator: Abel Motha <sedric@translate.org.za>\n"
-"Language-Team: translate-discuss-zu@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-07-20 17:38+0000\n"
+"PO-Revision-Date: 2011-07-29 22:35+0200\n"
+"Last-Translator: Priscilla Mahlangu <priny@translate.org.za>\n"
+"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
"Language: zu\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.7.0-beta4\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -35,8 +38,7 @@ msgstr "Iklayenti le-IM"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
-msgstr ""
-"Uhlale njalo uvula ifasitela elehlukile lokukhuluma uma ukhuluma kabusha."
+msgstr "Uhlale njalo uvula ifasitela elehlukile lokuxoxa uma uxoxa kabusha."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
@@ -44,48 +46,52 @@ msgid ""
"chat."
msgstr ""
"Uhlamvusimo ongalungeza emva kwesiteketiso uma usebenzisa isiteketiso "
-"esiphelele (tab) kwiqoqo lokukhuluma."
+"esiphelele (tab) kwiqoqo lokuxoxa."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
-msgstr "Indikimba yefasitela lokukhuluma"
+msgstr "Umfaniso wewindi lokuxoxa"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Chat window theme variant"
+msgstr "Ukuhluka lomfaniso wewindi lokuxoxa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Uhlu lokuhlola isipelingi oluhlukaniswe ukhefana lezilimi "
-"olungasetshenziswa(isib. \"zu, en, fr\")."
+"Uhlu lokuhlola isipelingi oluhlukaniswe ukhefana lezilimi olungasetshenziswa"
+"(isib. \"zu, en, fr\")."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Compact contact list"
msgstr "Uhlu lokuxhumana oluqoqelene ndawonye"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Connection managers should be used"
msgstr "Amamanenja ezokuxhumana kumele asetshenziswe"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Contact list sort criterion"
msgstr "Uhlu lokuxhumana luhlungwe ngemibandela"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Default directory to select an avatar image from"
msgstr "Umkhombandlela wezimiso ongakhetha kuwo isithombe esiyisifaniso muntu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable popup notifications when away"
msgstr "Yekisa izaziso ezizivelelayo uma ungekho"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Disable sounds when away"
msgstr "Yekisa imisindo uma ungekho"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Display incoming events in the status area"
msgstr "Bonisa izehlakalo ezingenayo kwindawo yesimo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -93,308 +99,319 @@ msgstr ""
"Bonisa izehlakalo ezingenayo kwindawo yesimo. Uma lokhu kungamanga, bonisa "
"kumsebenzi ngokushesha."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can publish the user's location"
msgstr "I-Empathy ingashicilela indawo yomsebenzisi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the GPS to guess the location"
msgstr "I-Empathy ingasebenzisa i-GPS ukuqagela indawo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the cellular network to guess the location"
-msgstr "I-Empathy ingasebenzisa inethiwekhi yomakhalekhukhwini ukuqagela indawo"
+msgstr ""
+"I-Empathy ingasebenzisa inethiwekhi yomakhalekhukhwini ukuqagela indawo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the network to guess the location"
msgstr "I-Empathy ingasebenzisa inethiwekhi ukuqagela indawo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy default download folder"
msgstr "Isikhwama sokulayisha sakhona se-Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "I-Empathy igudluze amalogi wevevane"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
msgstr "I-Empathy kumele ikwenze ungabikho uma ingasebenzi"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "I-Empathy kumele ivele izixhume uma iqala"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "I-Empathy kumele yehlise ukuqondisa ngokwendawo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"I-Empathy kumele isebenzise isithombe esingumfaniso muntu wothintwayo "
-"njengophawu oluyiwindi lokuxhumana"
+"njengesithonjana sewindi lokuxoxa"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Vumela amathuluzi wabathuthukisi be-WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Vumela ukuzivelela kwezaziso zemilayezo emisha"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Vumela isihloli sokupeleta"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Fihla ifasitela elikhulu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Fihla ifasitela elikhulu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Uhlamvu olupheleliswe isiteketiso"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
-msgstr "Vula izinkulumo ezintsha kumafasitela ahlukile"
+msgstr "Vula izingxoxo ezintsha kumafasitela ahlukile"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
-msgstr "Indlela engasetshenziswa indikimba ye Adium"
+msgstr "Indlela engasetshenziswa indikimba ye-Adium"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
-"Indlela engasetshenziswa indikimba uma ngabe indikimba yenkulumo yi- Adium."
+"Indlela engasetshenziswa indikimba uma ngabe indikimba yengxoxo yi-Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "Dlalela imilayezo engenayo umsindo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "Dlalela izingxoxo ezintsha umsindo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "Dlalela imilayezo ephumayo umsindo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "Dlala umsindo uma kungena othintwayo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "Dlala umsindo uma kuphuma othintwayo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "Dlala umsindo uma singena"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "Dlala umsindo uma siphuma"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
-msgstr "Zivezele izaziso uma inkulumo ingaqondile"
+msgstr "Zivezele izaziso uma ingxoxo ingaqondile"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "Zivezele izaziso uma othintwayo engena"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "Zivezele izaziso uma othintwayo ephuma"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Show Balance in contact list"
+msgstr "Bonisa ukulingana kuhlu longabathinta"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show avatars"
msgstr "Bonisa isithombe esiyisifaniso muntu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show contact list in rooms"
msgstr "Bonisa uhlu lwabangathintwa emagunjini"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show hint about closing the main window"
msgstr "Bonisa okokuhlawumbisela ngokuvala ifasitela elikhulu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show offline contacts"
msgstr "Bonisa ongabathinta abangaphandle kolayini"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show protocols"
msgstr "Bonisa imithetho elandelwayo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Spell checking languages"
msgstr "Izilimi zokuhlola ukupeletwa"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The default folder to save file transfers in."
msgstr "Isikhwama sakhona sokonga amafayela athunyelwe."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The last directory that an avatar image was chosen from."
msgstr ""
-"Umkhombandlela wokugcina lapho kukhethwe khona isithombe isingumfaniso "
-"muntu."
+"Umkhombandlela wokugcina lapho kukhethwe khona isithombe isingumfaniso muntu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The position for the chat window side pane"
-msgstr "Isimo sehlangothi lefasitela lokukhuluma"
+msgstr "Isimo sehlangothi le-pane lefasitela lengxoxo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"Uhlangothi olugciniwe (kuma phikseli) wohlangothi lwefasitela lokuxhumana."
+msgstr "Uhlangothi olugciniwe (kuma phikseli) wohlangothi lwefasitela lengxoxo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Indikimba esetshenziselwa ukubonisa ingxoxo kumafasitela wokukhuluma."
+msgstr "Indikimba esetshenziselwa ukubonisa ingxoxo kumafasitela wengxoxo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"Ukuhluka kwendikimba esetshenziselwa ukubonisa ingxoxo kumafasitela "
+"wengxoxo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use graphical smileys"
msgstr "Sebenzisa izimamatheki ezibonisa umqondo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Use notification sounds"
msgstr "Sebenzisa imisindo yezimemezelo"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use theme for chat rooms"
-msgstr "Sebenzisa indikimba kumagumbi okukhuluma"
+msgstr "Sebenzisa indikimba kumagumbi okuxoxa"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Uma ngabe i-Empathy ingashicilela indawo yomsebenzisi kwabathintana naye."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Uma ngabe i-Emmathy ingasebenzisa iGPS ukuqagela indawo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Uma ngabe i-Empathy ingasebenzisa inethiwekhi kamakhalekhukhwini ukuqagela "
"indawo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the network to guess the location."
msgstr "Uma ngabe i-Empathy ingasebenzisa inethiwekhi ukuqagela indawo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Uma ngabe I-Empathy ingagudluza amalogi wevevane."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Uma ngabe i-Empathy ingazingenela kwi akhawunti yakho uma uqala."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Uma ngabe i-Empathy kumele iziyele kwindlela yokungabikho uma ngabe "
"umsebenzisi angenzi lutho."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Uma ngabe i-Empathy ingehlisa ukuqonda kwendawo ngezizathu eziyimfihlo."
+msgstr ""
+"Uma ngabe i-Empathy ingehlisa ukuqonda kwendawo ngezizathu eziyimfihlo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Uma ngabe i-Empathy kumele isebenzise isithombe esingumfaniso muntu "
-"wothintwayo njengophawu oluyisifasitela lokuxhumana."
+"wothintwayo njengesithombe sefasitela lokuxoxa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Uma ngabe amathuluzi okuthuthukisa we WebKit, njengenhloli yeWeb kumele "
"ivunyelwe."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-"Uma ngabe amamenenja wezokuxhumana kumele asetshenziselwe "
-"ukuziphumela/nokuzingenela."
+"Uma ngabe amamenenja wezokuxhumana kumele asetshenziselwe ukuziphumela/"
+"nokuzingenela."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Uma ngabe kumele uhlole amagama athayiphiwe uwaqhathanisa nezilimi ofuna "
"ukuzihlola."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Uma ngabe kumele iguqule izimamatheki zibe izithombembono kwizingxoxo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Uma ngabe kungadlalwa umsindo wokwazisa abangathintwa uma bangena "
"kwinethiwekhi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Uma ngabe kungadlalwa umsindo wokwazisa abangathintwa uma bephuma "
"kwinethiwekhi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of events."
msgstr "Uma ngabe kungadlalwa umsindo wokwazisa ngezehlakalo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Uma ngabe kungadlalwa umsindo wokwazisa ngemilayezo engenayo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of new conversations."
msgstr "Uma ngabe kungadlalwa umsindo wokwazisa ngezinxoxo ezintsha."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Uma ngabe kungadlalwa umsindo wokwazisa ngemilayezo ephumayo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging into a network."
msgstr "Uma ngabe kungadlalwa umsindo uma kungenwa kwinethiwekhi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound when logging out of a network."
msgstr "Uma ngabe kungadlalwa umsindo uma kuphunywa kwinethiwekhi."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play sound notifications when away or busy."
msgstr "Uma ngabe kungadlalwa umsindo uma kungekho muntu noma kumatataswa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Uma ngabe kungaboniswa isaziso esizivelelayo uma ngabe othintwayo eya "
"ngaphandle kolayini."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Uma ngabe kungaboniswa isaziso uma othintwayo eya kulayini."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -402,43 +419,47 @@ msgstr ""
"Uma ngabe kungaboniswa isaziso esizivelelayo uma ngabe kwamukelwa umlayezo "
"omusha noma ngabe ingxoxo isivuliwe, kepha ingagxilanga."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Uma ngabe kungaboniswa isaziso esizivelelayo uma kwamukelwa umlayezo omusha."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show account balances in the contact list."
+msgstr "Uma ngabe kungaboniswa imali esele kuhlu lwabangathintwa."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Uma ngabe kungaboniswa isithombe esingumfanekiso muntu kubantu abangathintwa "
"kuhlu lwabangathintwa nakufasitela lwengxoxo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Uma ngabe kungaboniswa abangathintwa abangaphandle kolayini kuhlu "
"lokuxhumana."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show popup notifications when away or busy."
msgstr "Uma ngabe kungaboniswa izaziso uma kungekho muntu noma kumatataswa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Uma ngabe kungaboniswa imithetho elandelwayo kwabathintwayo kuhlu "
"lokuxhumana."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show the contact list in chat rooms."
msgstr "Uma ngabe kungaboniswa uhlu lwabangathintwa kumagumbi okuxoxa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show the contact list in compact mode."
msgstr "Uma ngabe kungaboniswa uhlu lokuxhumana kwimodi efinqiwe."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -446,11 +467,11 @@ msgstr ""
"Uma ngabe kungaboniswa idayalogi yomlayezo mayelana nokuvalwa kwewindi "
"elikhulu ngenkinobho u 'x' kwibha yesihloko."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to use the theme for chat rooms."
msgstr "Uma ngabe kungasetshenziswa indikimba kumagumbi okuxoxa."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -466,26 +487,42 @@ msgstr "Manenja ukulayeza nama VoIP akhawunti"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "Ukulayeza nama VoIP akhawunti"
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
msgid "File transfer completed, but the file was corrupted"
msgstr "Ukuthunyelwa kwefayela kuqediwe, kepha ifayela limoshekile"
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
msgstr "Ukudlulisa ifayela akuxhaswa ongathintwa ekude"
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "Ifayela elikhethiwe akusilo ifayela elivamile"
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "Ifayela elikhethiwe alinalutho"
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#, c-format
+msgid "Missed call from %s"
+msgstr "Ucingo olungabanjwanga olusuka ku-%s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+msgid "Called %s"
+msgstr "Kuthintwe u-%s"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "Ucingo oluvela ku-%s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "Uhlobo lwe-socket aluxhasiwe"
@@ -514,145 +551,143 @@ msgstr "Iphutha ngenkathi kuzanywa ukudlulisa ifayela"
msgid "The other participant is unable to transfer the file"
msgstr "Omunye umbambi qhaza akakwazi ukudlulisa ifayela"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "Isizathu asaziwa"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "Ukhona"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "Matasatasa"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "Kude"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "Ukungabonakali"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "Ngaphandle kolayini"
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:224
+msgctxt "presence"
msgid "Unknown"
msgstr "Akwaziwa"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "Asikho isizathu esicacisiwe"
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "Isimo sibekwe ukuba sibe ngaphandle kolayini"
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "Iphutha lenethiwekhi"
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "Ukuqinisekiswa kuhlulekile"
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "Inkinga yokubhala ngamakhowudi"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "Igama elisetshenziswayo"
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "Isitifiketi asinikeziwe"
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "Isitifiketi asithenjwa"
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "Isitifiketi siphelelwe isikhathi"
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "Isitifiketi asisebenzi"
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "Isitifiketi segama lomnini asifani"
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "Isitifiketi somnyatheliso weminwe asifani"
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "Isitifiketi esisayinda ngqo"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "Iphutha lesitifiketi"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "Ukubhala okuyimfihlo akukho"
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "Isitifiketi asilungile"
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "Ukuxhumeka kwaliwe"
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "Ukuxhumeka akusunguleki"
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "Ukuxhumeka kulahlekile"
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "Le nsizakusebenza isixhunyiwe kwisiphakeli"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
"Ukuxhumeka kushintshaniswe nokuxhumana okusha kusetshenziswa insiza efanayo"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "I-akhawunti seyivele ikhona kwisiphakeli"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "Isiphakeli simatasatasa kakhulu ukuphatha ukuxhumeka"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "Isitifiketi sichithiwe"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"Isitifiketi sisebenzisa indlela yokuloba engaphephile eyimfihlo yokuxazulula "
"noma kucashiswe ngokungenamandla"
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:348
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
@@ -660,149 +695,133 @@ msgstr ""
"Ubude besitifiketi sesiphakeli, noma ububanzi beketango lwesitikiketi "
"sesiphakeli, budlula umkhawulo obekwe umtapo we-cyptography"
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Abantu abaseduze"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "I-Yahoo! Japane"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Inkulumo ye-Google"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
-msgstr "Ingxoxa ye-Facebook"
+msgstr "Ingxoxo ye-Facebook"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "umzuzwana ongu %d odlule"
msgstr[1] "imizuzwana engu %d edlule"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "umzuzu ongu %d odlule"
msgstr[1] "imizuzu engu %d edlule"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "ihora elingu %d eledlule"
msgstr[1] "amahora angu %d adlule"
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "usuku eli- %d eledlule"
msgstr[1] "izinsuku ezingu %d ezedlule"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "evikini elingu- %d eledlule"
msgstr[1] "amaviki angu- %d adlule"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "inyanga engu- %d edlule"
msgstr[1] "izinyanga ezingu- %d ezedlule"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "ngokuzayo"
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "Bonke"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Wonke ama-akhawunti"
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "I-akhawunti"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:682
msgid "Password"
msgstr "Igama lokungena"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:683
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Isiphakeli"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Imbobo yokuxhumana"
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:756
+#: ../libempathy-gtk/empathy-account-widget.c:813
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1154
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "I-akhawunti %s ihlelwe ngama-akhawunti we My Web."
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1160
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "I-akhawunti %s ayikwazi ukuhlelwa kwi Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1180
msgid "Launch My Web Accounts"
msgstr "Qalisa ama-akhawunti we My Web"
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#: ../libempathy-gtk/empathy-account-widget.c:1518
msgid "Username:"
msgstr "Igama lomsebenzisi:"
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "A_pply"
msgstr "F_aka"
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1866
msgid "L_og in"
msgstr "N_gena"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:451
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1486
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "I-akhawunti:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-msgid "_Enabled"
-msgstr "_Vunyelwe"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:1940
msgid "This account already exists on the server"
msgstr "I-akhawunti seyivele ikhona kwisiphakeli"
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1943
msgid "Create a new account on the server"
msgstr "Dala i-akhawunti entsha kwisiphakeli"
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2135
msgid "Ca_ncel"
msgstr "Ch_itha"
@@ -811,19 +830,19 @@ msgstr "Ch_itha"
#. * 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:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2413
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s ku-%2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2439
#, c-format
msgid "%s Account"
msgstr "%s Akhawunti"
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2443
msgid "New account"
msgstr "I-akhawunti entsha"
@@ -848,7 +867,7 @@ msgstr "Okuseqophelweni"
#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "Igama_lokungena:"
@@ -858,37 +877,48 @@ msgstr "Igama_lokungena:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "Khumbula igama lokungena"
+#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "Screen _Name:"
-msgstr "Igama _lesihenqo:"
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Khumbula igama lokungena"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM password?"
-msgstr "Yini igama lakho lokungena le AIM?"
+msgid "Screen _Name:"
+msgstr "Igama _lesihenqo:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM screen name?"
-msgstr "Yini igama lesihenqo sakho se AIM?"
+msgid "What is your AIM password?"
+msgstr "Yini igama lakho lokungena le-AIM?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Port:"
-msgstr "_Imbobo yokuxhumana:"
+msgid "What is your AIM screen name?"
+msgstr "Yini igama lesihenqo sakho se-AIM?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Port:"
+msgstr "_Imbobo yokuxhumana:"
+
+#: ../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:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Isiphakeli:"
@@ -904,11 +934,11 @@ msgstr "<b>Isibonelo:</b> igama lomsebenzisi"
msgid "Login I_D:"
msgstr "Ngena I_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise User ID?"
msgstr "Yini i-ID yakho yomsebenzisi ye-GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise password?"
msgstr "Yini igama lakho lokungena le-GroupWise?"
@@ -925,44 +955,44 @@ msgstr "Uh_lamvusimo lumisime:"
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ UIN?"
msgstr "Yini i-ICQ UIN yakho?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ password?"
msgstr "Yini igama lakho lokungena le ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "Ukuzenzakalela"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "Bhalisa"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "Izinketho"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "Lutho"
@@ -1030,57 +1060,57 @@ msgstr "Dlova izimiso zesiphakeli"
msgid "Priori_ty:"
msgstr "Okusem_qoka:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Reso_urce:"
msgstr "Insi_za:"
#. 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:13
+#: ../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"
"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
"Facebook username if you don't have one."
msgstr ""
-"Leli igama lakho lomsebenzisi, hhayi igama lokungena elijwayelekile lakho "
-"le-Facebook.\n"
+"Leli igama lakho lomsebenzisi, hhayi igama lokungena elijwayelekile lakho le-"
+"Facebook.\n"
"Uma ngabe ungu-facebook.com/<b>i-badger</b>, faka <b>i-badger</b>.\n"
"Sebenzisa <a href=\"http://www.facebook.com/username/\">leli khasi</a> "
"ukukhetha igama lomsebenzisi le Facebook uma ngabe ungenalo."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Use old SS_L"
msgstr "Sebenzisa endala i-SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook password?"
msgstr "Yini igama lakho lokungena le Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Facebook username?"
msgstr "Yini igama lakho lomsebenzisi le Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google ID?"
msgstr "Yini i-ID yakho ye-Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Google password?"
msgstr "Yini igama lakho lokungena le-Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber ID?"
msgstr "Yini i-ID yakho ye-Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your Jabber password?"
msgstr "Yini igama lakho lokungena le-Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber ID?"
msgstr "Yini i-ID yakho ye-Jabber oyifisayo?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber password?"
msgstr "Yini igama lokungena le-Jabber olifisayo?"
@@ -1088,11 +1118,11 @@ msgstr "Yini igama lokungena le-Jabber olifisayo?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Isibonelo</b> user@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live ID?"
msgstr "Yini i-ID yakho ye-Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live password?"
msgstr "Yini igama lokungena lakho le-Windows Live?"
@@ -1137,58 +1167,63 @@ msgid "Discover the STUN server automatically"
msgstr "Thola isiphakeli se-STUN ngokuzenzakalela"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Unganaki amaphutha we-TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "Isikhawu (imizuzwana)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Gcina izinkethi ziphila"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "Ukuthutha okuxegayo"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "Umshini:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "Izinketho eziyingxubevange"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "Izinkethi ze-NAT Traversal"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "Imbobo yokuxhumana:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "Izinkethi zomnikezeli"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Isiphakeli ye-STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Isiphakeli:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "Thutha:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "Yini igama lakho lokungena kwi-akhawunti ye-SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "Yini i-ID ykho yokungena ye-SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "_Igama lomsebenzisi:"
@@ -1196,50 +1231,52 @@ msgstr "_Igama lomsebenzisi:"
msgid "I_gnore conference and chat room invitations"
msgstr "Shaya i_ndiva izimemo zenkomfa kanye nezegumbi lokuxoxa"
-#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Khumbula igama lokungena"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "Yini i-Yahoo! ID yakho?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! password?"
msgstr "Yini igama lokungena lakho le Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "Yahoo! I_D:"
msgstr "I-Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "_Uhlu lwegumbi lendawo:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "Akuphumelelanga ukuguqula isithombe"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "Ayikho ifomethi kwizithombe ezamukelwe esekelwe kwizimiso zakho"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr "Ayikwazi ukugcina i-pixbuf ku-png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "Khetha isithombe esingumboniso muntu"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "Thatha isithombe..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "Asikho isithombe"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "Izithombe"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "Wonke amafayela"
@@ -1247,51 +1284,85 @@ msgstr "Wonke amafayela"
msgid "Click to enlarge"
msgstr "Qhofoza ukuze ukhulise"
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "Kube nephutha ngenkathi kuqalwa ucingo"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "Lo ongathintwa ocacisiwe akasekeli izingcingo"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "Ongathintwa okhethiwe ungaphandle kolayini"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "Ongathintwa okhethiwe akavumelekile"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Izingcingo eziphuthumayo azisekelwe kulo mthetho olandelwayo"
+
+#: ../libempathy-gtk/empathy-chat.c:697
msgid "Failed to open private chat"
msgstr "Ihlulekile ukuvula ingxoxo yangasese"
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:758
msgid "Topic not supported on this conversation"
msgstr "Isihloko asisekelwa kule ngxoxo"
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "You are not allowed to change the topic"
msgstr "Awuvunyelwe ukuguqula isihloko"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:968
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "u-“%s” akusibo ubunikazi bongathintwa obuvumelekile"
+
+#: ../libempathy-gtk/empathy-chat.c:1025
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: susa yonke imilayezo kwingxoxo yamanje"
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:1028
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: misa isihloko sengxoxo yamanje"
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:1031
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: xhumanisa igumbi lokuxoxa elisha"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:1034
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: xhumanisa igumbi lokuxoxa elisha"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:1038
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<chat room ID>] [<reason>]: phuma kugumbi lokuxoxa, ngokwakhona "
+"ngokwamanje"
+
+#: ../libempathy-gtk/empathy-chat.c:1042
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: vula ingxoxo engasese"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:1045
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: vula ingxoxo engasese"
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:1048
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: guqula isiteketiso sakho kwisiphakeli samanje"
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:1051
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: thumela umlayezo we- ACTION kwingxoxo yamanje"
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../libempathy-gtk/empathy-chat.c:1054
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 "
@@ -1301,7 +1372,11 @@ msgstr ""
"ukuthumela umlayezo kuqalwe nge '/'. Isibonelo: \"/say /join usetshenziselwa "
"ukuxhuma kwigumbi lokuxoxa elisha\""
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:1059
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: bonisa imininigwane mayelana nongathintwa"
+
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1309,98 +1384,113 @@ msgstr ""
"/help [<command>]: bonisa konke ukuphoqa okuxhaswiwe. Uma ngabe i-<command> "
"ichaziwe, bonisa ukusetshenziswa kwayo."
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:1072
#, c-format
msgid "Usage: %s"
msgstr "Ukusetshenziswa: %s"
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:1111
msgid "Unknown command"
msgstr "Umyalo awaziwa"
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1237
msgid "Unknown command; see /help for the available commands"
msgstr "Umyalo awaziwa; bona /help ngemiyalo ekhona"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1407
+msgid "insufficient balance to send message"
+msgstr "imali enganele yokwazi ukuthumela umlayezo"
+
+#: ../libempathy-gtk/empathy-chat.c:1409
+msgid "not capable"
+msgstr "ayikwazi"
+
+#: ../libempathy-gtk/empathy-chat.c:1416
msgid "offline"
msgstr "ngaphandle kolayini"
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1419
msgid "invalid contact"
msgstr "ongathintwa ongaqondile"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1422
msgid "permission denied"
msgstr "imvume inqatshiwe"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1425
msgid "too long message"
msgstr "umlayezo mude kakhulu"
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1428
msgid "not implemented"
msgstr "ayenziwe"
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1432
msgid "unknown"
msgstr "ayaziwa"
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1438
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Iphutha ekuthumeleni umlayezo '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:711
+#: ../libempathy-gtk/empathy-chat.c:1442
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Iphutha ekuthumeleni umlayezo: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Isihloko:"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1515
#, c-format
msgid "Topic set to: %s"
msgstr "Isihloko simiselwe ku: %s"
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1517
msgid "No topic defined"
msgstr "Asikho isihloko esichaziwe"
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:2024
msgid "(No Suggestions)"
msgstr "(Azikho iziphakamiso)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../libempathy-gtk/empathy-chat.c:2092
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Ngeza '%s' kusichazamazwi"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1891
+#: ../libempathy-gtk/empathy-chat.c:2129
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Ngeza '%s' ku-%s isichazamazwi"
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2186
msgid "Insert Smiley"
msgstr "Faka izimamatheki"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Thumela"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2003
+#: ../libempathy-gtk/empathy-chat.c:2239
msgid "_Spelling Suggestions"
msgstr "Iziphakamiso _zokupeletwa"
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2328
msgid "Failed to retrieve recent logs"
msgstr "Kuhlulekile ukuthola amalogi wamanje"
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2465
#, c-format
msgid "%s has disconnected"
msgstr "%s akaxhunyiwe"
@@ -1408,12 +1498,12 @@ msgstr "%s akaxhunyiwe"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2205
+#: ../libempathy-gtk/empathy-chat.c:2472
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ukhahlelwe ngu %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2208
+#: ../libempathy-gtk/empathy-chat.c:2475
#, c-format
msgid "%s was kicked"
msgstr "%s ukhahleliwe"
@@ -1421,17 +1511,17 @@ msgstr "%s ukhahleliwe"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2216
+#: ../libempathy-gtk/empathy-chat.c:2483
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s unqatshelwe ngu %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2486
#, c-format
msgid "%s was banned"
msgstr "%s unqatshelwe"
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2490
#, c-format
msgid "%s has left the room"
msgstr "%s uphumile egunjini"
@@ -1441,98 +1531,169 @@ msgstr "%s uphumile egunjini"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2499
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2524
#, c-format
msgid "%s has joined the room"
msgstr "%s uxhumeke egunjini"
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2549
#, c-format
msgid "%s is now known as %s"
msgstr "%s seyaziwa njenge %s"
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../src/empathy-streamed-media-window.c:1942
-#: ../src/empathy-event-manager.c:1122
+#: ../libempathy-gtk/empathy-chat.c:2688
+#: ../src/empathy-streamed-media-window.c:1939
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1858
msgid "Disconnected"
msgstr "Akuxhunyiwe"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3051
+#: ../libempathy-gtk/empathy-chat.c:3332
msgid "Would you like to store this password?"
msgstr "Ungathanda ukonga leli gama lokungena?"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3338
msgid "Remember"
msgstr "Khumbula"
-#: ../libempathy-gtk/empathy-chat.c:3067
+#: ../libempathy-gtk/empathy-chat.c:3348
msgid "Not now"
msgstr "Hhayi manje"
-#: ../libempathy-gtk/empathy-chat.c:3111
+#: ../libempathy-gtk/empathy-chat.c:3392
msgid "Retry"
msgstr "Zama futhi"
-#: ../libempathy-gtk/empathy-chat.c:3115
+#: ../libempathy-gtk/empathy-chat.c:3396
msgid "Wrong password; please try again:"
msgstr "Igama lokungena okungesilo; uyacelwa uzame futhi:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3232
+#: ../libempathy-gtk/empathy-chat.c:3526
msgid "This room is protected by a password:"
-msgstr "Legumbi livikelwe igama lokungena:"
+msgstr "Leli gumbi livikelwe igama lokungena:"
-#: ../libempathy-gtk/empathy-chat.c:3259
+#: ../libempathy-gtk/empathy-chat.c:3553
msgid "Join"
msgstr "Xhumana"
-#: ../libempathy-gtk/empathy-chat.c:3429 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:2105
msgid "Connected"
msgstr "Ixhunyiwe"
-#: ../libempathy-gtk/empathy-chat.c:3482
-#: ../libempathy-gtk/empathy-log-window.c:660
+#: ../libempathy-gtk/empathy-chat.c:3810
msgid "Conversation"
msgstr "Ingxoxo"
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3815
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "Isikhombi esingaziwa noma esingavumelekile"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr "Ukuvimbela ongathintwa kwesikhashana akukho"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "Ukuvimbela ongathintwa akukho"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr "Imvume inqatshelwe"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr "Ayikwazanga ukuvimbela ongathintwa"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+msgid "Edit Blocked Contacts"
+msgstr "Hlela abangathintwa abavinjiwe"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "I-akhawunti:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Abangathintwa abavinjiwe"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Kopisha ikheli lelinki"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Vula ilinki"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
+msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Hlela ulwazi lokuxhumana"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
msgstr "Ulwazi lomuntu"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "Ongathintwa omusha"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr "Vimba u-%s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"Ingabe uqinisekile ukuthi ufuna ukuvimba u-'%s' ukuba axhumane nawe futhi?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Vimba"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Bika lo ongathintwa njengo nokuhlukumeza"
+msgstr[1] "_Bika laba abangathintwa njengabanokuhlukumeza"
+
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
msgstr "Nquma _ekuhambeni kwesikhathi"
@@ -1541,6 +1702,10 @@ msgstr "Nquma _ekuhambeni kwesikhathi"
msgid "Subscription Request"
msgstr "Isicelo sokubhalisa"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "_Vimba umsebenzisi"
+
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
msgstr "Akuqoqiwe"
@@ -1549,114 +1714,121 @@ msgstr "Akuqoqiwe"
msgid "Favorite People"
msgstr "Abantu abayizintandokazi"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2309
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ufuna ngempela ukususa iqembu '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2312
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "Isusa iqembu"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2367
-#: ../libempathy-gtk/empathy-individual-view.c:2514
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "_Susa"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2417
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ufuna ngempela ukususa ongathintwa u-'%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "Isusa ongathintwa"
-#: ../libempathy-gtk/empathy-contact-menu.c:204
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Ngeza ongathintwa…"
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "_Vimba ongathintwa"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:548
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Xoxa"
-#: ../libempathy-gtk/empathy-contact-menu.c:262
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Ucingo lwemisindo"
-#: ../libempathy-gtk/empathy-contact-menu.c:293
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "Ucingo lwe_vidiyo"
-#: ../libempathy-gtk/empathy-contact-menu.c:334
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:737
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "Izingxoxo _ezedlule"
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Thumela ifayela"
-#: ../libempathy-gtk/empathy-contact-menu.c:379
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Yabelana ngedeskithophu yami"
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1682
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1377
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:855
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Intandokazi"
-#: ../libempathy-gtk/empathy-contact-menu.c:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Ulw_azi"
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Hlela"
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:923
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Umenyelwa kulegumbi"
-#: ../libempathy-gtk/empathy-contact-menu.c:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "_Memela kwigumbi lokuxoxa"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "Sesha abangathintwa"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "Sesha: "
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+msgid "_Add Contact"
+msgstr "_Ngeza ongathintwa"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "Abekho abangathintwa abatholakele"
@@ -1664,188 +1836,211 @@ msgstr "Abekho abangathintwa abatholakele"
msgid "Select a contact"
msgstr "Khetha ongathintwa"
-#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Igama eliphelele:"
-#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Inombolo yocingo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Ikheli le-imeyli:"
-#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "I-webhusaythi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Usuku lokuzalwa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:724
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#. 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.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Ugcine ukubonwa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Ixhunywe kusuka ku:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Umlayezo wokuba kude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Iziteshi:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "Ikhodi le-ISO lezwe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:726
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "Izwe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:728
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "Isifunda:"
-#: ../libempathy-gtk/empathy-contact-widget.c:730
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "Idolobhakazi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:732
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "Indawo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "Ikhodi yeposi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "Umgwaqo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:738
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "Isakhiwo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "Isitezi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "Igumbi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "Umbhalo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "Incazelo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "Iqophelo lokuqonda:"
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "Iphutha:"
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "Iphutha elithe thwi (amamitha):"
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "Iphutha elivundlile (amamitha):"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "Ijubane:"
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "Ibombo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "Ijubane lokukhuphuka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "Igcine ivuselelwe ku:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "Ilongithudi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "Ilathithudi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "Ukuphakama:"
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Indawo"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:852
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%e ku-%B %Y ngo-%R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:987
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "Yonga umbonisomuntu"
-#: ../libempathy-gtk/empathy-contact-widget.c:1043
-#: ../libempathy-gtk/empathy-individual-widget.c:983
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "Akukhonakali ukonga umbonisomuntu"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Indawo</b> ngomhlaka (usuku)\t"
+msgstr "<b>Indawo</b> ngomhlaka"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1312
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "Isibizo:"
@@ -1865,7 +2060,7 @@ msgstr "Imininingwane yezokuxhumana"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1516
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "Isihlonzi:"
@@ -1882,11 +2077,11 @@ msgstr "OS:"
msgid "Version:"
msgstr "Isibuyekezo:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "Amaqembu"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1894,34 +2089,46 @@ msgstr ""
"Khetha amaqembu ofuna lo ongathintwa ukuba avele kuwo. Yazi ukuba "
"ungakhetha ngaphezu kweqembu elilodwa noma ungakhethi qembu nhlobo."
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "_Yongeza iqembu"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Khetha"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1432
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "Iqembu"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "Ubunikazi obulandelayo buzovinjelwa:"
+msgstr[1] "Ubunikazi obulandelayo buzovinjelwa:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "Ubunikazi obulandelayo abukwazi ukuvinjelwa:"
+msgstr[1] "Ubunikazi obulandelayo abukwazi ukuvinjelwa:"
+
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "Abangathintwa abaxhunyiwe"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "Khetha abangathintwa ongabaxhuma"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "Isibonisikuqala songathintwa omusha"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
msgstr ""
"Abangathintwa abakhethwe kuhlu olusesandleni sobunxele bazoxhunywa bonke."
@@ -1929,24 +2136,34 @@ 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:594
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_i-SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Hlela"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Xhumanisa abangathintwa…"
-#: ../libempathy-gtk/empathy-individual-view.c:2425
+#: ../libempathy-gtk/empathy-individual-view.c:2340
+msgid "Delete and _Block"
+msgstr "Susa futhi _uvimbe"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1955,7 +2172,7 @@ msgstr ""
"Ingabe ufuna ukususa ngempela ongathintwa oxhunyiwe u-'%s'? Yazi ukuthi "
"lokhu kuzosusa bonke abangathintwa abenza lokhu okungathintwa okuxhunyiwe."
-#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2041,65 +2258,201 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Hlukanisa"
-#: ../libempathy-gtk/empathy-log-window.c:670
-msgid "Date"
-msgstr "Usuku"
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Umlando"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
+msgid "Show"
+msgstr "Bonisa"
+
+#: ../libempathy-gtk/empathy-log-window.c:532
+msgid "Search"
+msgstr "Cinga"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Ingxoxo ku-%s"
+
+#: ../libempathy-gtk/empathy-log-window.c:948
+#, c-format
+msgid "Chat with %s"
+msgstr "Ingxoxo no-%s"
+
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+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:1118
+#, 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:1124
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Ucingo luthathe i-%s, luphele ngo-%s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1536
+msgid "Today"
+msgstr "Namhlanje"
+
+#: ../libempathy-gtk/empathy-log-window.c:1540
+msgid "Yesterday"
+msgstr "Izolo"
+
+#: ../libempathy-gtk/empathy-log-window.c:1556
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
+msgid "Anytime"
+msgstr "Nganoma isiphi isikhathi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
+msgid "Anyone"
+msgstr "Lutho"
+
+#: ../libempathy-gtk/empathy-log-window.c:2451
+msgid "Who"
+msgstr "Ubani"
+
+#: ../libempathy-gtk/empathy-log-window.c:2655
+msgid "When"
+msgstr "Nini"
+
+#: ../libempathy-gtk/empathy-log-window.c:2771
+msgid "Anything"
+msgstr "Noma yini"
+
+#: ../libempathy-gtk/empathy-log-window.c:2773
+msgid "Text chats"
+msgstr "Izinxoxo zombhalo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2775
+msgid "Calls"
+msgstr "Izingcingo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2780
+msgid "Incoming calls"
+msgstr "Izingcingo ezingenayo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2781
+msgid "Outgoing calls"
+msgstr "Izingcingo eziphumayo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2782
+msgid "Missed calls"
+msgstr "Izingcingo ezingaphendulwanga"
+
+#: ../libempathy-gtk/empathy-log-window.c:2804
+msgid "What"
+msgstr "Ini"
+
+#: ../libempathy-gtk/empathy-log-window.c:3506
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Ingabe unesiqiniseko sokuthi ufuna ukususa wonke ama-logi wezingxoxo "
+"ezedlule?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3510
+msgid "Clear All"
+msgstr "Sula konke"
+
+#: ../libempathy-gtk/empathy-log-window.c:3517
+msgid "Delete from:"
+msgstr "Susa kusukela:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Iyalayisha...</span>"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Izingxoxo"
+#: ../src/empathy-streamed-media-window.c:1344
+msgid "Call"
+msgstr "Thinta"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Thola okulandelayo"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Xoxa"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Thola okudlule"
+msgid "Delete All History..."
+msgstr "Susa wonke umlando..."
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Izingxoxo ezedlule"
+msgid "Profile"
+msgstr "Iprofayela"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Ividiyo"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Cinga"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "_Hlela"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Ifayela"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Funa okuthile:"
+msgid "page 2"
+msgstr "ikhasi 2"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "I-ID yezokuxhumana:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "X_oxa"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Ingxoxo entsha"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
-msgstr "Thumela _ivideyo"
+msgstr "Thumela _ividiyo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "T_hinta"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Ucingo olusha"
@@ -2118,34 +2471,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "Umlayezo wokuzenzela…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "Hlela umlayezo oqokiwe…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
-msgstr "Qhafaza ukuze ususe lesimo njengentandokazi"
+msgstr "Chofoza ukuze ususe lesi simo njengentandokazi"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
-msgstr "Qhafaza ukuze wenze lesimo sibe intandokazi"
+msgstr "Chofoza ukuze wenze lesi simo sibe intandokazi"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "Misa isimo"
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "Misa ubukhona bakho nesimo sakho samanje"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "Umlayezo oqokiwe…"
@@ -2158,6 +2511,14 @@ msgstr "Umlayezo oqokiwe…"
msgid "New %s account"
msgstr "I-akhawunti %s entsha"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "Thola okulandelayo"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Thola okudlule"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Thola:"
@@ -2210,35 +2571,38 @@ msgstr "Kuphuma ucingo lwephimbo"
msgid "Voice call ended"
msgstr "Ucingo lwephimbo lunqanyuliwe"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Faka umlayezo oqokiwe"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "Hlela umlayezo oqokiwe"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Gcina umlayezo _omusha wesimo"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Khipha"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Imilayezo yesimo egciniwe"
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#, c-format
+msgid "Message edited at %s"
+msgstr "Umlayezo uhlelwe e-%s"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
+msgid "Normal"
+msgstr "Okujwayelekile"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "Okungasoze kwabuna"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "Okulula"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "Okuhlanzekile"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "Uluhlaza okwesibhakabhaka"
@@ -2298,31 +2662,44 @@ msgstr "Igama lozokwengamela elilindelwe: %s"
msgid "Certificate hostname: %s"
msgstr "Isitifiketi segama lozokwengamela: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "Continue"
msgstr "Qhubeka"
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Lokuxhumana akuthembekile. Ungathanda ukuqhubeka nakuba kunjalo?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
msgstr "Khumbula lokukhetha mayelana nokuxhumana okuzayo"
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr "Imininingwane yesitifiketi"
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "Akukhonakali ukuvula i-URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1748
msgid "Select a file"
msgstr "Khetha ifayela"
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1820
+msgid "Insufficient free space to save file"
+msgstr "Isikhala esivulekile esinganele sokugcina ifayela"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"u-%s wesikhala esivulekile uyadingeka ukuze kugcinwe leli fayela, kepha "
+"kukhona kuphela u-%s. Sicela ukhethe enye indawo."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Ifayela elingenayo elisuka ku-%s"
@@ -2478,7 +2855,7 @@ msgstr "isi-Thekishi"
#: ../libempathy-gtk/totem-subtitle-encoding.c:314
#: ../libempathy-gtk/totem-subtitle-encoding.c:316
msgid "Unicode"
-msgstr "I-Yunikhodi"
+msgstr "i-Yunikhodi"
#: ../libempathy-gtk/totem-subtitle-encoding.c:319
#: ../libempathy-gtk/totem-subtitle-encoding.c:321
@@ -2510,24 +2887,24 @@ msgstr "Awukho umlayezo wephutha"
msgid "Instant Message (Empathy)"
msgstr "Umlayezo osheshayo (i-Empathy)"
-#: ../src/empathy.c:310
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Ungaxhumi ngenkathi kuqalwa"
-#: ../src/empathy.c:314
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
"Ungakhombisi uhlu lwabangathintwa noma iziphi ezinye izingxoxo uma kuqalwa"
-#: ../src/empathy.c:322
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- i-Empathy IM klayenti"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Iphutha ekuthinteni imanenja ye-akhawunti"
-#: ../src/empathy.c:503
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2548,8 +2925,8 @@ msgid ""
"version."
msgstr ""
"I-Empathy i-software ekhululekile; ungabelana ngayo noma futhi uyiguquguqule "
-"ngaphansi kwamatemu we-GNU ilayisensi yomphakathi Ejwayelekile eshicilelwe "
-"i-Free Software Foundation; kungaba isibuyekezo sesi-2 selayisensi, noma "
+"ngaphansi kwamatemu we-GNU ilayisensi yomphakathi Ejwayelekile eshicilelwe i-"
+"Free Software Foundation; kungaba isibuyekezo sesi-2 selayisensi, noma "
"(kuzinketho zakho) ukhethe noma isiphi isibuyekezo."
#: ../src/empathy-about-dialog.c:85
@@ -2608,12 +2985,12 @@ 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 ""
-"Ungabuyela emuva bese uzama ukufaka imininingwane ye-akhawunti yakho futhi "
-"noma uphume kulomsizi bese ungeza ama-akhawunti kamuva kusukela kumenyu "
+"Ungabuyela emuva bese uzama ukufaka imininingwane yama-akhawunti akho futhi "
+"noma uphume kulo msizi bese ungeza ama-akhawunti kamuva kusukela kumenyu "
"yokuhlela."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
msgid "An error occurred"
msgstr "Kwenzeke iphutha"
@@ -2659,7 +3036,7 @@ msgstr "Ingabe unayo i-akhawunti obuyisebenzisa nolunye uhlelo lokuxoxa?"
#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
-msgstr "Yebo, ngenisa imininingwane ye-akhawunti yami isuka ku"
+msgstr "Yebo, ngenisa imininingwane ye-akhawunti yami isuka ku "
#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
@@ -2677,17 +3054,17 @@ msgstr "Cha, ngifuna ukubona abantu abakulayini abaseduze nje manje"
msgid "Select the accounts you want to import:"
msgstr "Khetha i-akhawunti ofuna ukuyingenisa:"
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Yebo"
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
msgid "No, that's all for now"
msgstr "Cha, yikho konke lokho okwamanje"
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
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 "
@@ -2699,16 +3076,16 @@ msgstr ""
"imininingwane engenhla ilungile. Ungaguqula kalula lemininingwane kamuva "
"noma unqabele lesici ngokusebenzisa ingxoxo yama-'akhawunti'"
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
-msgstr "Hlela>Ama-akhawunti"
+msgstr "Hlela->Ama-akhawunti"
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
-msgstr "Angifuni ukuvumela lesici manje"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "Angifuni _ukuvumela lesici manje"
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
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 "
@@ -2720,23 +3097,23 @@ msgstr ""
"ukuba ufake iphakethe le-thelephathi-salut bese udala i-akhawunti yabantu "
"abaseduze esuka kuma-akhawunti wezingxoxo"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
msgstr "i-thelephathi-salut ayifakwanga"
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Usizo lokulayeza nama VoIP akhawunti"
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
msgstr "Wamukelekile kwi-Empathy"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
msgid "Import your existing accounts"
msgstr "Ngenisa ama-akhawunti wakho akhona"
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
msgid "Please enter personal details"
msgstr "Uyacelwa ukuba ufake imininingwane yakho"
@@ -2753,34 +3130,34 @@ msgstr "Kukhona izinguquko ezingagciniwe kwi %s akhawunti yakho."
msgid "Your new account has not been saved yet."
msgstr "I-akhawunti yakho entsha ayikakagcinwa kuze kube manje."
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:880
msgid "Connecting…"
msgstr "Iyaxhuma…"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "Ngaphandle kolayini — %s"
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "Ayixhunyiwe — %s"
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "Ngaphandle kolayini — Akukho ukuxhumana kwenethiwekhi"
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "Isimo asaziwa"
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "Ngaphandle kolayini — i-akhawunti inqatshelwe"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2788,16 +3165,16 @@ msgstr ""
"Usuzodala i-akhawunti entsha, ezolahla\n"
"izinguquko zakho. Uqinisekile ukuba uyafuna ukuqhubeka?"
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ingabe ufuna ukususa u-%s kwikhompyutha yakho?"
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr "Lokhu angeke kususe i-akhawunti yakho kwisiphakeli."
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2806,15 +3183,15 @@ msgstr ""
"izinguquko zakho. Uqinisekile ukuba uyafuna ukuqhubeka?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Nikeza amandla"
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "_Khubaza"
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2823,18 +3200,22 @@ msgstr ""
"izinguquko zakho. Uqinisekile ukuba uyafuna ukuqhubeka?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Engeza…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "Ilayisha ulwazi lwe-akhawunti"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "Awukho umthetho olandelwayo ofakiwe"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "Umthetho olandelwayo:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2842,19 +3223,15 @@ msgstr ""
"Ukungeza i-akhawunti entsha, kumele kuqala ufake isibuyelimuva kuyo yonke "
"imithetho elandelwayo ofuna ukuyisebenzisa."
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Engeza…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "_Ngenisa…"
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr " - Ikhasimende le-Empathy eliqinisekisayo"
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Ukuqinisekiswa kwekhasimende le-Empathy"
@@ -2862,110 +3239,141 @@ msgstr "Ukuqinisekiswa kwekhasimende le-Empathy"
msgid "People nearby"
msgstr "Abantu abaseduze"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- Ikhasimende lomsindo/ividiyo ye-Empathy"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Ikhasimende lomsindo/ividiyo ye-Empathy"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:458
msgid "Contrast"
msgstr "Ugqamu-cishi"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:461
msgid "Brightness"
msgstr "Ukukhanya"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:464
msgid "Gamma"
-msgstr "I-Gamma"
+msgstr "i-Gamma"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:569
msgid "Volume"
msgstr "Ingakomsindo"
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1157
+#: ../src/empathy-call-window.ui.h:22
msgid "_Sidebar"
msgstr "_Ibha eseceleni"
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1177
+#: ../src/empathy-call-window.c:1149
msgid "Audio input"
msgstr "Okokufakwa okwemisindo"
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1181
+#: ../src/empathy-call-window.c:1153
msgid "Video input"
-msgstr "Okokufakwa okwevideyo"
+msgstr "Okokufakwa okwevidiyo"
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-call-window.c:1157
msgid "Dialpad"
msgstr "Iphedi lokudayela"
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1196
+#: ../src/empathy-call-window.c:1167
msgid "Details"
msgstr "Imininingwane"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1265
+#: ../src/empathy-call-window.c:1250
#, c-format
msgid "Call with %s"
msgstr "Thinta ngo %s"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1346
-msgid "Call"
-msgstr "Thinta"
-
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1498
+#: ../src/empathy-call-window.c:1447
msgid "The IP address as seen by the machine"
msgstr "Ikheli le-IP libonwe umshini"
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-call-window.c:1449
msgid "The IP address as seen by a server on the Internet"
msgstr "Ikheli le-IP njengoba libonwe isiphakeli kwi-inthanethi"
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-call-window.c:1451
msgid "The IP address of the peer as seen by the other side"
msgstr "Ikheli le-IP kantanga njengoba libonwa ngolunye uhlangothi"
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-call-window.c:1453
msgid "The IP address of a relay server"
msgstr "Ikheli lesiphakeli se-IP sokudlulisa"
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-call-window.c:1455
msgid "The IP address of the multicast group"
msgstr "Ikheli le-IP lokulandelelana leqembu"
+#: ../src/empathy-streamed-media-window.c:1888
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Akwaziwa"
+
+#: ../src/empathy-streamed-media-window.c:1891
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Akwaziwa"
+
+#: ../src/empathy-streamed-media-window.c:1894
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Akwaziwa"
+
+#: ../src/empathy-streamed-media-window.c:1897
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Akwaziwa"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2189
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Ixhunyiwe — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2250
+#: ../src/empathy-call-window.c:2167
msgid "Technical Details"
msgstr "Imininingwane yezobuchwepheshe"
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2205
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-msgstr "i-software %s's ayiqondi wonke amafomethi axhaswe yikhompyutha yakho"
+msgstr ""
+"I-software ka-%s ayiqondi wonke amafomethi emisindo axhaswe yikhompyutha "
+"yakho"
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2293
+#: ../src/empathy-call-window.c:2210
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-"I-software %s's ayiqondi wonke amafomethi wevideyo axhaswe yikhompyutha "
+"I-software ka-%s ayiqondi wonke amafomethi wevidiyo axhaswe yikhompyutha "
"yakho"
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2299
+#: ../src/empathy-call-window.c:2216
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2974,21 +3382,27 @@ msgstr ""
"Akukhonakali ukusungula ukuxhumeka ku %s. Njengoba omunye wenu angaba "
"kwinethiwekhi engavumeli ukuxhumeka ngqo."
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2305
+#: ../src/empathy-call-window.c:2222
msgid "There was a failure on the network"
msgstr "Kube nokuhluleka kwinethiwekhi"
-#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2309
+#: ../src/empathy-call-window.c:2226
msgid ""
"The audio formats necessary for this call are not installed on your computer"
-msgstr "Amafomethi adingeka kulolucingo awafakiwe kwi-khompyutha yakho"
+msgstr ""
+"Amafomethi emisindo adingeka kulolu cingo awafakiwe kwi-khompyutha yakho"
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2312
+#: ../src/empathy-call-window.c:2229
msgid ""
"The video formats necessary for this call are not installed on your computer"
-msgstr "Amafomethi wevidiyo adingeka kulo cingo awafakiwe kwi-khompyutha yakho"
+msgstr ""
+"Amafomethi wevidiyo adingeka kulolu cingo awafakiwe kwi-khompyutha yakho"
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:2241
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2996,150 +3410,169 @@ msgid ""
"the Help menu."
msgstr ""
"Kwenzeke obekungalindelwe kwingxenye ye-Telephathi. Uyacelwa <a href=\"%s\"> "
-"bika lebhagi</a>bese unamathisela amalogi athathwe kwifasitela le-'Debhagi' "
+"bika le bhagi</a>bese unamathisela amalogi athathwe kwifasitela le-'Debhagi' "
"kwimenyu yosizo."
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:2250
msgid "There was a failure in the call engine"
msgstr "Kube nokuhluleka kwinjini yocingo"
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:2253
msgid "The end of the stream was reached"
msgstr "Kufinyelelwe ekugcineni komchachazo"
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-call-window.c:2293
msgid "Can't establish audio stream"
msgstr "Akukhonakali ukusungula umchachazo wemisindo"
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2383
+#: ../src/empathy-call-window.c:2303
msgid "Can't establish video stream"
msgstr "Akukhonakali ukusungula umchachazo wevidiyo"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "Okwemisindo"
#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:2
msgid "Call the contact again"
msgstr "Shayela ucingo ongathintwa futhi"
#: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Ikhamera icinyiwe"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Kuhunyushwa i-codec:"
#: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Ikhamera ivuliwe"
+msgid "Disable camera"
+msgstr "Khubaza ikhamera"
#: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kuhunyushwa i-codec:"
+msgid "Display the dialpad"
+msgstr "Bonisa okokudayela"
#: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Nqabela ikhamera bese uvimba ukuthunyelwa kwevidiyo"
-
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Vumela ikhamera bese uthumela ividiyo"
-
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Vumela ikhamera kepha ungathumeli ividiyo"
-
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "Ibhala ngokufihla i-codec:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "Lengisa"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "Beka phansi ucingo lwamanje"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "Ikhandidethi lendawo:"
-#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Bonakuqala"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Ngikhulise"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Nginciphise"
+
+#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:14
msgid "Redial"
msgstr "Phinda udayele"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Ikhandidethi elikude:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Thumela okwemisindo"
+#: ../src/empathy-call-window.ui.h:15
+msgid "Send Video"
+msgstr "Thumela ividiyo"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Show dialpad"
+msgstr "Bonisa iphedi lokudayela"
+
#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Guquguqula ukuthunyelwa kwemisindo"
-#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "Iv_idiyo"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Toggle video transmission"
+msgstr "Guquguqula ukuthunyelwa kwevidiyo"
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Ividiyo"
+#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1813 ../src/empathy-call-window.c:1814
+#: ../src/empathy-call-window.c:1815 ../src/empathy-call-window.c:1816
+msgid "Unknown"
+msgstr "Akwaziwa"
#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Ividiyo icishiwe"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Ividiyo ivuliwe"
-
-#: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Bonakuqala ivideyo"
-
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Thinta"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Buka"
-#: ../src/empathy-chat-window.c:476 ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d akufundiwe)"
msgstr[1] "%s(%d akufundiwe)"
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (no %u omunye)"
msgstr[1] "%s (nabo %u abanye)"
-#: ../src/empathy-chat-window.c:504
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d akufundiwe kuvela kwabanye)"
msgstr[1] "%s (%d akufundiwe kuvela kwabanye)"
-#: ../src/empathy-chat-window.c:513
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d akufundiwe kuvela kubo bonke)"
msgstr[1] "%s (%d akufundiwe kuvela kubo bonke)"
-#: ../src/empathy-chat-window.c:715
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "i-SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Thumela %d umyalezo"
+msgstr[1] "Thumela %d imiyalezo"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Kuthayphiwa umlayezo."
@@ -3151,10 +3584,6 @@ msgstr "S_usa"
msgid "C_ontact"
msgstr "T_hinta"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Xoxa"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Faka _isimamatheki"
@@ -3175,7 +3604,7 @@ msgstr "Hambisa i-Tab _kwesokudla"
msgid "Notify for All Messages"
msgstr "Yazisa ngayo yonke imilayezo"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "_Okuqukethwe"
@@ -3187,15 +3616,11 @@ msgstr "_Ingxoxo"
msgid "_Detach Tab"
msgstr "_Susa i-Tab"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Edit"
-msgstr "_Hlela"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "_Igumbi lokuxoxa eliyintandokazi"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "_Usizo"
@@ -3213,21 +3638,21 @@ msgstr "_Bonisa uhlu lwabangathintwa"
#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
-msgstr "_Ama-Tabs"
+msgstr "_Amathebhu"
#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
msgstr "_Yekisa ukuvala i-Tab"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "Igama"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "Igumbi"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "Zixhumekele"
@@ -3235,90 +3660,95 @@ msgstr "Zixhumekele"
msgid "Manage Favorite Rooms"
msgstr "Manenja amagumbi ayizintandokazi"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "Ucingo lwevidiyo olungenayo"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "Ucingo olungenayo"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ukuthinta ngocingo lwevidiyo. Ingabe uyafuna ukumphendula?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s uyakuthinta. Ingabe uyafuna ukumphendula?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "Ucingo olungenayo lusuka ku %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "_Yenqabela"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "_Phendula"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "_Phendula ngevidiyo"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
-msgstr "Ucingo olungenayo lwevideyo lusuka ku %s"
+msgstr "Ucingo olungenayo lwevidiyo lusuka ku %s"
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "Isimemo segumbi"
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "Isimemo sokuxhumana no%s"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s ukumemela ukuba uxhumane no %s"
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "_Enqaba"
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Xhuma"
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s ukumemele ukuba uxhumeke ku-%s"
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "Umenyelwe ukuba uxhumeke ku-%s"
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Ifayela elidluliswayo elingenayo elibuya ku-%s"
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "Kudingeka igama lokungena"
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "u-%s angathanda ukuba nemvume yokukubona uma ungaphakathi kolayini"
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -3328,105 +3758,101 @@ msgstr ""
"Umlayezo: %s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Akwaziwa"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s ka %s ngo%s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s ka %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Iyamukela \"%s\" ku-%s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Ithumela i-\"%s\" ku %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Iphutha ngenkathi kwamukelwa u-\"%s\" esuka ku-%s"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Iphutha ngenkathi kwamukelwa ifayela"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Iphutha ngokuthumela u-\"%s\" ku-%s"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Iphutha ekuthumeleni ifayela"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" yamukelwe ku-%s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" ithunyelwe ku-%s"
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Ukudlulisa ifayela kuqediwe"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Kulindwe impendulo komunye umbambi qhaza"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Kuhlolwa ubuqotho buka -\"%s\""
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Ukusayinwa \"%s\""
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Ifayela"
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Okusele"
@@ -3465,39 +3891,55 @@ msgstr "Umthetho olandelwayo"
msgid "Source"
msgstr "Umthombo"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "Nikeza igama lokungena"
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "Khipha"
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "Akukho okufanayo okutholakele"
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "Xhuma futhi"
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "Hlela i-akhawunti"
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "Vala"
-#: ../src/empathy-main-window.c:1414
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Gcwalisa %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Gcwalisa isikweletu se-akhawunti"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "Gcwalisa..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "Thinta"
-#: ../src/empathy-main-window.c:1748
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
msgstr "Uhlu lwabangathintwa"
-#: ../src/empathy-main-window.c:1862
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "Bona bese uhlela ama-akhawunti"
@@ -3506,82 +3948,90 @@ msgid "Contacts on a _Map"
msgstr "Abangathintwa kwim_ephu"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "Inani lemali ekhona"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "Thola _kuhlu lwabangathintwa"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Xhumeka _kuzintandokazi"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Manenja izintandokazi"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "U_sayizi ojwayelekile"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "_Ucingo olusha…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Usayizi ojwayelekile _nemibonisomuntu"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "O_kuthandwayo"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Bonisa i_mithetho elandelwayo"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Hlunga _ngokwamagama"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Hlunga _ngokwesimo"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Ama-akhawunti"
#: ../src/empathy-main-window.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "_Abangathintwa abavinjiwe"
+
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "_Usayizi ocinene"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "_Lungisa"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "_Ukudluliswa kwamafayela"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "_Xhumeka…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Ingxoxo entsha…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "_Abangathintwa abangaphandle kolayini"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "_Ulwazi lomuntu"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Igumbi"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "_Sesha ongabathinta…"
@@ -3595,7 +4045,7 @@ msgstr "Amalunga"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:565
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3608,16 +4058,16 @@ msgstr ""
"Kudingeka igama lokungena%s\n"
"Amalunga:%s"
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Cha"
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Akuphumelelanga ukuqalwa kokuhlelwa kwegumbi"
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "Akuphumelelanga ukumiswa kokuhlelwa kwegumbi"
@@ -3637,8 +4087,8 @@ msgid ""
"Enter the server which hosts the room, or leave it empty if the room is on "
"the current account's server"
msgstr ""
-"Faka isiphakeli esiphethe igumbi, noma siyekele singenalutho uma ngabe "
-"leligumbi likusiphakeli se-akhawunti yamanje"
+"Faka isiphakeli esiphethe igumbi, noma siyekele singenalutho uma ngabe leli "
+"gumbi likusiphakeli se-akhawunti yamanje"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
@@ -3652,39 +4102,79 @@ msgstr "Uhlu lwegumbi"
msgid "_Room:"
msgstr "_Igumbi:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:156
msgid "Message received"
msgstr "Umlayezo wamukeliwe"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:157
msgid "Message sent"
msgstr "Umlayezo uthunyelwe"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:158
msgid "New conversation"
msgstr "Ingxoxo entsha"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:159
msgid "Contact goes online"
msgstr "Ongathintwa uya kulayini"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:160
msgid "Contact goes offline"
msgstr "Ongathintwa uya ngaphandle kolayini"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:161
msgid "Account connected"
msgstr "I-akhawunti ixhunyiwe"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:162
msgid "Account disconnected"
msgstr "I-akhawunti ayixhunyiwe"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:459
msgid "Language"
msgstr "Ulimi"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:709
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:716
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:722
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "We Romeo, Romeo ukuphi?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:725
+msgid "Deny thy father and refuse thy name;"
+msgstr "Phika ubabakho futhi wale igama lakho;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:728
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Noma mhlwawumbe angeke wenze njalo, kepha qinisekisa uthando lwami"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:731
+msgid "And I'll no longer be a Capulet."
+msgstr "Futhi angeke ngisaba i-Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Ingabe ngizozwa okungaphezulu, noma kumele ngikhulume kulokhu?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:737
+msgid "Juliet has disconnected"
+msgstr "u-Juliet akaxhunyiwe"
+
+#: ../src/empathy-preferences.c:1135
msgid "Preferences"
msgstr "Okuthandwayo"
@@ -3789,39 +4279,43 @@ msgid "Themes"
msgstr "Izindikimba"
#: ../src/empathy-preferences.ui.h:25
+msgid "Variant:"
+msgstr "Ukwahluka:"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Automatically connect on startup"
msgstr "_Zixhumekele uma kuqalwa"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Cellphone"
msgstr "_Umakhalekhukhwini"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
-msgstr "_Vumela izaziso zamabhamuza"
+msgstr "Vum_ela izaziso zamabhamuza"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
-msgstr "_Vumela izaziso zomsindo"
+msgstr "Vum_ela izaziso zomsindo"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_GPS"
-msgstr "_GPS"
+msgstr "i-_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Network (IP, Wi-Fi)"
-msgstr "_Inethiwekhi (IP, Wi-Fi)"
+msgstr "I_nethiwekhi (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Open new chats in separate windows"
msgstr "_Vula izingxoxo ezintsha kumafasitela ahlukile"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Publish location to my contacts"
msgstr "_Shicilela indawo kwabangathintwa bami"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Reduce location accuracy"
msgstr "_Yehlisa ukuqonda kwendawo"
@@ -3833,7 +4327,47 @@ msgstr "Isimo"
msgid "_Quit"
msgstr "_Phuma"
-#: ../src/empathy-map-view.c:453
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Ikhamera icinyiwe"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Ikhamera ivuliwe"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Nqabela ikhamera bese uvimba ukuthunyelwa kwevidiyo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Vumela ikhamera bese uthumela ividiyo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Vumela ikhamera kepha ungathumeli ividiyo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Bonakuqala"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "Iv_idiyo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Ividiyo icishiwe"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Ividiyo ivuliwe"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Bonakuqala ividiyo"
+
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Ukubonakala kwemephu yabangathintwa"
@@ -3845,100 +4379,101 @@ msgstr "Yonga"
msgid "Debug Window"
msgstr "Lungisa ifasitela"
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1476
msgid "Pause"
msgstr "Phumuza"
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1488
msgid "Level "
msgstr "Izinga "
-#: ../src/empathy-debug-window.c:1506
+#: ../src/empathy-debug-window.c:1508
msgid "Debug"
msgstr "Lungisa"
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1514
msgid "Info"
msgstr "Ulwazi"
-#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
msgid "Message"
msgstr "Umlayezo"
-#: ../src/empathy-debug-window.c:1524
+#: ../src/empathy-debug-window.c:1526
msgid "Warning"
msgstr "Isexwayiso"
-#: ../src/empathy-debug-window.c:1530
+#: ../src/empathy-debug-window.c:1532
msgid "Critical"
msgstr "Okumqoka"
-#: ../src/empathy-debug-window.c:1536
+#: ../src/empathy-debug-window.c:1538
msgid "Error"
msgstr "Iphutha"
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1557
msgid "Time"
msgstr "Isikhathi"
-#: ../src/empathy-debug-window.c:1558
+#: ../src/empathy-debug-window.c:1560
msgid "Domain"
msgstr "Umkhakha"
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1562
msgid "Category"
msgstr "Isigaba"
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1564
msgid "Level"
msgstr "Izinga"
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1601
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
-msgstr "Imenenja yezokuxhumana ekhethiwe ayisekeli iselulo sokulungisa esikude."
+msgstr ""
+"Imenenja yezokuxhumana ekhethiwe ayisekeli iselulo sokulungisa esikude."
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "Mema umbambi qhaza"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
msgstr "Khetha ongathintwa ukuze umumemele kwingxoxo:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "Mema"
-#: ../src/empathy-accounts.c:179
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Ungakhombisi izingxoxo; yenza noma yimuphi umsebenzi (isib.ukulanda) "
"nokuphuma"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:187
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
"Ungakhombisa izingxoxo uma ngabe kukhona ama-akhawunti \"wabantu abaseduze\""
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-"Khetha kuqala i-akhawunti enikiwe (isib. "
-"gabble/jabber/foo_40isibonelo_2eorg0)"
+"Khetha kuqala i-akhawunti enikiwe (isib. gabble/jabber/"
+"foo_40isibonelo_2eorg0)"
-#: ../src/empathy-accounts.c:189
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<i-akhawunti-id>"
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Ama-akhawunti we-Empathy"
-#: ../src/empathy-accounts.c:233
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Ama-akhawunti we-Empathy"
@@ -3950,24 +4485,90 @@ msgstr "Isilungiso se-Empathy"
msgid "- Empathy Chat Client"
msgstr "- Ikhasimende lengxoxo ye-Empathy"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "Phendula"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "Yenqabela"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "Phendula"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Phendula ngevidiyo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "Enqaba"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "Yamukela"
+
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Nikeza"
+
+#: ../src/empathy-call-observer.c:135
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "u-%s uceda ukuzama ukukushayela ucingo, kepha bowukolunye ucingo."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:787 ../src/empathy-call-window.c:801
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1257
+#, c-format
+msgid "Call with %d participants"
+msgstr "Thinta ngo %d wababambi qhaza"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2104
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:2105
+msgid "On hold"
+msgstr "Kubanjiwe"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Qhathanisa osonhlamvu"
+
+#~ msgid "All"
+#~ msgstr "Bonke"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Vunyelwe"
+
+#~ msgid "Date"
+#~ msgstr "Usuku"
+
+#~ msgid "Conversations"
+#~ msgstr "Izingxoxo"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Izingxoxo ezedlule"
+
+#~ msgid "_For:"
+#~ msgstr "_Funa okuthile:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Faka umlayezo oqokiwe"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Gcina umlayezo _omusha wesimo"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Imilayezo yesimo egciniwe"
diff --git a/release.py b/release.py
index 41b180105..1821aa32f 100755
--- a/release.py
+++ b/release.py
@@ -88,12 +88,9 @@ class Project:
def get_md5sums(self):
md5sums = ''
- cmd = 'md5sum %s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+ cmd = 'md5sum %s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
md5sums += self.exec_cmd(cmd)
- cmd = 'md5sum %s-%s.tar.bz2' % (self.package_name.lower(), self.package_version)
- md5sums += self.exec_cmd(cmd).strip()
-
return md5sums
def get_bugzilla_info(self):
@@ -259,7 +256,7 @@ class Project:
def upload_tarball(self):
username = self._get_username()
- tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+ tarball = '%s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)
self.exec_cmd(cmd)
diff --git a/src/Makefile.am b/src/Makefile.am
index bcf17de31..0232ffe0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -157,6 +157,8 @@ empathy_call_SOURCES = \
empathy-call-window.h \
empathy-call-window-fullscreen.c \
empathy-call-window-fullscreen.h \
+ empathy-about-dialog.c \
+ empathy-about-dialog.h \
empathy-audio-sink.c \
empathy-audio-sink.h \
empathy-audio-src.c \
@@ -165,8 +167,16 @@ empathy_call_SOURCES = \
empathy-video-src.h \
empathy-video-widget.c \
empathy-video-widget.h \
+ empathy-preferences.c \
+ empathy-preferences.h \
ev-sidebar.c \
- ev-sidebar.h
+ ev-sidebar.h \
+ empathy-camera-menu.c \
+ empathy-camera-menu.h \
+ empathy-mic-menu.c \
+ empathy-mic-menu.h \
+ empathy-rounded-actor.c \
+ empathy-rounded-actor.h
nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
@@ -259,10 +269,10 @@ dist_man_MANS = \
empathy.1 \
empathy-accounts.1
-src-marshal.list: $(empathy_SOURCES) Makefile.am
+src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am
$(AM_V_GEN)( cd $(srcdir) && \
sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
- $(empathy_SOURCES) $(empathy_av_SOURCES) ) \
+ $(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@if cmp -s $@.tmp $@; then \
rm $@.tmp; \
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 75b74812b..0eeec826c 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2517,68 +2517,30 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
gboolean if_needed,
gboolean hidden)
{
- GError *error = NULL;
- GdkDisplay *display;
- GString *cmd;
- gchar *path;
- GAppInfo *app_info;
- GdkAppLaunchContext *context = NULL;
+ GString *args;
- g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (!selected_account || TP_IS_ACCOUNT (selected_account));
- /* Try to run from source directory if possible */
- path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
- "empathy-accounts", NULL);
-
- if (!g_file_test (path, G_FILE_TEST_EXISTS))
- {
- g_free (path);
- path = g_build_filename (BIN_DIR, "empathy-accounts", NULL);
- }
-
- cmd = g_string_new (path);
- g_free (path);
+ args = g_string_new (NULL);
if (selected_account != NULL)
- {
- g_string_append_printf (cmd, " --select-account=%s",
- tp_account_get_path_suffix (selected_account));
- }
+ g_string_append_printf (args, " --select-account=%s",
+ tp_account_get_path_suffix (selected_account));
if (if_needed)
- g_string_append_printf (cmd, " --if-needed");
+ g_string_append_printf (args, " --if-needed");
if (hidden)
- g_string_append_printf (cmd, " --hidden");
+ g_string_append_printf (args, " --hidden");
DEBUG ("Launching empathy-accounts (if_needed: %d, hidden: %d, account: %s)",
if_needed, hidden,
selected_account == NULL ? "<none selected>" :
tp_proxy_get_object_path (TP_PROXY (selected_account)));
- app_info = g_app_info_create_from_commandline (cmd->str, NULL, 0, &error);
- if (app_info == NULL)
- {
- DEBUG ("Failed to create app info: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- display = gdk_screen_get_display (screen);
- context = gdk_display_get_app_launch_context (display);
-
- if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
- &error))
- {
- g_warning ("Failed to open accounts dialog: %s", error->message);
- g_error_free (error);
- }
+ empathy_launch_program (BIN_DIR, "empathy-accounts", args->str);
-out:
- tp_clear_object (&app_info);
- tp_clear_object (&context);
- g_string_free (cmd, TRUE);
+ g_string_free (args, TRUE);
}
gboolean
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index c410d7a30..3d4496cd1 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -23,10 +23,16 @@
#include <stdlib.h>
#include <gst/audio/audio.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/interfaces/streamvolume.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+
+#include <libempathy-gtk/empathy-call-utils.h>
#include "empathy-audio-sink.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
@@ -39,36 +45,6 @@ enum
static guint signals[LAST_SIGNAL] = {0};
#endif
-typedef struct {
- GstPad *pad;
- GstElement *bin;
- GstElement *volume;
- GstElement *sink;
-} AudioBin;
-
-static AudioBin *
-audio_bin_new (GstPad *pad,
- GstElement *bin,
- GstElement *volume,
- GstElement *sink)
-{
- AudioBin *result = g_slice_new0 (AudioBin);
-
- result->pad = pad;
- result->bin = bin;
- result->volume = gst_object_ref (volume);
- result->sink = sink;
-
- return result;
-}
-
-static void
-audio_bin_free (AudioBin *bin)
-{
- gst_object_unref (bin->volume);
- g_slice_free (AudioBin, bin);
-}
-
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE(
"sink%d",
@@ -84,16 +60,7 @@ enum {
struct _EmpathyGstAudioSinkPrivate
{
- gboolean dispose_has_run;
- FsElementAddedNotifier *notifier;
-
- gdouble volume;
-
- /* Pad -> *owned* subbin hash */
- GHashTable *audio_bins;
-
- /* Mutex to hold while change the hash table */
- GMutex *audio_bins_lock;
+ GstElement *sink;
};
#define EMPATHY_GST_AUDIO_SINK_GET_PRIVATE(o) \
@@ -101,72 +68,11 @@ struct _EmpathyGstAudioSinkPrivate
EmpathyGstAudioSinkPrivate))
static void
-empathy_audio_sink_element_added_cb (FsElementAddedNotifier *notifier,
- GstBin *bin, GstElement *element, EmpathyGstAudioSink *self)
-{
- EmpathyGstAudioSinkPrivate *priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
-
- if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume"))
- {
- /* An element was added with a volume property, lets find its subbin and
- * update the volume in it */
- GHashTableIter iter;
- AudioBin *audio_bin = NULL;
- gpointer value;
-
- g_mutex_lock (self->priv->audio_bins_lock);
- g_hash_table_iter_init (&iter, priv->audio_bins);
-
- while (g_hash_table_iter_next (&iter, NULL, &value))
- {
- AudioBin *b = value;
-
- if (gst_object_has_ancestor (GST_OBJECT (element),
- GST_OBJECT (b->bin)))
- {
- audio_bin = b;
- break;
- }
- }
-
- if (audio_bin == NULL)
- {
- g_warning ("Element added that doesn't belong to us ?");
- return;
- }
-
- /* Set the old volume to 1 and the new volume to the volume */
- g_object_set (audio_bin->volume, "volume", 1.0, NULL);
- gst_object_unref (audio_bin->volume);
-
- audio_bin->volume = gst_object_ref (element);
- g_object_set (audio_bin->volume, "volume", self->priv->volume, NULL);
- g_mutex_unlock (self->priv->audio_bins_lock);
- }
-}
-
-static void
empathy_audio_sink_init (EmpathyGstAudioSink *self)
{
- EmpathyGstAudioSinkPrivate *priv;
-
- priv = self->priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
-
- priv->volume = 1.0;
-
- priv->audio_bins = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL, (GDestroyNotify) audio_bin_free);
-
- priv->audio_bins_lock = g_mutex_new ();
-
- priv->notifier = fs_element_added_notifier_new ();
- g_signal_connect (priv->notifier, "element-added",
- G_CALLBACK (empathy_audio_sink_element_added_cb), self);
+ self->priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
}
-static void empathy_audio_sink_dispose (GObject *object);
-static void empathy_audio_sink_finalize (GObject *object);
-
static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
GstPadTemplate *templ,
const gchar* name);
@@ -219,9 +125,6 @@ empathy_audio_sink_class_init (EmpathyGstAudioSinkClass
g_type_class_add_private (empathy_audio_sink_class,
sizeof (EmpathyGstAudioSinkPrivate));
- object_class->dispose = empathy_audio_sink_dispose;
- object_class->finalize = empathy_audio_sink_finalize;
-
object_class->set_property = empathy_audio_sink_set_property;
object_class->get_property = empathy_audio_sink_get_property;
@@ -234,45 +137,6 @@ empathy_audio_sink_class_init (EmpathyGstAudioSinkClass
g_object_class_install_property (object_class, PROP_VOLUME, param_spec);
}
-void
-empathy_audio_sink_dispose (GObject *object)
-{
- EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (object);
- EmpathyGstAudioSinkPrivate *priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
-
- if (priv->dispose_has_run)
- return;
-
- priv->dispose_has_run = TRUE;
-
- if (priv->notifier != NULL)
- g_object_unref (priv->notifier);
- priv->notifier = NULL;
-
- if (priv->audio_bins != NULL)
- g_hash_table_unref (priv->audio_bins);
- priv->audio_bins = NULL;
-
- if (priv->audio_bins_lock != NULL)
- g_mutex_free (priv->audio_bins_lock);
- priv->audio_bins_lock = NULL;
-
- if (G_OBJECT_CLASS (empathy_audio_sink_parent_class)->dispose)
- G_OBJECT_CLASS (empathy_audio_sink_parent_class)->dispose (object);
-}
-
-void
-empathy_audio_sink_finalize (GObject *object)
-{
- //EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (object);
- //EmpathyGstAudioSinkPrivate *priv =
- // EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
-
- /* free any data held directly by the object here */
-
- G_OBJECT_CLASS (empathy_audio_sink_parent_class)->finalize (object);
-}
-
GstElement *
empathy_audio_sink_new (void)
{
@@ -287,32 +151,75 @@ empathy_audio_sink_new (void)
return gst_element_factory_make ("empathyaudiosink", NULL);
}
+static gboolean
+check_volume_support (EmpathyGstAudioSink *self)
+{
+ gchar *name;
+
+ if (GST_IS_STREAM_VOLUME (self->priv->sink))
+ return TRUE;
+
+ name = gst_element_get_name (self->priv->sink);
+ DEBUG ("Element %s doesn't support volume", name);
+
+ g_free (name);
+ return FALSE;
+}
+
void
empathy_audio_sink_set_volume (EmpathyGstAudioSink *sink, gdouble volume)
{
EmpathyGstAudioSinkPrivate *priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (sink);
- GHashTableIter iter;
- gpointer value;
-
- priv->volume = volume;
-
- g_mutex_lock (priv->audio_bins_lock);
- g_hash_table_iter_init (&iter, priv->audio_bins);
- while (g_hash_table_iter_next (&iter, NULL, &value))
- {
- AudioBin *b = value;
- g_object_set (b->volume, "volume", volume, NULL);
- }
+ if (!check_volume_support (sink))
+ return;
- g_mutex_unlock (priv->audio_bins_lock);
+ g_object_set (priv->sink, "volume", volume, NULL);
}
gdouble
empathy_audio_sink_get_volume (EmpathyGstAudioSink *sink)
{
EmpathyGstAudioSinkPrivate *priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (sink);
- return priv->volume;
+ gdouble volume;
+
+ if (!check_volume_support (sink))
+ return 1.0;
+
+ g_object_get (priv->sink, "volume", &volume, NULL);
+ return volume;
+}
+
+static GstElement *
+create_sink (void)
+{
+ GstElement *sink;
+ const gchar *description;
+
+ description = g_getenv ("EMPATHY_AUDIO_SINK");
+
+ if (description != NULL)
+ {
+ GError *error = NULL;
+
+ sink = gst_parse_bin_from_description (description, TRUE, &error);
+ if (sink == NULL)
+ {
+ DEBUG ("Failed to create bin %s: %s", description, error->message);
+ g_error_free (error);
+ }
+
+ return sink;
+ }
+
+ /* Use pulsesink as default */
+ sink = gst_element_factory_make ("pulsesink", NULL);
+ if (sink == NULL)
+ return NULL;
+
+ empathy_call_set_stream_properties (sink);
+
+ return sink;
}
static GstPad *
@@ -321,10 +228,9 @@ empathy_audio_sink_request_new_pad (GstElement *element,
const gchar* name)
{
EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
- GstElement *bin, *sink, *volume, *resample, *audioconvert0, *audioconvert1;
+ GstElement *bin, *volume, *resample, *audioconvert0, *audioconvert1;
GstPad *pad = NULL;
GstPad *subpad, *filterpad;
- AudioBin *audiobin;
bin = gst_bin_new (NULL);
@@ -352,15 +258,14 @@ empathy_audio_sink_request_new_pad (GstElement *element,
gst_bin_add (GST_BIN (bin), volume);
- sink = gst_element_factory_make ("gconfaudiosink", NULL);
- if (sink == NULL)
+ self->priv->sink = create_sink ();
+ if (self->priv->sink == NULL)
goto error;
- gst_bin_add (GST_BIN (bin), sink);
- fs_element_added_notifier_add (self->priv->notifier, GST_BIN (sink));
+ gst_bin_add (GST_BIN (bin), self->priv->sink);
if (!gst_element_link_many (audioconvert0, resample, audioconvert1,
- volume, sink, NULL))
+ volume, self->priv->sink, NULL))
goto error;
filterpad = gst_element_get_static_pad (audioconvert0, "sink");
@@ -372,25 +277,11 @@ empathy_audio_sink_request_new_pad (GstElement *element,
if (!gst_element_add_pad (GST_ELEMENT (bin), subpad))
goto error;
-
- /* Ensure that state changes only happen _after_ the element has been added
- * to the hash table. But add it to the bin first so we can create our
- * ghostpad (if we create the ghostpad before adding it to the bin it will
- * get unlinked) */
- gst_element_set_locked_state (GST_ELEMENT (bin), TRUE);
gst_bin_add (GST_BIN (self), bin);
pad = gst_ghost_pad_new (name, subpad);
g_assert (pad != NULL);
- audiobin = audio_bin_new (pad, bin, volume, sink);
-
- g_mutex_lock (self->priv->audio_bins_lock);
- g_hash_table_insert (self->priv->audio_bins, pad, audiobin);
- g_mutex_unlock (self->priv->audio_bins_lock);
-
- gst_element_set_locked_state (GST_ELEMENT (bin), FALSE);
-
if (!gst_element_sync_state_with_parent (bin))
goto error;
@@ -400,16 +291,11 @@ empathy_audio_sink_request_new_pad (GstElement *element,
if (!gst_element_add_pad (GST_ELEMENT (self), pad))
goto error;
-
return pad;
error:
if (pad != NULL)
{
- g_mutex_lock (self->priv->audio_bins_lock);
- g_hash_table_remove (self->priv->audio_bins, pad);
- g_mutex_unlock (self->priv->audio_bins_lock);
-
gst_object_unref (pad);
}
@@ -422,26 +308,6 @@ static void
empathy_audio_sink_release_pad (GstElement *element,
GstPad *pad)
{
- EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
- AudioBin *abin;
-
- g_mutex_lock (self->priv->audio_bins_lock);
- abin = g_hash_table_lookup (self->priv->audio_bins, pad);
- g_hash_table_steal (self->priv->audio_bins, pad);
- g_mutex_unlock (self->priv->audio_bins_lock);
-
- if (abin == NULL)
- {
- g_warning ("Releasing a pad that doesn't belong to us ?");
- return;
- }
-
gst_pad_set_active (pad, FALSE);
gst_element_remove_pad (element, pad);
-
- gst_element_set_locked_state (abin->bin, TRUE);
- gst_element_set_state (abin->bin, GST_STATE_NULL);
- gst_bin_remove (GST_BIN (self), abin->bin);
-
- audio_bin_free (abin);
}
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index a3416f2ea..8f7a0599f 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -22,9 +22,19 @@
#include <stdio.h>
#include <stdlib.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/glib-mainloop.h>
+
+#include <libempathy/empathy-utils.h>
+#include <libempathy-gtk/empathy-call-utils.h>
+
#include "empathy-audio-src.h"
+#include "src-marshal.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
+
G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
/* signal enum */
@@ -32,6 +42,8 @@ enum
{
PEAK_LEVEL_CHANGED,
RMS_LEVEL_CHANGED,
+ MICROPHONE_ADDED,
+ MICROPHONE_REMOVED,
LAST_SIGNAL
};
@@ -41,6 +53,7 @@ enum {
PROP_VOLUME = 1,
PROP_RMS_LEVEL,
PROP_PEAK_LEVEL,
+ PROP_MICROPHONE,
};
/* private structure */
@@ -52,7 +65,15 @@ struct _EmpathyGstAudioSrcPrivate
GstElement *src;
GstElement *volume;
GstElement *level;
- FsElementAddedNotifier *notifier;
+
+ pa_glib_mainloop *loop;
+ pa_context *context;
+ GQueue *operations;
+
+ /* 0 if not known yet */
+ guint source_output_idx;
+ /* G_MAXUINT if not known yet */
+ guint source_idx;
gdouble peak_level;
gdouble rms_level;
@@ -65,29 +86,331 @@ struct _EmpathyGstAudioSrcPrivate
(G_TYPE_INSTANCE_GET_PRIVATE ((o), EMPATHY_TYPE_GST_AUDIO_SRC, \
EmpathyGstAudioSrcPrivate))
+static gboolean
+empathy_audio_src_supports_changing_mic (EmpathyGstAudioSrc *self)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+ GObjectClass *object_class;
+
+ object_class = G_OBJECT_GET_CLASS (priv->src);
+
+ return (g_object_class_find_property (object_class,
+ "source-output-index") != NULL);
+}
+
+typedef void (*OperationFunc) (EmpathyGstAudioSrc *, GSimpleAsyncResult *);
+
+typedef struct
+{
+ OperationFunc func;
+ GSimpleAsyncResult *result;
+} Operation;
+
+static Operation *
+operation_new (OperationFunc func,
+ GSimpleAsyncResult *result)
+{
+ Operation *o = g_slice_new0 (Operation);
+
+ o->func = func;
+ o->result = result;
+
+ return o;
+}
+
+static void
+operation_free (Operation *o,
+ gboolean cancelled)
+{
+ if (cancelled)
+ {
+ g_simple_async_result_set_error (o->result,
+ G_IO_ERROR, G_IO_ERROR_CANCELLED,
+ "The audio source was disposed");
+ g_simple_async_result_complete (o->result);
+ g_object_unref (o->result);
+ }
+
+ g_slice_free (Operation, o);
+}
+
+static void
+operation_get_microphones_free (gpointer data)
+{
+ GQueue *queue = data;
+ GList *l;
+
+ for (l = queue->head; l != NULL; l = l->next)
+ {
+ EmpathyAudioSrcMicrophone *mic = l->data;
+
+ g_free (mic->name);
+ g_free (mic->description);
+ g_slice_free (EmpathyAudioSrcMicrophone, mic);
+ }
+
+ g_queue_free (queue);
+}
+
+static void
+operation_get_microphones_cb (pa_context *context,
+ const pa_source_info *info,
+ int eol,
+ void *userdata)
+{
+ GSimpleAsyncResult *result = userdata;
+ EmpathyAudioSrcMicrophone *mic;
+ GQueue *queue;
+
+ if (eol)
+ {
+ g_simple_async_result_complete (result);
+ g_object_unref (result);
+ return;
+ }
+
+ mic = g_slice_new0 (EmpathyAudioSrcMicrophone);
+ mic->index = info->index;
+ mic->name = g_strdup (info->name);
+ mic->description = g_strdup (info->description);
+ mic->is_monitor = (info->monitor_of_sink != PA_INVALID_INDEX);
+
+ /* add it to the queue */
+ queue = g_simple_async_result_get_op_res_gpointer (result);
+ g_queue_push_tail (queue, mic);
+}
+
+static void
+operation_get_microphones (EmpathyGstAudioSrc *self,
+ GSimpleAsyncResult *result)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+
+ g_assert_cmpuint (pa_context_get_state (priv->context), ==, PA_CONTEXT_READY);
+
+ g_simple_async_result_set_op_res_gpointer (result, g_queue_new (),
+ operation_get_microphones_free);
+
+ pa_context_get_source_info_list (priv->context,
+ operation_get_microphones_cb, result);
+}
+
+static void
+operation_change_microphone_cb (pa_context *context,
+ int success,
+ void *userdata)
+{
+ GSimpleAsyncResult *result = userdata;
+
+ if (!success)
+ {
+ g_simple_async_result_set_error (result, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Failed to change microphone. Reason unknown.");
+ }
+
+ g_simple_async_result_complete (result);
+ g_object_unref (result);
+}
+
+static void
+operation_change_microphone (EmpathyGstAudioSrc *self,
+ GSimpleAsyncResult *result)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+ guint source_output_idx, microphone;
+
+ g_object_get (priv->src, "source-output-index", &source_output_idx, NULL);
+
+ g_assert_cmpuint (pa_context_get_state (priv->context), ==, PA_CONTEXT_READY);
+ g_assert_cmpuint (source_output_idx, !=, PA_INVALID_INDEX);
+
+ microphone = GPOINTER_TO_UINT (
+ g_simple_async_result_get_op_res_gpointer (result));
+
+ pa_context_move_source_output_by_index (priv->context, source_output_idx, microphone,
+ operation_change_microphone_cb, result);
+}
+
+static void
+operations_run (EmpathyGstAudioSrc *self)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+ pa_context_state_t state = pa_context_get_state (priv->context);
+ GList *l;
+
+ if (state != PA_CONTEXT_READY)
+ return;
+
+ for (l = priv->operations->head; l != NULL; l = l->next)
+ {
+ Operation *o = l->data;
+
+ o->func (self, o->result);
+
+ operation_free (o, FALSE);
+ }
+
+ g_queue_clear (priv->operations);
+}
+
+static void
+empathy_audio_src_source_output_info_cb (pa_context *context,
+ const pa_source_output_info *info,
+ int eol,
+ void *userdata)
+{
+ EmpathyGstAudioSrc *self = userdata;
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+
+ if (eol)
+ return;
+
+ /* There should only be one call here. */
+
+ if (priv->source_idx == info->source)
+ return;
+
+ priv->source_idx = info->source;
+ g_object_notify (G_OBJECT (self), "microphone");
+}
+
+static void
+empathy_audio_src_source_info_cb (pa_context *context,
+ const pa_source_info *info,
+ int eol,
+ void *userdata)
+{
+ EmpathyGstAudioSrc *self = userdata;
+ gboolean is_monitor;
+
+ if (eol)
+ return;
+
+ is_monitor = (info->monitor_of_sink != PA_INVALID_INDEX);
+
+ g_signal_emit (self, signals[MICROPHONE_ADDED], 0,
+ info->index, info->name, info->description, is_monitor);
+}
+
static void
-empathy_audio_src_element_added_cb (FsElementAddedNotifier *notifier,
- GstBin *bin, GstElement *element, EmpathyGstAudioSrc *self)
+empathy_audio_src_pa_event_cb (pa_context *context,
+ pa_subscription_event_type_t type,
+ uint32_t idx,
+ void *userdata)
{
+ EmpathyGstAudioSrc *self = userdata;
EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
- if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume"))
+ if ((type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT
+ && (type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE
+ && idx == priv->source_output_idx)
+ {
+ /* Microphone in the source output has changed */
+ pa_context_get_source_output_info (context, idx,
+ empathy_audio_src_source_output_info_cb, self);
+ }
+ else if ((type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE
+ && (type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
{
- gdouble volume;
+ /* A mic has been removed */
+ g_signal_emit (self, signals[MICROPHONE_REMOVED], 0, idx);
+ }
+ else if ((type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE
+ && (type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW)
+ {
+ /* A mic has been plugged in */
+ pa_context_get_source_info_by_index (context, idx,
+ empathy_audio_src_source_info_cb, self);
+ }
+}
- volume = empathy_audio_src_get_volume (self);
- empathy_audio_src_set_volume (self, 1.0);
+static void
+empathy_audio_src_pa_subscribe_cb (pa_context *context,
+ int success,
+ void *userdata)
+{
+ if (!success)
+ DEBUG ("Failed to subscribe to PulseAudio events");
+}
- if (priv->volume != NULL)
- g_object_unref (priv->volume);
- priv->volume = g_object_ref (element);
+static void
+empathy_audio_src_pa_state_change_cb (pa_context *context,
+ void *userdata)
+{
+ EmpathyGstAudioSrc *self = userdata;
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+ pa_context_state_t state = pa_context_get_state (priv->context);
- if (volume != 1.0)
- empathy_audio_src_set_volume (self, volume);
+ if (state == PA_CONTEXT_READY)
+ {
+ /* Listen to pulseaudio events so we know when sources are
+ * added and when the microphone is changed. */
+ pa_context_set_subscribe_callback (priv->context,
+ empathy_audio_src_pa_event_cb, self);
+ pa_context_subscribe (priv->context,
+ PA_SUBSCRIPTION_MASK_SOURCE | PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT,
+ empathy_audio_src_pa_subscribe_cb, NULL);
+
+ operations_run (self);
}
}
static void
+empathy_audio_src_source_output_index_notify (GObject *object,
+ GParamSpec *pspec,
+ EmpathyGstAudioSrc *self)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+ guint source_output_idx = PA_INVALID_INDEX;
+
+ g_object_get (priv->src, "source-output-index", &source_output_idx, NULL);
+
+ if (source_output_idx == PA_INVALID_INDEX)
+ return;
+
+ if (priv->source_output_idx == source_output_idx)
+ return;
+
+ /* It's actually changed. */
+ priv->source_output_idx = source_output_idx;
+
+ pa_context_get_source_output_info (priv->context, source_output_idx,
+ empathy_audio_src_source_output_info_cb, self);
+}
+
+static GstElement *
+create_src (void)
+{
+ GstElement *src;
+ const gchar *description;
+
+ description = g_getenv ("EMPATHY_AUDIO_SRC");
+
+ if (description != NULL)
+ {
+ GError *error = NULL;
+
+ src = gst_parse_bin_from_description (description, TRUE, &error);
+ if (src == NULL)
+ {
+ DEBUG ("Failed to create bin %s: %s", description, error->message);
+ g_error_free (error);
+ }
+
+ return src;
+ }
+
+ /* Use pulsesrc as default */
+ src = gst_element_factory_make ("pulsesrc", NULL);
+ if (src == NULL)
+ return NULL;
+
+ empathy_call_set_stream_properties (src);
+
+ return src;
+}
+
+static void
empathy_audio_src_init (EmpathyGstAudioSrc *obj)
{
EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (obj);
@@ -96,15 +419,12 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
priv->peak_level = -G_MAXDOUBLE;
priv->lock = g_mutex_new ();
- priv->notifier = fs_element_added_notifier_new ();
- g_signal_connect (priv->notifier, "element-added",
- G_CALLBACK (empathy_audio_src_element_added_cb), obj);
+ priv->src = create_src ();
+ if (priv->src == NULL)
+ return;
- priv->src = gst_element_factory_make ("gconfaudiosrc", NULL);
gst_bin_add (GST_BIN (obj), priv->src);
- fs_element_added_notifier_add (priv->notifier, GST_BIN (priv->src));
-
priv->volume = gst_element_factory_make ("volume", NULL);
g_object_ref (priv->volume);
@@ -121,6 +441,27 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
gst_element_add_pad (GST_ELEMENT (obj), ghost);
gst_object_unref (G_OBJECT (src));
+
+ /* PulseAudio stuff: We need to create a dummy pa_glib_mainloop* so
+ * Pulse can use the mainloop that GTK has created for us. */
+ priv->loop = pa_glib_mainloop_new (NULL);
+ priv->context = pa_context_new (pa_glib_mainloop_get_api (priv->loop),
+ "EmpathyAudioSrc");
+
+ /* Listen to changes to GstPulseSrc:source-output-index so we know when
+ * it's no longer PA_INVALID_INDEX (starting for the first time) or if it
+ * changes (READY->NULL->READY...) */
+ g_signal_connect (priv->src, "notify::source-output-index",
+ G_CALLBACK (empathy_audio_src_source_output_index_notify),
+ obj);
+
+ /* Finally listen for state changes so we know when we've
+ * connected. */
+ pa_context_set_state_callback (priv->context,
+ empathy_audio_src_pa_state_change_cb, obj);
+ pa_context_connect (priv->context, NULL, 0, NULL);
+
+ priv->operations = g_queue_new ();
}
static void empathy_audio_src_dispose (GObject *object);
@@ -168,6 +509,9 @@ empathy_audio_src_get_property (GObject *object,
g_value_set_double (value, priv->rms_level);
g_mutex_unlock (priv->lock);
break;
+ case PROP_MICROPHONE:
+ g_value_set_uint (value, priv->source_idx);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -201,7 +545,12 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
param_spec = g_param_spec_double ("peak-level", "peak level", "peak level",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class, PROP_VOLUME, param_spec);
+ g_object_class_install_property (object_class, PROP_PEAK_LEVEL, param_spec);
+
+ param_spec = g_param_spec_uint ("microphone", "microphone", "microphone",
+ 0, G_MAXUINT, G_MAXUINT,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class, PROP_MICROPHONE, param_spec);
signals[PEAK_LEVEL_CHANGED] = g_signal_new ("peak-level-changed",
G_TYPE_FROM_CLASS (empathy_audio_src_class),
@@ -214,7 +563,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
param_spec = g_param_spec_double ("rms-level", "RMS level", "RMS level",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class, PROP_VOLUME, param_spec);
+ g_object_class_install_property (object_class, PROP_RMS_LEVEL, param_spec);
signals[RMS_LEVEL_CHANGED] = g_signal_new ("rms-level-changed",
@@ -224,6 +573,22 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
NULL, NULL,
g_cclosure_marshal_VOID__DOUBLE,
G_TYPE_NONE, 1, G_TYPE_DOUBLE);
+
+ signals[MICROPHONE_ADDED] = g_signal_new ("microphone-added",
+ G_TYPE_FROM_CLASS (empathy_audio_src_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ _src_marshal_VOID__UINT_STRING_STRING_BOOLEAN,
+ G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
+ signals[MICROPHONE_REMOVED] = g_signal_new ("microphone-removed",
+ G_TYPE_FROM_CLASS (empathy_audio_src_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__UINT,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
}
void
@@ -242,6 +607,14 @@ empathy_audio_src_dispose (GObject *object)
priv->idle_id = 0;
+ if (priv->context != NULL)
+ pa_context_unref (priv->context);
+ priv->context = NULL;
+
+ if (priv->loop != NULL)
+ pa_glib_mainloop_free (priv->loop);
+ priv->loop = NULL;
+
/* release any references held by the object here */
if (G_OBJECT_CLASS (empathy_audio_src_parent_class)->dispose)
@@ -257,6 +630,10 @@ empathy_audio_src_finalize (GObject *object)
/* free any data held directly by the object here */
g_mutex_free (priv->lock);
+ g_queue_foreach (priv->operations, (GFunc) operation_free,
+ GUINT_TO_POINTER (TRUE));
+ g_queue_free (priv->operations);
+
G_OBJECT_CLASS (empathy_audio_src_parent_class)->finalize (object);
}
@@ -384,4 +761,112 @@ empathy_audio_src_get_volume (EmpathyGstAudioSrc *src)
return volume;
}
+void
+empathy_audio_src_get_microphones_async (EmpathyGstAudioSrc *src,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (src);
+ Operation *operation;
+ GSimpleAsyncResult *simple;
+
+ simple = g_simple_async_result_new (G_OBJECT (src), callback, user_data,
+ empathy_audio_src_get_microphones_async);
+
+ /* If we can't change mic let's not pretend we can by returning the
+ * list of available mics. */
+ if (!empathy_audio_src_supports_changing_mic (src))
+ {
+ g_simple_async_result_set_error (simple, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "pulsesrc is not new enough to support changing microphone");
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+ return;
+ }
+
+ operation = operation_new (operation_get_microphones, simple);
+ g_queue_push_tail (priv->operations, operation);
+
+ /* gogogogo */
+ operations_run (src);
+}
+
+const GList *
+empathy_audio_src_get_microphones_finish (EmpathyGstAudioSrc *src,
+ GAsyncResult *result,
+ GError **error)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
+ GQueue *queue;
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return NULL;
+
+ g_return_val_if_fail (g_simple_async_result_is_valid (result,
+ G_OBJECT (src), empathy_audio_src_get_microphones_async),
+ NULL);
+ queue = g_simple_async_result_get_op_res_gpointer (simple);
+ return queue->head;
+}
+
+guint
+empathy_audio_src_get_microphone (EmpathyGstAudioSrc *src)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (src);
+
+ return priv->source_idx;
+}
+
+void
+empathy_audio_src_change_microphone_async (EmpathyGstAudioSrc *src,
+ guint microphone,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (src);
+ guint source_output_idx;
+ GSimpleAsyncResult *simple;
+ Operation *operation;
+
+ simple = g_simple_async_result_new (G_OBJECT (src), callback, user_data,
+ empathy_audio_src_change_microphone_async);
+
+ if (!empathy_audio_src_supports_changing_mic (src))
+ {
+ g_simple_async_result_set_error (simple, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "pulsesrc is not new enough to support changing microphone");
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+ return;
+ }
+
+ g_object_get (priv->src, "source-output-index", &source_output_idx, NULL);
+
+ if (source_output_idx == PA_INVALID_INDEX)
+ {
+ g_simple_async_result_set_error (simple, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "pulsesrc is not yet PLAYING");
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+ return;
+ }
+
+ g_simple_async_result_set_op_res_gpointer (simple,
+ GUINT_TO_POINTER (microphone), NULL);
+
+ operation = operation_new (operation_change_microphone, simple);
+ g_queue_push_tail (priv->operations, operation);
+
+ /* gogogogo */
+ operations_run (src);
+}
+
+gboolean
+empathy_audio_src_change_microphone_finish (EmpathyGstAudioSrc *src,
+ GAsyncResult *result,
+ GError **error)
+{
+ empathy_implement_finish_void (src,
+ empathy_audio_src_change_microphone_async);
+}
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index 4bca31b61..05e3c46cc 100644
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -23,6 +23,7 @@
#include <glib-object.h>
#include <gst/gst.h>
+#include <gio/gio.h>
G_BEGIN_DECLS
@@ -61,6 +62,26 @@ GstElement *empathy_audio_src_new (void);
void empathy_audio_src_set_volume (EmpathyGstAudioSrc *src, gdouble volume);
gdouble empathy_audio_src_get_volume (EmpathyGstAudioSrc *src);
+typedef struct
+{
+ guint index;
+ gchar *name;
+ gchar *description;
+ gboolean is_monitor;
+} EmpathyAudioSrcMicrophone;
+
+void empathy_audio_src_get_microphones_async (EmpathyGstAudioSrc *src,
+ GAsyncReadyCallback callback, gpointer user_data);
+const GList * empathy_audio_src_get_microphones_finish (EmpathyGstAudioSrc *src,
+ GAsyncResult *result, GError **error);
+
+guint empathy_audio_src_get_microphone (EmpathyGstAudioSrc *src);
+
+void empathy_audio_src_change_microphone_async (EmpathyGstAudioSrc *src,
+ guint microphone, GAsyncReadyCallback callback, gpointer user_data);
+gboolean empathy_audio_src_change_microphone_finish (EmpathyGstAudioSrc *src,
+ GAsyncResult *result, GError **error);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_GST_AUDIO_SRC_H__*/
diff --git a/src/empathy-av.c b/src/empathy-av.c
index 6f8c5ba61..70acfc4f3 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -132,7 +132,6 @@ main (int argc,
empathy_gtk_init ();
g_set_application_name (_("Empathy Audio/Video Client"));
- g_setenv ("PULSE_PROP_media.role", "phone", TRUE);
/* Make empathy and empathy-av appear as the same app in gnome-shell */
gdk_set_program_class ("Empathy");
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 1db5a34ef..c141b9ffa 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -391,7 +391,7 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
param_spec = g_param_spec_boolean ("initial-video",
"initial-video", "Whether the call should start with video",
FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_INITIAL_VIDEO,
param_spec);
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 343c69244..295af9383 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -41,8 +41,10 @@
#include <gst/farsight/fs-utils.h>
#include <libempathy/empathy-camera-monitor.h>
+#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-utils.h>
+
#include <libempathy-gtk/empathy-avatar-image.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-sound-manager.h>
@@ -56,19 +58,27 @@
#include "empathy-call-window-fullscreen.h"
#include "empathy-call-factory.h"
#include "empathy-video-widget.h"
+#include "empathy-about-dialog.h"
#include "empathy-audio-src.h"
#include "empathy-audio-sink.h"
#include "empathy-video-src.h"
-#include "ev-sidebar.h"
-
-#define BUTTON_ID "empathy-call-dtmf-button-id"
+#include "empathy-mic-menu.h"
+#include "empathy-preferences.h"
+#include "empathy-rounded-actor.h"
+#include "empathy-camera-menu.h"
#define CONTENT_HBOX_BORDER_WIDTH 6
#define CONTENT_HBOX_SPACING 3
#define CONTENT_HBOX_CHILDREN_PACKING_PADDING 3
#define SELF_VIDEO_SECTION_WIDTH 120
-#define SELF_VIDEO_SECTION_HEIGTH 90
+#define SELF_VIDEO_SECTION_HEIGHT 90
+#define SELF_VIDEO_SECTION_MARGIN 10
+
+#define FLOATING_TOOLBAR_OPACITY 192
+#define FLOATING_TOOLBAR_WIDTH 280
+#define FLOATING_TOOLBAR_HEIGHT 36
+#define FLOATING_TOOLBAR_SPACING 20
/* The avatar's default width and height are set to the same value because we
want a square icon. */
@@ -76,6 +86,8 @@
#define REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT \
EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT
+#define SMALL_TOOLBAR_SIZE 36
+
/* If an video input error occurs, the error message will start with "v4l" */
#define VIDEO_INPUT_ERROR_PREFIX "v4l"
@@ -101,6 +113,14 @@ typedef enum {
CAMERA_STATE_ON,
} CameraState;
+typedef enum {
+ PREVIEW_POS_NONE,
+ PREVIEW_POS_TOP_LEFT,
+ PREVIEW_POS_TOP_RIGHT,
+ PREVIEW_POS_BOTTOM_LEFT,
+ PREVIEW_POS_BOTTOM_RIGHT,
+} PreviewPosition;
+
struct _EmpathyCallWindowPriv
{
gboolean dispose_has_run;
@@ -120,26 +140,44 @@ struct _EmpathyCallWindowPriv
ClutterActor *video_output;
ClutterActor *video_preview;
ClutterActor *preview_hidden_button;
+ ClutterActor *preview_rectangle1;
+ ClutterActor *preview_rectangle2;
+ ClutterActor *preview_rectangle3;
+ ClutterActor *preview_rectangle4;
+ ClutterActor *preview_rectangle_box1;
+ ClutterActor *preview_rectangle_box2;
+ ClutterActor *preview_rectangle_box3;
+ ClutterActor *preview_rectangle_box4;
GtkWidget *video_container;
GtkWidget *remote_user_avatar_widget;
- GtkWidget *sidebar;
- GtkWidget *statusbar;
- GtkWidget *volume_button;
- GtkWidget *redial_button;
+ GtkWidget *remote_user_avatar_toolbar;
+ GtkWidget *remote_user_name_toolbar;
+ GtkWidget *status_label;
+ GtkWidget *hangup_button;
+ GtkWidget *audio_call_button;
+ GtkWidget *video_call_button;
GtkWidget *mic_button;
GtkWidget *camera_button;
GtkWidget *dialpad_button;
GtkWidget *toolbar;
+ GtkWidget *bottom_toolbar;
+ ClutterActor *floating_toolbar;
GtkWidget *pane;
- GtkAction *redial;
- GtkAction *menu_sidebar;
GtkAction *menu_fullscreen;
+ GtkAction *menu_swap_camera;
+
+ ClutterState *transitions;
/* The box that contains self and remote avatar and video
input/output. When we redial, we destroy and re-create the box */
ClutterActor *video_box;
ClutterLayoutManager *video_layout;
+ /* Coordinates of the preview drag event's start. */
+ PreviewPosition preview_pos;
+ gfloat event_x;
+ gfloat event_y;
+
/* We keep a reference on the hbox which contains the main content so we can
easilly repack everything when toggling fullscreen */
GtkWidget *content_hbox;
@@ -148,9 +186,6 @@ struct _EmpathyCallWindowPriv
guint bus_message_source_id;
gdouble volume;
- GtkWidget *volume_scale;
- GtkWidget *volume_progress_bar;
- GtkAdjustment *audio_input_adj;
GtkWidget *dtmf_panel;
@@ -182,15 +217,9 @@ struct _EmpathyCallWindowPriv
GList *notifiers;
- guint context_id;
-
GTimer *timer;
guint timer_id;
- GtkWidget *video_contrast;
- GtkWidget *video_brightness;
- GtkWidget *video_gamma;
-
GMutex *lock;
gboolean call_started;
gboolean sending_video;
@@ -202,13 +231,15 @@ struct _EmpathyCallWindowPriv
gboolean got_video;
guint got_video_src;
+ guint inactivity_src;
+
/* Those fields represent the state of the window before it actually was in
fullscreen mode. */
- gboolean sidebar_was_visible_before_fs;
+ gboolean dialpad_was_visible_before_fs;
gint original_width_before_fs;
gint original_height_before_fs;
- gint x, y, w, h, sidebar_width;
+ gint x, y, w, h, dialpad_width;
gboolean maximized;
/* TRUE if the call should be started when the pipeline is playing */
@@ -217,6 +248,10 @@ struct _EmpathyCallWindowPriv
gboolean pipeline_playing;
EmpathySoundManager *sound_mgr;
+
+ GSettings *settings;
+ EmpathyMicMenu *mic_menu;
+ EmpathyCameraMenu *camera_menu;
};
#define GET_PRIV(o) (EMPATHY_CALL_WINDOW (o)->priv)
@@ -236,19 +271,6 @@ static void empathy_call_window_set_send_video (EmpathyCallWindow *window,
static void empathy_call_window_mic_toggled_cb (
GtkToggleToolButton *toggle, EmpathyCallWindow *window);
-static void empathy_call_window_sidebar_cb (GtkToggleAction *menu,
- EmpathyCallWindow *self);
-
-static void empathy_call_window_sidebar_hidden_cb (EvSidebar *sidebar,
- EmpathyCallWindow *window);
-
-static void empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
- EmpathyCallWindow *window);
-
-static void empathy_call_window_sidebar_changed_cb (EvSidebar *sidebar,
- const gchar *page,
- EmpathyCallWindow *window);
-
static void empathy_call_window_hangup_cb (gpointer object,
EmpathyCallWindow *window);
@@ -269,9 +291,6 @@ static gboolean empathy_call_window_video_output_motion_notify (
static void empathy_call_window_video_menu_popup (EmpathyCallWindow *window,
guint button);
-static void empathy_call_window_redial_cb (gpointer object,
- EmpathyCallWindow *window);
-
static void empathy_call_window_dialpad_cb (GtkToggleToolButton *button,
EmpathyCallWindow *window);
@@ -288,30 +307,29 @@ empathy_call_window_volume_changed_cb (GtkScaleButton *button,
gdouble value, EmpathyCallWindow *window);
static void
-empathy_call_window_setup_toolbar (EmpathyCallWindow *self)
+empathy_call_window_show_hangup_button (EmpathyCallWindow *self,
+ gboolean show)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
- GtkToolItem *tool_item;
-
- /* Add an empty expanded GtkToolItem so the volume button is at the end of
- * the toolbar. */
- tool_item = gtk_tool_item_new ();
- gtk_tool_item_set_expand (tool_item, TRUE);
- gtk_widget_show (GTK_WIDGET (tool_item));
- gtk_toolbar_insert (GTK_TOOLBAR (priv->toolbar), tool_item, -1);
+ gtk_widget_set_visible (self->priv->hangup_button, show);
+ gtk_widget_set_visible (self->priv->audio_call_button, !show);
+ gtk_widget_set_visible (self->priv->video_call_button, !show);
+}
- priv->volume_button = gtk_volume_button_new ();
- /* FIXME listen to the audiosinks signals and update the button according to
- * that, for now starting out at 1.0 and assuming only the app changes the
- * volume will do */
- gtk_scale_button_set_value (GTK_SCALE_BUTTON (priv->volume_button), 1.0);
- g_signal_connect (G_OBJECT (priv->volume_button), "value-changed",
- G_CALLBACK (empathy_call_window_volume_changed_cb), self);
+static void
+empathy_call_window_audio_call_cb (GtkToggleToolButton *button,
+ EmpathyCallWindow *self)
+{
+ g_object_set (self->priv->handler, "initial-video", FALSE, NULL);
+ empathy_call_window_restart_call (self);
+}
- tool_item = gtk_tool_item_new ();
- gtk_container_add (GTK_CONTAINER (tool_item), priv->volume_button);
- gtk_widget_show_all (GTK_WIDGET (tool_item));
- gtk_toolbar_insert (GTK_TOOLBAR (priv->toolbar), tool_item, -1);
+static void
+empathy_call_window_video_call_cb (GtkToggleToolButton *button,
+ EmpathyCallWindow *self)
+{
+ empathy_call_window_set_send_video (self, CAMERA_STATE_ON);
+ g_object_set (self->priv->handler, "initial-video", TRUE, NULL);
+ empathy_call_window_restart_call (self);
}
static void
@@ -324,7 +342,7 @@ dtmf_button_pressed_cb (GtkButton *button, EmpathyCallWindow *window)
g_object_get (priv->handler, "call-channel", &call, NULL);
- button_quark = g_quark_from_static_string (BUTTON_ID);
+ button_quark = g_quark_from_static_string (EMPATHY_DTMF_BUTTON_ID);
event = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (button),
button_quark));
@@ -346,182 +364,14 @@ dtmf_button_released_cb (GtkButton *button, EmpathyCallWindow *window)
g_object_unref (call);
}
-static GtkWidget *
-empathy_call_window_create_dtmf (EmpathyCallWindow *self)
-{
- GtkWidget *table;
- int i;
- GQuark button_quark;
- struct {
- const gchar *label;
- TpDTMFEvent event;
- } dtmfbuttons[] = { { "1", TP_DTMF_EVENT_DIGIT_1 },
- { "2", TP_DTMF_EVENT_DIGIT_2 },
- { "3", TP_DTMF_EVENT_DIGIT_3 },
- { "4", TP_DTMF_EVENT_DIGIT_4 },
- { "5", TP_DTMF_EVENT_DIGIT_5 },
- { "6", TP_DTMF_EVENT_DIGIT_6 },
- { "7", TP_DTMF_EVENT_DIGIT_7 },
- { "8", TP_DTMF_EVENT_DIGIT_8 },
- { "9", TP_DTMF_EVENT_DIGIT_9 },
- { "#", TP_DTMF_EVENT_HASH },
- { "0", TP_DTMF_EVENT_DIGIT_0 },
- { "*", TP_DTMF_EVENT_ASTERISK },
- { NULL, } };
-
- button_quark = g_quark_from_static_string (BUTTON_ID);
-
- table = gtk_table_new (4, 3, TRUE);
-
- for (i = 0; dtmfbuttons[i].label != NULL; i++)
- {
- GtkWidget *button = gtk_button_new_with_label (dtmfbuttons[i].label);
- gtk_table_attach (GTK_TABLE (table), button, i % 3, i % 3 + 1,
- i/3, i/3 + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-
- g_object_set_qdata (G_OBJECT (button), button_quark,
- GUINT_TO_POINTER (dtmfbuttons[i].event));
-
- g_signal_connect (G_OBJECT (button), "pressed",
- G_CALLBACK (dtmf_button_pressed_cb), self);
- g_signal_connect (G_OBJECT (button), "released",
- G_CALLBACK (dtmf_button_released_cb), self);
- }
-
- return table;
-}
-
-static GtkWidget *
-empathy_call_window_create_video_input_add_slider (EmpathyCallWindow *self,
- gchar *label_text, GtkWidget *bin)
-{
- GtkWidget *vbox = gtk_vbox_new (FALSE, 2);
- GtkWidget *scale = gtk_vscale_new_with_range (0, 100, 10);
- GtkWidget *label = gtk_label_new (label_text);
-
- gtk_widget_set_sensitive (scale, FALSE);
-
- gtk_container_add (GTK_CONTAINER (bin), vbox);
-
- gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), scale, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
- return scale;
-}
-
static void
-empathy_call_window_video_contrast_changed_cb (GtkAdjustment *adj,
- EmpathyCallWindow *self)
-
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
-
- empathy_video_src_set_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_CONTRAST, gtk_adjustment_get_value (adj));
-}
-
-static void
-empathy_call_window_video_brightness_changed_cb (GtkAdjustment *adj,
- EmpathyCallWindow *self)
-
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
-
- empathy_video_src_set_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_BRIGHTNESS, gtk_adjustment_get_value (adj));
-}
-
-static void
-empathy_call_window_video_gamma_changed_cb (GtkAdjustment *adj,
- EmpathyCallWindow *self)
-
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
-
- empathy_video_src_set_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_GAMMA, gtk_adjustment_get_value (adj));
-}
-
-
-static GtkWidget *
-empathy_call_window_create_video_input (EmpathyCallWindow *self)
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
- GtkWidget *hbox;
-
- hbox = gtk_hbox_new (TRUE, 3);
-
- priv->video_contrast = empathy_call_window_create_video_input_add_slider (
- self, _("Contrast"), hbox);
-
- priv->video_brightness = empathy_call_window_create_video_input_add_slider (
- self, _("Brightness"), hbox);
-
- priv->video_gamma = empathy_call_window_create_video_input_add_slider (
- self, _("Gamma"), hbox);
-
- return hbox;
-}
-
-static void
-empathy_call_window_setup_video_input (EmpathyCallWindow *self)
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
- guint supported;
- GtkAdjustment *adj;
-
- supported = empathy_video_src_get_supported_channels (priv->video_input);
-
- if (supported & EMPATHY_GST_VIDEO_SRC_SUPPORTS_CONTRAST)
- {
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->video_contrast));
-
- gtk_adjustment_set_value (adj,
- empathy_video_src_get_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_CONTRAST));
-
- g_signal_connect (G_OBJECT (adj), "value-changed",
- G_CALLBACK (empathy_call_window_video_contrast_changed_cb), self);
-
- gtk_widget_set_sensitive (priv->video_contrast, TRUE);
- }
-
- if (supported & EMPATHY_GST_VIDEO_SRC_SUPPORTS_BRIGHTNESS)
- {
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->video_brightness));
-
- gtk_adjustment_set_value (adj,
- empathy_video_src_get_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_BRIGHTNESS));
-
- g_signal_connect (G_OBJECT (adj), "value-changed",
- G_CALLBACK (empathy_call_window_video_brightness_changed_cb), self);
- gtk_widget_set_sensitive (priv->video_brightness, TRUE);
- }
-
- if (supported & EMPATHY_GST_VIDEO_SRC_SUPPORTS_GAMMA)
- {
- adj = gtk_range_get_adjustment (GTK_RANGE (priv->video_gamma));
-
- gtk_adjustment_set_value (adj,
- empathy_video_src_get_channel (priv->video_input,
- EMPATHY_GST_VIDEO_SRC_CHANNEL_GAMMA));
-
- g_signal_connect (G_OBJECT (adj), "value-changed",
- G_CALLBACK (empathy_call_window_video_gamma_changed_cb), self);
- gtk_widget_set_sensitive (priv->video_gamma, TRUE);
- }
-}
-
-static void
-empathy_call_window_mic_volume_changed_cb (GtkAdjustment *adj,
- EmpathyCallWindow *self)
+empathy_call_window_mic_volume_changed (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
gdouble volume;
- volume = gtk_adjustment_get_value (adj)/100.0;
+ volume = g_settings_get_double (priv->settings,
+ EMPATHY_PREFS_CALL_SOUND_VOLUME) / 100.0;
/* Don't store the volume because of muting */
if (volume > 0 || gtk_toggle_tool_button_get_active (
@@ -540,56 +390,22 @@ empathy_call_window_mic_volume_changed_cb (GtkAdjustment *adj,
}
static void
-empathy_call_window_audio_input_level_changed_cb (EmpathyGstAudioSrc *src,
- gdouble level, EmpathyCallWindow *window)
+empathy_call_window_prefs_volume_changed_cb (GSettings *settings,
+ gchar *key,
+ EmpathyCallWindow *self)
{
- gdouble value;
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
- value = CLAMP (pow (10, level / 20), 0.0, 1.0);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->volume_progress_bar),
- value);
+ empathy_call_window_mic_volume_changed (self);
}
-static GtkWidget *
-empathy_call_window_create_audio_input (EmpathyCallWindow *self)
+static void
+empathy_call_window_raise_actors (EmpathyCallWindow *self)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
- GtkWidget *hbox, *vbox, *label;
-
- hbox = gtk_hbox_new (TRUE, 3);
-
- vbox = gtk_vbox_new (FALSE, 3);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 3);
-
- priv->volume_scale = gtk_vscale_new_with_range (0, 150, 100);
- gtk_range_set_inverted (GTK_RANGE (priv->volume_scale), TRUE);
- label = gtk_label_new (_("Volume"));
-
- priv->audio_input_adj = gtk_range_get_adjustment (
- GTK_RANGE (priv->volume_scale));
- priv->volume = empathy_audio_src_get_volume (EMPATHY_GST_AUDIO_SRC
- (priv->audio_input));
- gtk_adjustment_set_value (priv->audio_input_adj, priv->volume * 100);
-
- g_signal_connect (G_OBJECT (priv->audio_input_adj), "value-changed",
- G_CALLBACK (empathy_call_window_mic_volume_changed_cb), self);
-
- gtk_box_pack_start (GTK_BOX (vbox), priv->volume_scale, TRUE, TRUE, 3);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 3);
-
- priv->volume_progress_bar = gtk_progress_bar_new ();
+ clutter_actor_raise_top (self->priv->floating_toolbar);
- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->volume_progress_bar),
- GTK_ORIENTATION_VERTICAL);
-
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->volume_progress_bar),
- 0);
-
- gtk_box_pack_start (GTK_BOX (hbox), priv->volume_progress_bar, FALSE, FALSE,
- 3);
-
- return hbox;
+ clutter_actor_raise_top (self->priv->preview_rectangle_box1);
+ clutter_actor_raise_top (self->priv->preview_rectangle_box2);
+ clutter_actor_raise_top (self->priv->preview_rectangle_box3);
+ clutter_actor_raise_top (self->priv->preview_rectangle_box4);
}
static void
@@ -600,6 +416,8 @@ empathy_call_window_show_video_output (EmpathyCallWindow *self,
g_object_set (self->priv->video_output, "visible", show, NULL);
gtk_widget_set_visible (self->priv->remote_user_avatar_widget, !show);
+
+ empathy_call_window_raise_actors (self);
}
static void
@@ -647,10 +465,6 @@ create_audio_input (EmpathyCallWindow *self)
priv->audio_input = empathy_audio_src_new ();
gst_object_ref (priv->audio_input);
gst_object_sink (priv->audio_input);
-
- tp_g_signal_connect_object (priv->audio_input, "peak-level-changed",
- G_CALLBACK (empathy_call_window_audio_input_level_changed_cb),
- self, 0);
}
static void
@@ -718,6 +532,67 @@ empathy_call_window_maximise_camera_cb (GtkAction *action,
}
static void
+empathy_call_window_swap_camera_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ const GList *cameras, *l;
+ gchar *current_cam;
+
+ DEBUG ("Swapping the camera");
+
+ cameras = empathy_camera_monitor_get_cameras (self->priv->camera_monitor);
+ current_cam = empathy_video_src_dup_device (
+ EMPATHY_GST_VIDEO_SRC (self->priv->video_input));
+
+ for (l = cameras; l != NULL; l = l->next)
+ {
+ EmpathyCamera *camera = l->data;
+
+ if (!tp_strdiff (camera->device, current_cam))
+ {
+ EmpathyCamera *next;
+
+ if (l->next != NULL)
+ next = l->next->data;
+ else
+ next = cameras->data;
+
+ /* EmpathyCameraMenu will update itself and do the actual change
+ * for us */
+ g_settings_set_string (self->priv->settings,
+ EMPATHY_PREFS_CALL_CAMERA_DEVICE,
+ next->device);
+
+ break;
+ }
+ }
+
+ g_free (current_cam);
+}
+
+static void
+empathy_call_window_camera_added_cb (EmpathyCameraMonitor *monitor,
+ EmpathyCamera *camera,
+ EmpathyCallWindow *self)
+{
+ const GList *cameras = empathy_camera_monitor_get_cameras (monitor);
+
+ gtk_action_set_visible (self->priv->menu_swap_camera,
+ g_list_length ((GList *) cameras) >= 2);
+}
+
+static void
+empathy_call_window_camera_removed_cb (EmpathyCameraMonitor *monitor,
+ EmpathyCamera *camera,
+ EmpathyCallWindow *self)
+{
+ const GList *cameras = empathy_camera_monitor_get_cameras (monitor);
+
+ gtk_action_set_visible (self->priv->menu_swap_camera,
+ g_list_length ((GList *) cameras) >= 2);
+}
+
+static void
empathy_call_window_preview_button_clicked_cb (GtkButton *button,
EmpathyCallWindow *self)
{
@@ -743,21 +618,353 @@ empathy_call_window_preview_hidden_button_clicked_cb (GtkButton *button,
gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
}
+static ClutterActor *
+empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
+ ClutterActor **box,
+ ClutterBinAlignment x,
+ ClutterBinAlignment y)
+{
+ ClutterLayoutManager *layout1, *layout2;
+ ClutterActor *rectangle;
+ ClutterActor *box1, *box2;
+
+ layout1 = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
+ CLUTTER_BIN_ALIGNMENT_START);
+
+ box1 = clutter_box_new (layout1);
+
+ *box = box1;
+
+ rectangle = clutter_rectangle_new_with_color (
+ CLUTTER_COLOR_Transparent);
+
+ clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle),
+ 1);
+
+ clutter_actor_set_size (box1,
+ SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
+ SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN +
+ FLOATING_TOOLBAR_HEIGHT + FLOATING_TOOLBAR_SPACING);
+
+ layout2 = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
+ CLUTTER_BIN_ALIGNMENT_CENTER);
+
+ /* We have a box with the margins and the video in the middle inside
+ * a bigger box with an extra bottom margin so we're not on top of
+ * the floating toolbar. */
+ box2 = clutter_box_new (layout2);
+
+ clutter_actor_set_size (box2,
+ SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
+ SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
+
+ clutter_actor_set_size (rectangle,
+ SELF_VIDEO_SECTION_WIDTH + 5, SELF_VIDEO_SECTION_HEIGHT + 5);
+
+ clutter_container_add_actor (CLUTTER_CONTAINER (box1), box2);
+ clutter_container_add_actor (CLUTTER_CONTAINER (box2), rectangle);
+
+ clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (self->priv->video_layout),
+ box1, x, y);
+
+ clutter_actor_hide (rectangle);
+
+ return rectangle;
+}
+
+static void
+empathy_call_window_create_preview_rectangles (EmpathyCallWindow *self)
+{
+ self->priv->preview_rectangle1 =
+ empathy_call_window_create_preview_rectangle (self,
+ &self->priv->preview_rectangle_box1,
+ CLUTTER_BIN_ALIGNMENT_START, CLUTTER_BIN_ALIGNMENT_START);
+ self->priv->preview_rectangle2 =
+ empathy_call_window_create_preview_rectangle (self,
+ &self->priv->preview_rectangle_box2,
+ CLUTTER_BIN_ALIGNMENT_START, CLUTTER_BIN_ALIGNMENT_END);
+ self->priv->preview_rectangle3 =
+ empathy_call_window_create_preview_rectangle (self,
+ &self->priv->preview_rectangle_box3,
+ CLUTTER_BIN_ALIGNMENT_END, CLUTTER_BIN_ALIGNMENT_START);
+ self->priv->preview_rectangle4 =
+ empathy_call_window_create_preview_rectangle (self,
+ &self->priv->preview_rectangle_box4,
+ CLUTTER_BIN_ALIGNMENT_END, CLUTTER_BIN_ALIGNMENT_END);
+}
+
+static void
+empathy_call_window_show_preview_rectangles (EmpathyCallWindow *self,
+ gboolean show)
+{
+ g_object_set (self->priv->preview_rectangle1, "visible", show, NULL);
+ g_object_set (self->priv->preview_rectangle2, "visible", show, NULL);
+ g_object_set (self->priv->preview_rectangle3, "visible", show, NULL);
+ g_object_set (self->priv->preview_rectangle4, "visible", show, NULL);
+}
+
+static PreviewPosition
+empathy_call_window_get_preview_position (EmpathyCallWindow *self,
+ gfloat event_x,
+ gfloat event_y)
+{
+ ClutterGeometry box;
+ PreviewPosition pos = PREVIEW_POS_NONE;
+
+ clutter_actor_get_geometry (self->priv->video_box, &box);
+
+ if (0 + SELF_VIDEO_SECTION_MARGIN <= event_x &&
+ event_x <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) &&
+ 0 + SELF_VIDEO_SECTION_MARGIN <= event_y &&
+ event_y <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGHT))
+ {
+ pos = PREVIEW_POS_TOP_LEFT;
+ }
+ else if (box.width - SELF_VIDEO_SECTION_MARGIN >= event_x &&
+ event_x >= (box.width - SELF_VIDEO_SECTION_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) &&
+ 0 + SELF_VIDEO_SECTION_MARGIN <= event_y &&
+ event_y <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGHT))
+ {
+ pos = PREVIEW_POS_TOP_RIGHT;
+ }
+ else if (0 + SELF_VIDEO_SECTION_MARGIN <= event_x &&
+ event_x <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) &&
+ box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y &&
+ event_y >= (box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGHT))
+ {
+ pos = PREVIEW_POS_BOTTOM_LEFT;
+ }
+ else if (box.width - SELF_VIDEO_SECTION_MARGIN >= event_x &&
+ event_x >= (box.width - SELF_VIDEO_SECTION_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) &&
+ box.height - SELF_VIDEO_SECTION_MARGIN - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y &&
+ event_y >= (box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGHT))
+ {
+ pos = PREVIEW_POS_BOTTOM_RIGHT;
+ }
+
+ return pos;
+}
+
+static ClutterActor *
+empathy_call_window_get_preview_rectangle (EmpathyCallWindow *self,
+ PreviewPosition pos)
+{
+ ClutterActor *rectangle;
+
+ switch (pos)
+ {
+ case PREVIEW_POS_TOP_LEFT:
+ rectangle = self->priv->preview_rectangle1;
+ break;
+ case PREVIEW_POS_TOP_RIGHT:
+ rectangle = self->priv->preview_rectangle3;
+ break;
+ case PREVIEW_POS_BOTTOM_LEFT:
+ rectangle = self->priv->preview_rectangle2;
+ break;
+ case PREVIEW_POS_BOTTOM_RIGHT:
+ rectangle = self->priv->preview_rectangle4;
+ break;
+ default:
+ rectangle = NULL;
+ }
+
+ return rectangle;
+}
+
+static void
+empathy_call_window_move_video_preview (EmpathyCallWindow *self,
+ PreviewPosition pos)
+{
+ ClutterBinLayout *layout = CLUTTER_BIN_LAYOUT (self->priv->video_layout);
+
+ DEBUG ("moving the video preview to %d", pos);
+
+ self->priv->preview_pos = pos;
+
+ switch (pos)
+ {
+ case PREVIEW_POS_TOP_LEFT:
+ clutter_bin_layout_set_alignment (layout,
+ self->priv->video_preview,
+ CLUTTER_BIN_ALIGNMENT_START,
+ CLUTTER_BIN_ALIGNMENT_START);
+ break;
+ case PREVIEW_POS_TOP_RIGHT:
+ clutter_bin_layout_set_alignment (layout,
+ self->priv->video_preview,
+ CLUTTER_BIN_ALIGNMENT_END,
+ CLUTTER_BIN_ALIGNMENT_START);
+ break;
+ case PREVIEW_POS_BOTTOM_LEFT:
+ clutter_bin_layout_set_alignment (layout,
+ self->priv->video_preview,
+ CLUTTER_BIN_ALIGNMENT_START,
+ CLUTTER_BIN_ALIGNMENT_END);
+ break;
+ case PREVIEW_POS_BOTTOM_RIGHT:
+ clutter_bin_layout_set_alignment (layout,
+ self->priv->video_preview,
+ CLUTTER_BIN_ALIGNMENT_END,
+ CLUTTER_BIN_ALIGNMENT_END);
+ break;
+ default:
+ g_warn_if_reached ();
+ }
+}
+
+static void
+empathy_call_window_highlight_preview_rectangle (EmpathyCallWindow *self,
+ PreviewPosition pos)
+{
+ ClutterActor *rectangle;
+
+ rectangle = empathy_call_window_get_preview_rectangle (self, pos);
+
+ clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle), 3);
+ clutter_rectangle_set_border_color (CLUTTER_RECTANGLE (rectangle),
+ CLUTTER_COLOR_Red);
+}
+
+static void
+empathy_call_window_darken_preview_rectangle (EmpathyCallWindow *self,
+ ClutterActor *rectangle)
+{
+ clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle), 1);
+ clutter_rectangle_set_border_color (CLUTTER_RECTANGLE (rectangle),
+ CLUTTER_COLOR_Black);
+}
+
+static void
+empathy_call_window_darken_preview_rectangles (EmpathyCallWindow *self)
+{
+ ClutterActor *rectangle;
+
+ rectangle = empathy_call_window_get_preview_rectangle (self,
+ self->priv->preview_pos);
+
+ /* We don't want to darken the rectangle where the preview
+ * currently is. */
+
+ if (self->priv->preview_rectangle1 != rectangle)
+ empathy_call_window_darken_preview_rectangle (self,
+ self->priv->preview_rectangle1);
+
+ if (self->priv->preview_rectangle2 != rectangle)
+ empathy_call_window_darken_preview_rectangle (self,
+ self->priv->preview_rectangle2);
+
+ if (self->priv->preview_rectangle3 != rectangle)
+ empathy_call_window_darken_preview_rectangle (self,
+ self->priv->preview_rectangle3);
+
+ if (self->priv->preview_rectangle4 != rectangle)
+ empathy_call_window_darken_preview_rectangle (self,
+ self->priv->preview_rectangle4);
+}
+
+static void
+empathy_call_window_preview_on_drag_begin_cb (ClutterDragAction *action,
+ ClutterActor *actor,
+ gfloat event_x,
+ gfloat event_y,
+ ClutterModifierType modifiers,
+ EmpathyCallWindow *self)
+{
+ empathy_call_window_show_preview_rectangles (self, TRUE);
+ empathy_call_window_darken_preview_rectangles (self);
+
+ self->priv->event_x = event_x;
+ self->priv->event_y = event_y;
+}
+
+static void
+empathy_call_window_preview_on_drag_end_cb (ClutterDragAction *action,
+ ClutterActor *actor,
+ gfloat event_x,
+ gfloat event_y,
+ ClutterModifierType modifiers,
+ EmpathyCallWindow *self)
+{
+ PreviewPosition pos;
+
+ pos = empathy_call_window_get_preview_position (self, event_x, event_y);
+
+ if (pos != PREVIEW_POS_NONE)
+ empathy_call_window_move_video_preview (self, pos);
+
+ empathy_call_window_show_preview_rectangles (self, FALSE);
+}
+
+static void
+empathy_call_window_preview_on_drag_motion_cb (ClutterDragAction *action,
+ ClutterActor *actor,
+ gfloat delta_x,
+ gfloat delta_y,
+ EmpathyCallWindow *self)
+{
+ PreviewPosition pos;
+
+ pos = empathy_call_window_get_preview_position (self,
+ self->priv->event_x - delta_x, self->priv->event_y + delta_y);
+
+ if (pos != PREVIEW_POS_NONE)
+ empathy_call_window_highlight_preview_rectangle (self, pos);
+ else
+ empathy_call_window_darken_preview_rectangles (self);
+}
+
+static gboolean
+empathy_call_window_preview_enter_event_cb (ClutterActor *actor,
+ ClutterCrossingEvent *event,
+ EmpathyCallWindow *self)
+{
+ ClutterActor *rectangle;
+
+ rectangle = empathy_call_window_get_preview_rectangle (self,
+ self->priv->preview_pos);
+
+ empathy_call_window_highlight_preview_rectangle (self,
+ self->priv->preview_pos);
+
+ clutter_actor_show (rectangle);
+
+ return FALSE;
+}
+
+static gboolean
+empathy_call_window_preview_leave_event_cb (ClutterActor *actor,
+ ClutterCrossingEvent *event,
+ EmpathyCallWindow *self)
+{
+ ClutterActor *rectangle;
+
+ rectangle = empathy_call_window_get_preview_rectangle (self,
+ self->priv->preview_pos);
+
+ empathy_call_window_darken_preview_rectangle (self, rectangle);
+
+ clutter_actor_hide (rectangle);
+
+ return FALSE;
+}
+
static void
create_video_preview (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- ClutterLayoutManager *layout, *layout_center;
+ ClutterLayoutManager *layout, *layout_center, *layout_end;
ClutterActor *preview;
ClutterActor *box;
ClutterActor *b;
+ ClutterAction *action;
GtkWidget *button;
g_assert (priv->video_preview == NULL);
preview = clutter_texture_new ();
clutter_actor_set_size (preview,
- SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGTH);
+ SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT);
priv->video_preview_sink = clutter_gst_video_sink_new (
CLUTTER_TEXTURE (preview));
@@ -770,17 +977,23 @@ create_video_preview (EmpathyCallWindow *self)
0.0);
/* Add a little offset to the video preview */
- layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_END,
+ layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
CLUTTER_BIN_ALIGNMENT_START);
priv->video_preview = clutter_box_new (layout);
clutter_actor_set_size (priv->video_preview,
- SELF_VIDEO_SECTION_WIDTH + 10, SELF_VIDEO_SECTION_HEIGTH + 10);
+ SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
+ SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN +
+ FLOATING_TOOLBAR_HEIGHT + FLOATING_TOOLBAR_SPACING);
+ /* We have a box with the margins and the video in the middle inside
+ * a bigger box with an extra bottom margin so we're not on top of
+ * the floating toolbar. */
layout_center = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
CLUTTER_BIN_ALIGNMENT_CENTER);
box = clutter_box_new (layout_center);
clutter_actor_set_size (box,
- SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGTH);
+ SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
+ SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
clutter_container_add_actor (CLUTTER_CONTAINER (box), preview);
clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_preview), box);
@@ -795,10 +1008,15 @@ create_video_preview (EmpathyCallWindow *self)
button = gtk_button_new_with_label (_("i"));
b = gtk_clutter_actor_new_with_contents (button);
- clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (layout_center),
- b,
- CLUTTER_BIN_ALIGNMENT_END,
+ layout_end = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_END,
CLUTTER_BIN_ALIGNMENT_END);
+ box = clutter_box_new (layout_end);
+ clutter_actor_set_size (box,
+ SELF_VIDEO_SECTION_WIDTH,
+ SELF_VIDEO_SECTION_HEIGHT + SELF_VIDEO_SECTION_MARGIN);
+
+ clutter_container_add_actor (CLUTTER_CONTAINER (box), b);
+ clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_preview), box);
g_signal_connect (button, "clicked",
G_CALLBACK (empathy_call_window_preview_button_clicked_cb),
@@ -815,6 +1033,8 @@ create_video_preview (EmpathyCallWindow *self)
CLUTTER_BIN_ALIGNMENT_START,
CLUTTER_BIN_ALIGNMENT_END);
+ self->priv->preview_pos = PREVIEW_POS_BOTTOM_LEFT;
+
clutter_actor_hide (priv->preview_hidden_button);
g_signal_connect (button, "clicked",
@@ -825,6 +1045,22 @@ create_video_preview (EmpathyCallWindow *self)
priv->video_preview,
CLUTTER_BIN_ALIGNMENT_START,
CLUTTER_BIN_ALIGNMENT_END);
+
+ action = clutter_drag_action_new ();
+ g_signal_connect (action, "drag-begin",
+ G_CALLBACK (empathy_call_window_preview_on_drag_begin_cb), self);
+ g_signal_connect (action, "drag-end",
+ G_CALLBACK (empathy_call_window_preview_on_drag_end_cb), self);
+ g_signal_connect (action, "drag-motion",
+ G_CALLBACK (empathy_call_window_preview_on_drag_motion_cb), self);
+
+ g_signal_connect (preview, "enter-event",
+ G_CALLBACK (empathy_call_window_preview_enter_event_cb), self);
+ g_signal_connect (preview, "leave-event",
+ G_CALLBACK (empathy_call_window_preview_leave_event_cb), self);
+
+ clutter_actor_add_action (preview, action);
+ clutter_actor_set_reactive (preview, TRUE);
}
static void
@@ -866,6 +1102,7 @@ display_video_preview (EmpathyCallWindow *self,
play_camera (self, TRUE);
clutter_actor_show (priv->video_preview);
+ clutter_actor_raise_top (priv->floating_toolbar);
}
else
{
@@ -966,6 +1203,65 @@ create_pipeline (EmpathyCallWindow *self)
g_object_unref (bus);
}
+static void
+empathy_call_window_settings_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ gchar *args = g_strdup_printf ("-p %s",
+ empathy_preferences_tab_to_string (EMPATHY_PREFERENCES_TAB_CALLS));
+
+ empathy_launch_program (BIN_DIR, "empathy", args);
+
+ g_free (args);
+}
+
+static void
+empathy_call_window_contents_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ empathy_url_show (GTK_WIDGET (self), "ghelp:empathy?audio-video");
+}
+
+static void
+empathy_call_window_debug_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ empathy_launch_program (BIN_DIR, "empathy-debugger", "-s Empathy.Call");
+}
+
+static void
+empathy_call_window_about_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ empathy_about_dialog_new (GTK_WINDOW (self));
+}
+
+static gboolean
+empathy_call_window_toolbar_timeout (gpointer data)
+{
+ EmpathyCallWindow *self = data;
+
+ clutter_state_set_state (self->priv->transitions, "fade-out");
+
+ return TRUE;
+}
+
+static gboolean
+empathy_call_window_motion_notify_cb (GtkWidget *widget,
+ GdkEvent *event,
+ EmpathyCallWindow *self)
+{
+ clutter_state_set_state (self->priv->transitions, "fade-in");
+
+ if (self->priv->inactivity_src > 0)
+ g_source_remove (self->priv->inactivity_src);
+
+ self->priv->inactivity_src = g_timeout_add_seconds (3,
+ empathy_call_window_toolbar_timeout, self);
+
+ return FALSE;
+}
+
static gboolean
empathy_call_window_configure_event_cb (GtkWidget *widget,
GdkEvent *event,
@@ -977,8 +1273,8 @@ empathy_call_window_configure_event_cb (GtkWidget *widget,
gtk_window_get_position (GTK_WINDOW (self), &self->priv->x, &self->priv->y);
gtk_window_get_size (GTK_WINDOW (self), &self->priv->w, &self->priv->h);
- gtk_widget_get_preferred_width (self->priv->sidebar,
- &self->priv->sidebar_width, NULL);
+ gtk_widget_get_preferred_width (self->priv->dtmf_panel,
+ &self->priv->dialpad_width, NULL);
gdk_window = gtk_widget_get_window (widget);
window_state = gdk_window_get_state (gdk_window);
@@ -991,26 +1287,38 @@ static void
empathy_call_window_destroyed_cb (GtkWidget *object,
EmpathyCallWindow *self)
{
- if (gtk_widget_get_visible (self->priv->sidebar))
+ if (gtk_widget_get_visible (self->priv->dtmf_panel))
{
- /* Save the geometry as if the sidebar was hidden. */
+ /* Save the geometry as if the dialpad was hidden. */
empathy_geometry_save_values (GTK_WINDOW (self),
self->priv->x, self->priv->y,
- self->priv->w - self->priv->sidebar_width, self->priv->h,
+ self->priv->w - self->priv->dialpad_width, self->priv->h,
self->priv->maximized);
}
}
static void
+empathy_call_window_stage_allocation_changed_cb (ClutterActor *stage,
+ GParamSpec *pspec,
+ ClutterBindConstraint *constraint)
+{
+ ClutterActorBox allocation;
+
+ clutter_actor_get_allocation_box (stage, &allocation);
+
+ clutter_bind_constraint_set_offset (constraint,
+ allocation.y2 - allocation.y1 -
+ FLOATING_TOOLBAR_SPACING - FLOATING_TOOLBAR_HEIGHT);
+}
+
+static void
empathy_call_window_init (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv;
GtkBuilder *gui;
GtkWidget *top_vbox;
- GtkWidget *page;
gchar *filename;
- GtkWidget *scroll;
- ClutterConstraint *size_constraint;
+ ClutterConstraint *constraint;
ClutterActor *remote_avatar;
GtkStyleContext *context;
GdkRGBA rgba;
@@ -1024,16 +1332,20 @@ empathy_call_window_init (EmpathyCallWindow *self)
"call_window_vbox", &top_vbox,
"errors_vbox", &priv->errors_vbox,
"pane", &priv->pane,
- "statusbar", &priv->statusbar,
- "redial", &priv->redial_button,
+ "remote_user_name_toolbar", &priv->remote_user_name_toolbar,
+ "remote_user_avatar_toolbar", &priv->remote_user_avatar_toolbar,
+ "status_label", &priv->status_label,
+ "audiocall", &priv->audio_call_button,
+ "videocall", &priv->video_call_button,
"microphone", &priv->mic_button,
"camera", &priv->camera_button,
+ "hangup", &priv->hangup_button,
"dialpad", &priv->dialpad_button,
"toolbar", &priv->toolbar,
- "menuredial", &priv->redial,
- "menusidebar", &priv->menu_sidebar,
+ "bottom_toolbar", &priv->bottom_toolbar,
"ui_manager", &priv->ui_manager,
"menufullscreen", &priv->menu_fullscreen,
+ "menupreviewswap", &priv->menu_swap_camera,
"details_vbox", &priv->details_vbox,
"vcodec_encoding_label", &priv->vcodec_encoding_label,
"acodec_encoding_label", &priv->acodec_encoding_label,
@@ -1051,18 +1363,22 @@ empathy_call_window_init (EmpathyCallWindow *self)
g_free (filename);
empathy_builder_connect (gui, self,
- "menuhangup", "activate", empathy_call_window_hangup_cb,
"hangup", "clicked", empathy_call_window_hangup_cb,
- "menuredial", "activate", empathy_call_window_redial_cb,
- "redial", "clicked", empathy_call_window_redial_cb,
- "menusidebar", "toggled", empathy_call_window_sidebar_cb,
+ "audiocall", "clicked", empathy_call_window_audio_call_cb,
+ "videocall", "clicked", empathy_call_window_video_call_cb,
+ "volume", "value-changed", empathy_call_window_volume_changed_cb,
"microphone", "toggled", empathy_call_window_mic_toggled_cb,
"camera", "toggled", empathy_call_window_camera_toggled_cb,
"dialpad", "toggled", empathy_call_window_dialpad_cb,
"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,
+ "menuabout", "activate", empathy_call_window_about_cb,
"menupreviewdisable", "activate", empathy_call_window_disable_camera_cb,
"menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb,
"menupreviewmaximise", "activate", empathy_call_window_maximise_camera_cb,
+ "menupreviewswap", "activate", empathy_call_window_swap_camera_cb,
NULL);
gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
@@ -1073,6 +1389,11 @@ empathy_call_window_init (EmpathyCallWindow *self)
priv->camera_button, "sensitive",
G_BINDING_SYNC_CREATE);
+ g_signal_connect (priv->camera_monitor, "added",
+ G_CALLBACK (empathy_call_window_camera_added_cb), self);
+ g_signal_connect (priv->camera_monitor, "removed",
+ G_CALLBACK (empathy_call_window_camera_removed_cb), self);
+
priv->lock = g_mutex_new ();
gtk_container_add (GTK_CONTAINER (self), top_vbox);
@@ -1080,7 +1401,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
priv->content_hbox = gtk_hbox_new (FALSE, CONTENT_HBOX_SPACING);
gtk_container_set_border_width (GTK_CONTAINER (priv->content_hbox),
CONTENT_HBOX_BORDER_WIDTH);
- gtk_paned_pack1 (GTK_PANED (priv->pane), priv->content_hbox, TRUE, FALSE);
+ gtk_box_pack_start (GTK_BOX (priv->pane), priv->content_hbox,
+ TRUE, TRUE, 0);
/* avatar/video box */
priv->video_layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
@@ -1109,10 +1431,10 @@ empathy_call_window_init (EmpathyCallWindow *self)
priv->video_box,
NULL);
- size_constraint = clutter_bind_constraint_new (
+ constraint = clutter_bind_constraint_new (
gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->video_container)),
CLUTTER_BIND_SIZE, 0);
- clutter_actor_add_constraint (priv->video_box, size_constraint);
+ clutter_actor_add_constraint (priv->video_box, constraint);
priv->remote_user_avatar_widget = gtk_image_new ();
remote_avatar = gtk_clutter_actor_new_with_contents (
@@ -1121,6 +1443,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_box),
remote_avatar);
+ empathy_call_window_create_preview_rectangles (self);
+
gtk_box_pack_start (GTK_BOX (priv->content_hbox),
priv->video_container, TRUE, TRUE,
CONTENT_HBOX_CHILDREN_PACKING_PADDING);
@@ -1130,52 +1454,85 @@ empathy_call_window_init (EmpathyCallWindow *self)
create_audio_input (self);
create_video_input (self);
- /* The call will be started as soon the pipeline is playing */
- priv->start_call_when_playing = TRUE;
+ priv->floating_toolbar = empathy_rounded_actor_new ();
- empathy_call_window_setup_toolbar (self);
+ gtk_widget_reparent (priv->bottom_toolbar,
+ gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (priv->floating_toolbar)));
- priv->sidebar = ev_sidebar_new ();
- g_signal_connect (G_OBJECT (priv->sidebar),
- "hide", G_CALLBACK (empathy_call_window_sidebar_hidden_cb), self);
- g_signal_connect (G_OBJECT (priv->sidebar),
- "show", G_CALLBACK (empathy_call_window_sidebar_shown_cb), self);
- g_signal_connect (G_OBJECT (priv->sidebar), "changed",
- G_CALLBACK (empathy_call_window_sidebar_changed_cb), self);
- gtk_paned_pack2 (GTK_PANED (priv->pane), priv->sidebar, FALSE, FALSE);
+ constraint = clutter_bind_constraint_new (
+ gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->video_container)),
+ CLUTTER_BIND_Y, 0);
- page = empathy_call_window_create_audio_input (self);
- ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "audio-input",
- _("Audio input"), page);
+ clutter_actor_add_constraint (priv->floating_toolbar, constraint);
- page = empathy_call_window_create_video_input (self);
- ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "video-input",
- _("Video input"), page);
+ g_signal_connect (
+ gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->video_container)),
+ "notify::allocation",
+ G_CALLBACK (empathy_call_window_stage_allocation_changed_cb),
+ constraint);
- priv->dtmf_panel = empathy_call_window_create_dtmf (self);
- ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "dialpad",
- _("Dialpad"), priv->dtmf_panel);
+ clutter_actor_set_size (priv->floating_toolbar,
+ FLOATING_TOOLBAR_WIDTH, FLOATING_TOOLBAR_HEIGHT);
+ clutter_actor_set_opacity (priv->floating_toolbar, FLOATING_TOOLBAR_OPACITY);
- gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
+ clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->video_layout),
+ priv->floating_toolbar,
+ CLUTTER_BIN_ALIGNMENT_CENTER,
+ CLUTTER_BIN_ALIGNMENT_END);
+
+ clutter_actor_raise_top (priv->floating_toolbar);
+
+ /* Transitions for the floating toolbar */
+ priv->transitions = clutter_state_new ();
- /* Put the details vbox in a scroll window as it can require a lot of
- * horizontal space. */
- scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll),
- priv->details_vbox);
+ /* all transitions last for 2s */
+ clutter_state_set_duration (priv->transitions, NULL, NULL, 2000);
- ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "details", _("Details"),
- scroll);
+ /* transition from any state to "fade-out" state */
+ clutter_state_set (priv->transitions, NULL, "fade-out",
+ priv->floating_toolbar,
+ "opacity", CLUTTER_EASE_OUT_QUAD, 0,
+ NULL);
+
+ /* transition from any state to "fade-in" state */
+ clutter_state_set (priv->transitions, NULL, "fade-in",
+ priv->floating_toolbar,
+ "opacity", CLUTTER_EASE_OUT_QUAD, FLOATING_TOOLBAR_OPACITY,
+ NULL);
+
+ /* put the actor into the "fade-in" state with no animation */
+ clutter_state_warp_to_state (priv->transitions, "fade-in");
+
+ /* The call will be started as soon the pipeline is playing */
+ priv->start_call_when_playing = TRUE;
+
+ priv->dtmf_panel = empathy_create_dtmf_dialpad (G_OBJECT (self),
+ G_CALLBACK (dtmf_button_pressed_cb),
+ G_CALLBACK (dtmf_button_released_cb));
+
+ gtk_box_pack_start (GTK_BOX (priv->pane), priv->dtmf_panel,
+ FALSE, FALSE, 6);
+
+ gtk_box_pack_start (GTK_BOX (priv->pane), priv->details_vbox,
+ FALSE, FALSE, 0);
+
+ gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
gtk_widget_show_all (top_vbox);
- gtk_widget_hide (priv->sidebar);
+ gtk_widget_hide (priv->dtmf_panel);
+ gtk_widget_hide (priv->details_vbox);
priv->fullscreen = empathy_call_window_fullscreen_new (self);
empathy_call_window_fullscreen_set_video_widget (priv->fullscreen,
priv->video_container);
+ /* We hide the bottom toolbar after 3s of inactivity and show it
+ * again on mouse movement */
+ priv->inactivity_src = g_timeout_add_seconds (3,
+ empathy_call_window_toolbar_timeout, self);
+
g_signal_connect (G_OBJECT (priv->fullscreen->leave_fullscreen_button),
"clicked", G_CALLBACK (empathy_call_window_fullscreen_cb), self);
@@ -1191,23 +1548,42 @@ empathy_call_window_init (EmpathyCallWindow *self)
g_signal_connect (G_OBJECT (self), "key-press-event",
G_CALLBACK (empathy_call_window_key_press_cb), self);
+ g_signal_connect (self, "motion-notify-event",
+ G_CALLBACK (empathy_call_window_motion_notify_cb), self);
+
priv->timer = g_timer_new ();
g_object_ref (priv->ui_manager);
g_object_unref (gui);
priv->sound_mgr = empathy_sound_manager_dup_singleton ();
+ priv->mic_menu = empathy_mic_menu_new (self);
+ priv->camera_menu = empathy_camera_menu_new (self);
+
+ empathy_call_window_show_hangup_button (self, TRUE);
+
+ priv->settings = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
+
+ /* Retrieve initial volume */
+ priv->volume = g_settings_get_double (priv->settings,
+ EMPATHY_PREFS_CALL_SOUND_VOLUME) / 100.0;
+
+ g_signal_connect (priv->settings, "changed::"EMPATHY_PREFS_CALL_SOUND_VOLUME,
+ G_CALLBACK (empathy_call_window_prefs_volume_changed_cb), self);
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
- * the window geometry to be saved with the sidebar taken into account. */
+ * the window geometry to be saved with the dialpad taken into account. */
g_signal_connect (self, "destroy",
G_CALLBACK (empathy_call_window_destroyed_cb), self);
g_signal_connect (self, "configure-event",
G_CALLBACK (empathy_call_window_configure_event_cb), self);
g_signal_connect (self, "window-state-event",
G_CALLBACK (empathy_call_window_configure_event_cb), self);
+
+ /* Don't display labels in both toolbars */
+ gtk_toolbar_set_style (GTK_TOOLBAR (priv->toolbar), GTK_TOOLBAR_ICONS);
}
/* Instead of specifying a width and a height, we specify only one size. That's
@@ -1254,23 +1630,51 @@ set_window_title (EmpathyCallWindow *self)
}
else
{
- gtk_window_set_title (GTK_WINDOW (self), _("Call with %d participants"));
+ g_warning ("Unknown remote contact!");
}
}
static void
+set_remote_user_name (EmpathyCallWindow *self,
+ EmpathyContact *contact)
+{
+ const gchar *alias = empathy_contact_get_alias (contact);
+ const gchar *status = empathy_contact_get_status (contact);
+ gchar *label;
+
+ label = g_strdup_printf ("%s\n<small>%s</small>", alias, status);
+ gtk_label_set_markup (GTK_LABEL (self->priv->remote_user_name_toolbar),
+ label);
+ g_free (label);
+}
+
+static void
contact_name_changed_cb (EmpathyContact *contact,
- GParamSpec *pspec, EmpathyCallWindow *self)
+ GParamSpec *pspec,
+ EmpathyCallWindow *self)
{
set_window_title (self);
+ set_remote_user_name (self, contact);
+}
+
+static void
+contact_presence_changed_cb (EmpathyContact *contact,
+ GParamSpec *pspec,
+ EmpathyCallWindow *self)
+{
+ set_remote_user_name (self, contact);
}
static void
contact_avatar_changed_cb (EmpathyContact *contact,
- GParamSpec *pspec, GtkWidget *avatar_widget)
+ GParamSpec *pspec,
+ EmpathyCallWindow *self)
{
int size;
GtkAllocation allocation;
+ GtkWidget *avatar_widget;
+
+ avatar_widget = self->priv->remote_user_avatar_widget;
gtk_widget_get_allocation (avatar_widget, &allocation);
size = allocation.height;
@@ -1283,6 +1687,19 @@ contact_avatar_changed_cb (EmpathyContact *contact,
}
init_contact_avatar_with_size (contact, avatar_widget, size);
+
+ avatar_widget = self->priv->remote_user_avatar_toolbar;
+
+ gtk_widget_get_allocation (avatar_widget, &allocation);
+ size = allocation.height;
+
+ if (size == 0)
+ {
+ /* the widget is not allocated yet, set a default size */
+ size = SMALL_TOOLBAR_SIZE;
+ }
+
+ init_contact_avatar_with_size (contact, avatar_widget, size);
}
static void
@@ -1291,19 +1708,25 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self,
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- g_signal_connect (priv->contact, "notify::name",
- G_CALLBACK (contact_name_changed_cb), self);
- g_signal_connect (priv->contact, "notify::avatar",
- G_CALLBACK (contact_avatar_changed_cb),
- priv->remote_user_avatar_widget);
+ tp_g_signal_connect_object (priv->contact, "notify::name",
+ G_CALLBACK (contact_name_changed_cb), self, 0);
+ tp_g_signal_connect_object (priv->contact, "notify::avatar",
+ G_CALLBACK (contact_avatar_changed_cb), self, 0);
+ tp_g_signal_connect_object (priv->contact, "notify::presence",
+ G_CALLBACK (contact_presence_changed_cb), self, 0);
set_window_title (self);
+ set_remote_user_name (self, priv->contact);
init_contact_avatar_with_size (priv->contact,
priv->remote_user_avatar_widget,
MIN (REMOTE_CONTACT_AVATAR_DEFAULT_WIDTH,
REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT));
+ init_contact_avatar_with_size (priv->contact,
+ priv->remote_user_avatar_toolbar,
+ SMALL_TOOLBAR_SIZE);
+
/* The remote avatar is shown by default and will be hidden when we receive
video from the remote side. */
clutter_actor_hide (priv->video_output);
@@ -1653,6 +2076,12 @@ empathy_call_window_dispose (GObject *object)
priv->got_video_src = 0;
}
+ if (priv->inactivity_src > 0)
+ {
+ g_source_remove (priv->inactivity_src);
+ priv->inactivity_src = 0;
+ }
+
tp_clear_object (&priv->pipeline);
tp_clear_object (&priv->video_input);
tp_clear_object (&priv->audio_input);
@@ -1660,6 +2089,10 @@ empathy_call_window_dispose (GObject *object)
tp_clear_object (&priv->ui_manager);
tp_clear_object (&priv->fullscreen);
tp_clear_object (&priv->camera_monitor);
+ tp_clear_object (&priv->settings);
+ tp_clear_object (&priv->sound_mgr);
+ tp_clear_object (&priv->mic_menu);
+ tp_clear_object (&priv->camera_menu);
g_list_free_full (priv->notifiers, g_object_unref);
@@ -1674,9 +2107,6 @@ empathy_call_window_dispose (GObject *object)
priv->contact = NULL;
}
-
- tp_clear_object (&priv->sound_mgr);
-
G_OBJECT_CLASS (empathy_call_window_parent_class)->dispose (object);
}
@@ -1778,9 +2208,6 @@ empathy_call_window_reset_pipeline (EmpathyCallWindow *self)
g_object_unref (priv->pipeline);
priv->pipeline = NULL;
- g_signal_handlers_disconnect_by_func (priv->audio_input_adj,
- empathy_call_window_mic_volume_changed_cb, self);
-
if (priv->audio_output != NULL)
g_object_unref (priv->audio_output);
priv->audio_output = NULL;
@@ -1863,8 +2290,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
empathy_call_window_status_message (self, _("Disconnected"));
- gtk_action_set_sensitive (priv->redial, TRUE);
- gtk_widget_set_sensitive (priv->redial_button, TRUE);
+ empathy_call_window_show_hangup_button (self, FALSE);
/* Unsensitive the camera and mic button */
gtk_widget_set_sensitive (priv->camera_button, FALSE);
@@ -1880,9 +2306,6 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
display_video_preview (self, TRUE);
}
- gtk_progress_bar_set_fraction (
- GTK_PROGRESS_BAR (priv->volume_progress_bar), 0);
-
/* destroy the video output; it will be recreated when we'll redial */
disconnect_video_output_motion_handler (self);
if (priv->video_output != NULL)
@@ -2106,14 +2529,23 @@ empathy_call_window_update_timer (gpointer user_data)
{
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
+ const gchar *status;
gchar *str;
gdouble time_;
time_ = g_timer_elapsed (priv->timer, NULL);
+ if (priv->call_state == HELD)
+ status = _("On hold");
+ else if (!gtk_toggle_tool_button_get_active (
+ GTK_TOGGLE_TOOL_BUTTON (priv->mic_button)))
+ status = _("Mute");
+ else
+ status = _("Duration");
+
/* Translators: 'status - minutes:seconds' the caller has been connected */
str = g_strdup_printf (_("%s — %d:%02dm"),
- priv->call_state == HELD ? _("On hold") : _("Connected"),
+ status,
(int) time_ / 60, (int) time_ % 60);
empathy_call_window_status_message (self, str);
g_free (str);
@@ -2349,8 +2781,7 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler,
gtk_widget_set_sensitive (priv->camera_button, can_send_video);
- gtk_action_set_sensitive (priv->redial, FALSE);
- gtk_widget_set_sensitive (priv->redial_button, FALSE);
+ empathy_call_window_show_hangup_button (self, TRUE);
gtk_widget_set_sensitive (priv->mic_button, TRUE);
@@ -2380,6 +2811,7 @@ empathy_call_window_show_video_output_cb (gpointer user_data)
{
gtk_widget_hide (self->priv->remote_user_avatar_widget);
clutter_actor_show (self->priv->video_output);
+ empathy_call_window_raise_actors (self);
}
return FALSE;
@@ -2654,8 +3086,6 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
if (GST_MESSAGE_SRC (message) == GST_OBJECT (priv->video_input))
{
gst_message_parse_state_changed (message, NULL, &newstate, NULL);
- if (newstate == GST_STATE_PAUSED)
- empathy_call_window_setup_video_input (self);
}
if (GST_MESSAGE_SRC (message) == GST_OBJECT (priv->pipeline) &&
!priv->call_started)
@@ -2782,6 +3212,11 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
TpyCallChannel *call;
+ gint width;
+
+ /* Make the hangup button twice as wide */
+ width = gtk_widget_get_allocated_width (priv->hangup_button);
+ gtk_widget_set_size_request (priv->hangup_button, width * 2, -1);
g_signal_connect (priv->handler, "state-changed",
G_CALLBACK (empathy_call_window_state_changed_cb), window);
@@ -2849,18 +3284,16 @@ show_controls (EmpathyCallWindow *window, gboolean set_fullscreen)
if (set_fullscreen)
{
- gtk_widget_hide (priv->sidebar);
+ gtk_widget_hide (priv->dtmf_panel);
gtk_widget_hide (menu);
- gtk_widget_hide (priv->statusbar);
gtk_widget_hide (priv->toolbar);
}
else
{
- if (priv->sidebar_was_visible_before_fs)
- gtk_widget_show (priv->sidebar);
+ if (priv->dialpad_was_visible_before_fs)
+ gtk_widget_show (priv->dtmf_panel);
gtk_widget_show (menu);
- gtk_widget_show (priv->statusbar);
gtk_widget_show (priv->toolbar);
gtk_window_resize (GTK_WINDOW (window), priv->original_width_before_fs,
@@ -2901,7 +3334,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
if (set_fullscreen)
{
- gboolean sidebar_was_visible;
+ gboolean dialpad_was_visible;
GtkAllocation allocation;
gint original_width, original_height;
@@ -2909,9 +3342,11 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
original_width = allocation.width;
original_height = allocation.height;
- g_object_get (priv->sidebar, "visible", &sidebar_was_visible, NULL);
+ g_object_get (priv->dtmf_panel,
+ "visible", &dialpad_was_visible,
+ NULL);
- priv->sidebar_was_visible_before_fs = sidebar_was_visible;
+ priv->dialpad_was_visible_before_fs = dialpad_was_visible;
priv->original_width_before_fs = original_width;
priv->original_height_before_fs = original_height;
@@ -2942,68 +3377,32 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
}
static void
-empathy_call_window_update_sidebar_buttons (EmpathyCallWindow *window,
- gboolean toggled)
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
- /* Update dialpad button */
- g_signal_handlers_block_by_func (priv->dialpad_button,
- empathy_call_window_dialpad_cb, window);
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->dialpad_button),
- toggled);
- g_signal_handlers_unblock_by_func (priv->dialpad_button,
- empathy_call_window_dialpad_cb, window);
-
- /* Update sidebar menu */
- g_signal_handlers_block_by_func (priv->menu_sidebar,
- empathy_call_window_sidebar_cb, window);
- gtk_toggle_action_set_active (
- GTK_TOGGLE_ACTION (priv->menu_sidebar),
- gtk_widget_get_visible (priv->sidebar));
- g_signal_handlers_unblock_by_func (priv->menu_sidebar,
- empathy_call_window_sidebar_cb, window);
-}
-
-static void
-empathy_call_window_show_sidebar (EmpathyCallWindow *window,
+empathy_call_window_show_dialpad (EmpathyCallWindow *window,
gboolean active)
{
EmpathyCallWindowPriv *priv = GET_PRIV (window);
- int w, h, sidebar_width, handle_size;
+ int w, h, dialpad_width;
GtkAllocation allocation;
- gchar *page;
- gboolean dialpad_shown;
gtk_widget_get_allocation (GTK_WIDGET (window), &allocation);
w = allocation.width;
h = allocation.height;
- gtk_widget_style_get (priv->pane, "handle_size", &handle_size, NULL);
-
- gtk_widget_get_preferred_width (priv->sidebar, &sidebar_width, NULL);
+ gtk_widget_get_preferred_width (priv->dtmf_panel, &dialpad_width, NULL);
if (active)
{
- gtk_widget_show (priv->sidebar);
- w += sidebar_width + handle_size;
+ gtk_widget_show (priv->dtmf_panel);
+ w += dialpad_width;
}
else
{
- w -= sidebar_width + handle_size;
- gtk_widget_hide (priv->sidebar);
+ w -= dialpad_width;
+ gtk_widget_hide (priv->dtmf_panel);
}
if (w > 0 && h > 0)
gtk_window_resize (GTK_WINDOW (window), w, h);
-
- /* Update the 'Dialpad' menu */
- page = ev_sidebar_get_current_page (EV_SIDEBAR (priv->sidebar));
- dialpad_shown = active && !tp_strdiff (page, "dialpad");
- g_free (page);
-
- empathy_call_window_update_sidebar_buttons (window, dialpad_shown);
}
static void
@@ -3037,18 +3436,22 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
static void
empathy_call_window_mic_toggled_cb (GtkToggleToolButton *toggle,
- EmpathyCallWindow *window)
+ EmpathyCallWindow *self)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
+ EmpathyCallWindowPriv *priv = GET_PRIV (self);
gboolean active;
active = (gtk_toggle_tool_button_get_active (toggle));
+ /* We don't want the settings callback to react to this change to avoid
+ * a loop. */
+ g_signal_handlers_block_by_func (priv->settings,
+ empathy_call_window_prefs_volume_changed_cb, self);
+
if (active)
{
- empathy_audio_src_set_volume (EMPATHY_GST_AUDIO_SRC (priv->audio_input),
- priv->volume);
- gtk_adjustment_set_value (priv->audio_input_adj, priv->volume * 100);
+ g_settings_set_double (priv->settings, EMPATHY_PREFS_CALL_SOUND_VOLUME,
+ priv->volume * 100);
}
else
{
@@ -3057,45 +3460,21 @@ empathy_call_window_mic_toggled_cb (GtkToggleToolButton *toggle,
* sides mute at the same time on certain CMs AFAIK. Need to revisit this
* in the future. GNOME #574574
*/
- empathy_audio_src_set_volume (EMPATHY_GST_AUDIO_SRC (priv->audio_input),
- 0);
- gtk_adjustment_set_value (priv->audio_input_adj, 0);
+ g_settings_set_double (priv->settings, EMPATHY_PREFS_CALL_SOUND_VOLUME,
+ 0);
}
-}
-
-static void
-empathy_call_window_sidebar_hidden_cb (EvSidebar *sidebar,
- EmpathyCallWindow *window)
-{
- empathy_call_window_show_sidebar (window, FALSE);
-}
-
-static void
-empathy_call_window_sidebar_shown_cb (EvSidebar *sidebar,
- EmpathyCallWindow *window)
-{
- empathy_call_window_show_sidebar (window, TRUE);
-}
-static void
-empathy_call_window_sidebar_changed_cb (EvSidebar *sidebar,
- const gchar *page,
- EmpathyCallWindow *window)
-{
- empathy_call_window_update_sidebar_buttons (window,
- !tp_strdiff (page, "dialpad"));
+ g_signal_handlers_unblock_by_func (priv->settings,
+ empathy_call_window_prefs_volume_changed_cb, self);
}
static void
empathy_call_window_hangup_cb (gpointer object,
- EmpathyCallWindow *window)
+ EmpathyCallWindow *self)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
- empathy_call_handler_stop_call (priv->handler);
+ empathy_call_handler_stop_call (self->priv->handler);
- if (empathy_call_window_disconnected (window, FALSE))
- gtk_widget_destroy (GTK_WIDGET (window));
+ empathy_call_window_disconnected (self, TRUE);
}
static void
@@ -3109,13 +3488,10 @@ empathy_call_window_restart_call (EmpathyCallWindow *window)
create_video_output_widget (window);
- g_signal_connect (G_OBJECT (priv->audio_input_adj), "value-changed",
- G_CALLBACK (empathy_call_window_mic_volume_changed_cb), window);
-
/* While the call was disconnected, the input volume might have changed.
* However, since the audio_input source was destroyed, its volume has not
* been updated during that time. That's why we manually update it here */
- empathy_call_window_mic_volume_changed_cb (priv->audio_input_adj, window);
+ empathy_call_window_mic_volume_changed (window);
priv->outgoing = TRUE;
empathy_call_window_set_state_connecting (window);
@@ -3126,49 +3502,20 @@ empathy_call_window_restart_call (EmpathyCallWindow *window)
/* call will be started when the pipeline is ready */
priv->start_call_when_playing = TRUE;
-
empathy_call_window_setup_avatars (window, priv->handler);
- gtk_action_set_sensitive (priv->redial, FALSE);
- gtk_widget_set_sensitive (priv->redial_button, FALSE);
-}
-
-static void
-empathy_call_window_redial_cb (gpointer object,
- EmpathyCallWindow *window)
-{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
- if (priv->call_state == CONNECTED)
- priv->call_state = REDIALING;
-
- empathy_call_handler_stop_call (priv->handler);
-
- if (priv->call_state != CONNECTED)
- empathy_call_window_restart_call (window);
+ empathy_call_window_show_hangup_button (window, TRUE);
}
static void
empathy_call_window_dialpad_cb (GtkToggleToolButton *button,
EmpathyCallWindow *window)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
gboolean active;
active = gtk_toggle_tool_button_get_active (button);
- if (active)
- ev_sidebar_set_current_page (EV_SIDEBAR (priv->sidebar), "dialpad");
-
- empathy_call_window_show_sidebar (window, active);
-}
-
-static void
-empathy_call_window_sidebar_cb (GtkToggleAction *menu,
- EmpathyCallWindow *self)
-{
- empathy_call_window_show_sidebar (self,
- gtk_toggle_action_get_active (menu));
+ empathy_call_window_show_dialpad (window, active);
}
static void
@@ -3228,6 +3575,9 @@ empathy_call_window_video_output_motion_notify (GtkWidget *widget,
if (priv->is_fullscreen)
{
empathy_call_window_fullscreen_show_popup (priv->fullscreen);
+
+ /* Show the bottom toolbar */
+ empathy_call_window_motion_notify_cb (NULL, NULL, window);
return TRUE;
}
return FALSE;
@@ -3248,23 +3598,10 @@ empathy_call_window_video_menu_popup (EmpathyCallWindow *window,
}
static void
-empathy_call_window_status_message (EmpathyCallWindow *window,
+empathy_call_window_status_message (EmpathyCallWindow *self,
gchar *message)
{
- EmpathyCallWindowPriv *priv = GET_PRIV (window);
-
- if (priv->context_id == 0)
- {
- priv->context_id = gtk_statusbar_get_context_id (
- GTK_STATUSBAR (priv->statusbar), "voip call status messages");
- }
- else
- {
- gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar), priv->context_id);
- }
-
- gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar), priv->context_id,
- message);
+ gtk_label_set_label (GTK_LABEL (self->priv->status_label), message);
}
static void
@@ -3279,3 +3616,25 @@ empathy_call_window_volume_changed_cb (GtkScaleButton *button,
empathy_audio_sink_set_volume (EMPATHY_GST_AUDIO_SINK (priv->audio_output),
value);
}
+
+GtkUIManager *
+empathy_call_window_get_ui_manager (EmpathyCallWindow *window)
+{
+ EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+ return priv->ui_manager;
+}
+
+EmpathyGstAudioSrc *
+empathy_call_window_get_audio_src (EmpathyCallWindow *window)
+{
+ EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+ return (EmpathyGstAudioSrc *) priv->audio_input;
+}
+
+EmpathyGstVideoSrc *
+empathy_call_window_get_video_src (EmpathyCallWindow *self)
+{
+ return EMPATHY_GST_VIDEO_SRC (self->priv->video_input);
+}
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index 11237fff6..912a79173 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -25,6 +25,8 @@
#include <gtk/gtk.h>
#include "empathy-call-handler.h"
+#include "empathy-audio-src.h"
+#include "empathy-video-src.h"
G_BEGIN_DECLS
@@ -62,6 +64,11 @@ GType empathy_call_window_get_type (void);
EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
+GtkUIManager *empathy_call_window_get_ui_manager (EmpathyCallWindow *window);
+
+EmpathyGstAudioSrc *empathy_call_window_get_audio_src (EmpathyCallWindow *window);
+EmpathyGstVideoSrc *empathy_call_window_get_video_src (EmpathyCallWindow *window);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_CALL_WINDOW_H__*/
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 7e41961f5..0dea20869 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -11,24 +11,37 @@
</object>
</child>
<child>
- <object class="GtkAction" id="menuhangup">
- <property name="icon_name">call-stop</property>
- <property name="name">menuhangup</property>
- <property name="label" translatable="yes">Hang up</property>
+ <object class="GtkAction" id="menufullscreen">
+ <property name="stock_id">gtk-fullscreen</property>
+ <property name="name">menufullscreen</property>
+ </object>
+ <accelerator key="F11"/>
+ </child>
+ <child>
+ <object class="GtkAction" id="edit">
+ <property name="name">edit</property>
+ <property name="label" translatable="yes">_Edit</property>
</object>
</child>
<child>
- <object class="GtkAction" id="menuredial">
- <property name="stock_id">gtk-refresh</property>
- <property name="name">menuredial</property>
- <property name="label" translatable="yes">Redial</property>
- <property name="sensitive">False</property>
+ <object class="GtkAction" id="menumicrophone">
+ <property name="label" translatable="yes">_Microphone</property>
+ <property name="name">menumicrophone</property>
+ <property name="icon_name">gnome-stock-mic</property>
</object>
</child>
<child>
- <object class="GtkToggleAction" id="menusidebar">
- <property name="name">menusidebar</property>
- <property name="label" translatable="yes">_Sidebar</property>
+ <object class="GtkAction" id="menucamera">
+ <property name="label" translatable="yes">_Camera</property>
+ <property name="name">menucamera</property>
+ <property name="icon_name">camera-web</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menusettings">
+ <property name="stock_id">gtk-preferences</property>
+ <property name="name">menusettings</property>
+ <property name="label" translatable="yes">_Settings</property>
</object>
</child>
<child>
@@ -38,11 +51,36 @@
</object>
</child>
<child>
- <object class="GtkAction" id="menufullscreen">
- <property name="stock_id">gtk-fullscreen</property>
- <property name="name">menufullscreen</property>
+ <object class="GtkAction" id="help">
+ <property name="name">help</property>
+ <property name="label" translatable="yes">_Help</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menucontents">
+ <property name="stock_id">gtk-help</property>
+ <property name="name">menucontents</property>
+ <property name="label" translatable="yes">_Contents</property>
+ </object>
+ <accelerator key="F1" modifiers=""/>
+ </child>
+ <child>
+ <object class="GtkAction" id="menudebug">
+ <property name="name">menudebug</property>
+ <property name="label" translatable="yes">_Debug</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menuabout">
+ <property name="stock_id">gtk-about</property>
+ <property name="name">menuabout</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menupreviewswap">
+ <property name="name">menupreviewswap</property>
+ <property name="label" translatable="yes">Swap camera</property>
</object>
- <accelerator key="F11"/>
</child>
<child>
<object class="GtkAction" id="menupreviewminimise">
@@ -67,22 +105,29 @@
<ui>
<menubar name="menubar1">
<menu action="call">
- <menuitem action="menuhangup"/>
- <menuitem action="menuredial"/>
- </menu>
- <menu action="view">
<menuitem action="menufullscreen"/>
- <menuitem action="menusidebar"/>
+ </menu>
+ <menu action="edit">
+ <menu action="menumicrophone"/>
+ <menu action="menucamera"/>
+ <menuitem name="menusettings" action="menusettings"/>
+ </menu>
+ <menu action="help">
+ <menuitem name="menucontents" action="menucontents"/>
+ <menuitem name="menudebug" action="menudebug"/>
+ <menuitem name="menuabout" action="menuabout"/>
</menu>
</menubar>
<popup name="video-popup">
<menuitem name="menufullscreen" action="menufullscreen"/>
</popup>
<popup name="preview-menu">
+ <menuitem name="menupreviewswap" action="menupreviewswap"/>
<menuitem name="menupreviewminimise" action="menupreviewminimise"/>
<menuitem name="menupreviewdisable" action="menupreviewdisable"/>
</popup>
<popup name="preview-hidden-menu">
+ <menuitem name="menupreviewswap" action="menupreviewswap"/>
<menuitem name="menupreviewmaximise" action="menupreviewmaximise"/>
<menuitem name="menupreviewdisable" action="menupreviewdisable"/>
</popup>
@@ -105,57 +150,68 @@
<class name="primary-toolbar"/>
</style>
<child>
- <object class="GtkToolButton" id="hangup">
+ <object class="GtkToolItem" id="toolitem1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="remote_user_avatar_toolbar">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton1">
+ <property name="draw">False</property>
<property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Hang up</property>
- <property name="icon_name">call-stop</property>
- <property name="tooltip_text" translatable="yes">Hang up current call</property>
</object>
<packing>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="redial">
+ <object class="GtkToolItem" id="toolitem2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="remote_user_name_toolbar">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolbar_space1">
<property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Redial</property>
- <property name="stock_id">gtk-refresh</property>
- <property name="sensitive">False</property>
- <property name="tooltip_text" translatable="yes">Call the contact again</property>
</object>
<packing>
- <property name="homogeneous">True</property>
+ <property name="expand">True</property>
</packing>
</child>
<child>
- <object class="GtkSeparatorToolItem" id="toolbutton1">
+ <object class="GtkToolButton" id="hangup">
<property name="visible">True</property>
+ <property name="label" translatable="yes">Hang up</property>
+ <property name="icon_name">call-stop</property>
+ <property name="tooltip_text" translatable="yes">Hang up current call</property>
</object>
<packing>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToggleToolButton" id="microphone">
- <property name="visible">True</property>
- <property name="active">True</property>
- <property name="label" translatable="yes">Send Audio</property>
- <property name="icon_name">gnome-stock-mic</property>
- <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+ <object class="GtkToolButton" id="videocall">
+ <property name="label" translatable="yes">Video call</property>
+ <property name="icon_name">camera-web</property>
+ <property name="tooltip_text" translatable="yes">Start a video call</property>
</object>
<packing>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToggleToolButton" id="camera">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Send Video</property>
- <property name="icon_name">camera-web</property>
- <property name="sensitive">False</property>
- <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+ <object class="GtkToolButton" id="audiocall">
+ <property name="label" translatable="yes">Call</property>
+ <property name="icon_name">call-start</property>
+ <property name="tooltip_text" translatable="yes">Start an audio call</property>
</object>
<packing>
<property name="homogeneous">True</property>
@@ -165,7 +221,7 @@
<object class="GtkToggleToolButton" id="dialpad">
<property name="visible">True</property>
<property name="label" translatable="yes">Show dialpad</property>
- <property name="icon_name">accessories-calculator</property>
+ <property name="icon_name">input-dialpad</property>
<property name="tooltip_text" translatable="yes">Display the dialpad</property>
</object>
<packing>
@@ -188,24 +244,87 @@
</packing>
</child>
<child>
- <object class="GtkHPaned" id="pane">
+ <object class="GtkHBox" id="pane">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkStatusbar" id="statusbar">
+ <object class="GtkHBox" id="bottom_toolbar">
<property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="homogeneous">False</property>
+ <child>
+ <object class="GtkToggleToolButton" id="camera">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Send Video</property>
+ <property name="icon_name">camera-web</property>
+ <property name="sensitive">False</property>
+ <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolitem3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVolumeButton" id="volume">
+ <property name="visible">True</property>
+ <property name="value">1.0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="microphone">
+ <property name="visible">True</property>
+ <property name="active">True</property>
+ <property name="label" translatable="yes">Send Audio</property>
+ <property name="icon_name">gnome-stock-mic</property>
+ <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolbar_space2">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolitem4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="status_label">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton2">
+ <property name="draw">False</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 7503532c5..1f60217db 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -121,9 +121,16 @@ main (int argc,
/* Init */
g_thread_init (NULL);
+ /* Clutter needs this */
+ gdk_disable_multidevice ();
+
optcontext = g_option_context_new (N_("- Empathy Audio/Video Client"));
g_option_context_add_group (optcontext, gst_init_get_option_group ());
g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+ g_option_context_add_group (optcontext, cogl_get_option_group ());
+ g_option_context_add_group (optcontext,
+ clutter_get_option_group_without_init ());
+ g_option_context_add_group (optcontext, gtk_clutter_get_option_group ());
g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
if (!g_option_context_parse (optcontext, &argc, &argv, &error)) {
@@ -143,7 +150,6 @@ main (int argc,
empathy_gtk_init ();
g_set_application_name (_("Empathy Audio/Video Client"));
- g_setenv ("PULSE_PROP_media.role", "phone", TRUE);
/* Make empathy and empathy-call appear as the same app in gnome-shell */
gdk_set_program_class ("Empathy");
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
new file mode 100644
index 000000000..6a7d20c15
--- /dev/null
+++ b/src/empathy-camera-menu.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright (C) 2011 Collabora Ltd.
+ *
+ * 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
+ *
+ * GtkAction code based on gnome-terminal's TerminalTabsMenu object.
+ * Thanks guys!
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-camera-monitor.h>
+#include <libempathy/empathy-gsettings.h>
+
+#include "empathy-camera-menu.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
+
+struct _EmpathyCameraMenuPrivate
+{
+ /* Borrowed ref; the call window actually owns us. */
+ EmpathyCallWindow *window;
+
+ /* Given away ref; the call window's UI manager now owns this. */
+ GtkActionGroup *action_group;
+
+ /* An invisible radio action so new cameras are always in the
+ * same radio group. */
+ GtkAction *anchor_action;
+
+ /* The merge ID used with the UI manager. We need to keep this
+ * around so in _clean we can remove all the items we've added
+ * before and start again. */
+ guint ui_id;
+
+ /* TRUE if we're in _update and so calling _set_active. */
+ gboolean in_update;
+
+ /* Queue of GtkRadioActions. */
+ GQueue *cameras;
+
+ EmpathyCameraMonitor *camera_monitor;
+
+ GSettings *settings;
+};
+
+G_DEFINE_TYPE (EmpathyCameraMenu, empathy_camera_menu, G_TYPE_OBJECT);
+
+enum
+{
+ PROP_WINDOW = 1,
+};
+
+static void empathy_camera_menu_update (EmpathyCameraMenu *self);
+
+static void
+empathy_camera_menu_init (EmpathyCameraMenu *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_CAMERA_MENU, EmpathyCameraMenuPrivate);
+}
+
+static void
+empathy_camera_menu_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyCameraMenu *self = EMPATHY_CAMERA_MENU (object);
+
+ switch (property_id)
+ {
+ case PROP_WINDOW:
+ self->priv->window = g_value_get_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+empathy_camera_menu_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyCameraMenu *self = EMPATHY_CAMERA_MENU (object);
+
+ switch (property_id)
+ {
+ case PROP_WINDOW:
+ g_value_set_object (value, self->priv->window);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+empathy_camera_menu_clean (EmpathyCameraMenu *self)
+{
+ GtkUIManager *ui_manager;
+
+ if (self->priv->ui_id == 0)
+ return;
+
+ ui_manager = empathy_call_window_get_ui_manager (self->priv->window);
+
+ gtk_ui_manager_remove_ui (ui_manager, self->priv->ui_id);
+ gtk_ui_manager_ensure_update (ui_manager);
+ self->priv->ui_id = 0;
+}
+
+static void
+empathy_camera_menu_activate_cb (GtkAction *action,
+ EmpathyCameraMenu *self)
+{
+ EmpathyGstVideoSrc *video;
+ const gchar *device;
+
+ if (self->priv->in_update)
+ return;
+
+ video = empathy_call_window_get_video_src (self->priv->window);
+
+ device = gtk_action_get_name (action);
+
+ empathy_video_src_change_device (video, device);
+}
+
+static void
+empathy_camera_menu_update (EmpathyCameraMenu *self)
+{
+ GList *l;
+ GtkUIManager *ui_manager;
+ EmpathyGstVideoSrc *video;
+ gchar *current_camera;
+
+ ui_manager = empathy_call_window_get_ui_manager (self->priv->window);
+
+ video = empathy_call_window_get_video_src (self->priv->window);
+ current_camera = empathy_video_src_dup_device (video);
+
+ empathy_camera_menu_clean (self);
+ self->priv->ui_id = gtk_ui_manager_new_merge_id (ui_manager);
+
+ for (l = self->priv->cameras->head; l != NULL; l = g_list_next (l))
+ {
+ GtkRadioAction *action = l->data;
+ const gchar *name = gtk_action_get_name (GTK_ACTION (action));
+
+ if (!tp_strdiff (current_camera, name))
+ {
+ self->priv->in_update = TRUE;
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+ self->priv->in_update = FALSE;
+ }
+
+ gtk_ui_manager_add_ui (ui_manager, self->priv->ui_id,
+ /* TODO: this should probably be passed from the call
+ * window, seeing that it's a reference to
+ * empathy-call-window.ui. */
+ "/menubar1/edit/menucamera",
+ name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+ }
+
+ g_free (current_camera);
+}
+
+static void
+empathy_camera_menu_add_camera (EmpathyCameraMenu *self,
+ EmpathyCamera *camera)
+{
+ GtkRadioAction *action;
+ GSList *group;
+
+ action = gtk_radio_action_new (camera->device, camera->name, NULL, NULL, 0);
+ gtk_action_group_add_action (self->priv->action_group, GTK_ACTION (action));
+
+ group = gtk_radio_action_get_group (
+ GTK_RADIO_ACTION (self->priv->anchor_action));
+ gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group);
+
+ g_queue_push_tail (self->priv->cameras, action);
+
+ g_signal_connect (action, "activate",
+ G_CALLBACK (empathy_camera_menu_activate_cb), self);
+}
+
+static void
+empathy_camera_menu_camera_added_cb (EmpathyCameraMonitor *monitor,
+ EmpathyCamera *camera,
+ EmpathyCameraMenu *self)
+{
+ empathy_camera_menu_add_camera (self, camera);
+ empathy_camera_menu_update (self);
+}
+
+static void
+empathy_camera_menu_camera_removed_cb (EmpathyCameraMonitor *monitor,
+ EmpathyCamera *camera,
+ EmpathyCameraMenu *self)
+{
+ GList *l;
+
+ for (l = self->priv->cameras->head; l != NULL; l = g_list_next (l))
+ {
+ GtkAction *action = l->data;
+ const gchar *device;
+
+ device = gtk_action_get_name (action);
+
+ if (tp_strdiff (device, camera->device))
+ continue;
+
+ g_signal_handlers_disconnect_by_func (action,
+ G_CALLBACK (empathy_camera_menu_activate_cb), self);
+
+ gtk_action_group_remove_action (self->priv->action_group,
+ action);
+ g_queue_remove (self->priv->cameras, action);
+ break;
+ }
+
+ empathy_camera_menu_update (self);
+}
+
+static void
+empathy_camera_menu_prefs_camera_changed_cb (GSettings *settings,
+ gchar *key,
+ EmpathyCameraMenu *self)
+{
+ gchar *device = g_settings_get_string (settings, key);
+ GtkRadioAction *action = NULL;
+ gboolean found = FALSE;
+ GList *l;
+
+ for (l = self->priv->cameras->head; l != NULL; l = g_list_next (l))
+ {
+ const gchar *name;
+
+ action = l->data;
+ name = gtk_action_get_name (GTK_ACTION (action));
+
+ if (!tp_strdiff (device, name))
+ {
+ found = TRUE;
+ break;
+ }
+ }
+
+ /* If the selected camera isn't found, we connect the first
+ * available one */
+ if (!found && self->priv->cameras->head != NULL)
+ action = self->priv->cameras->head->data;
+
+ if (action != NULL &&
+ !gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+ {
+ g_signal_handlers_block_by_func (settings,
+ empathy_camera_menu_prefs_camera_changed_cb, self);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+ g_signal_handlers_unblock_by_func (settings,
+ empathy_camera_menu_prefs_camera_changed_cb, self);
+ }
+
+ g_free (device);
+}
+
+static void
+empathy_camera_menu_get_cameras (EmpathyCameraMenu *self)
+{
+ const GList *cameras;
+
+ cameras = empathy_camera_monitor_get_cameras (self->priv->camera_monitor);
+
+ for (; cameras != NULL; cameras = g_list_next (cameras))
+ {
+ EmpathyCamera *camera = cameras->data;
+
+ empathy_camera_menu_add_camera (self, camera);
+ }
+
+ empathy_camera_menu_update (self);
+
+ /* Do as if the gsettings key had changed, so we select the key that
+ * was last set. */
+ empathy_camera_menu_prefs_camera_changed_cb (self->priv->settings,
+ EMPATHY_PREFS_CALL_CAMERA_DEVICE, self);
+}
+
+static void
+empathy_camera_menu_constructed (GObject *obj)
+{
+ EmpathyCameraMenu *self = EMPATHY_CAMERA_MENU (obj);
+ GtkUIManager *ui_manager;
+
+ g_assert (EMPATHY_IS_CALL_WINDOW (self->priv->window));
+
+ ui_manager = empathy_call_window_get_ui_manager (self->priv->window);
+
+ g_assert (GTK_IS_UI_MANAGER (ui_manager));
+
+ /* Okay let's go go go. */
+
+ self->priv->action_group = gtk_action_group_new ("EmpathyCameraMenu");
+ gtk_ui_manager_insert_action_group (ui_manager, self->priv->action_group, -1);
+ /* the UI manager now owns this */
+ g_object_unref (self->priv->action_group);
+
+ self->priv->anchor_action = g_object_new (GTK_TYPE_RADIO_ACTION,
+ "name", "EmpathyCameraMenuAnchorAction",
+ NULL);
+ gtk_action_group_add_action (self->priv->action_group,
+ self->priv->anchor_action);
+ g_object_unref (self->priv->anchor_action);
+
+ self->priv->camera_monitor = empathy_camera_monitor_new ();
+
+ tp_g_signal_connect_object (self->priv->camera_monitor, "added",
+ G_CALLBACK (empathy_camera_menu_camera_added_cb), self, 0);
+ tp_g_signal_connect_object (self->priv->camera_monitor, "removed",
+ G_CALLBACK (empathy_camera_menu_camera_removed_cb), self, 0);
+
+ self->priv->settings = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
+ g_signal_connect (self->priv->settings,
+ "changed::"EMPATHY_PREFS_CALL_CAMERA_DEVICE,
+ G_CALLBACK (empathy_camera_menu_prefs_camera_changed_cb), self);
+
+ self->priv->cameras = g_queue_new ();
+
+ empathy_camera_menu_get_cameras (self);
+}
+
+static void
+empathy_camera_menu_dispose (GObject *obj)
+{
+ EmpathyCameraMenu *self = EMPATHY_CAMERA_MENU (obj);
+
+ tp_clear_pointer (&self->priv->cameras, g_queue_free);
+
+ tp_clear_object (&self->priv->camera_monitor);
+ tp_clear_object (&self->priv->settings);
+
+ G_OBJECT_CLASS (empathy_camera_menu_parent_class)->dispose (obj);
+}
+
+static void
+empathy_camera_menu_class_init (EmpathyCameraMenuClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->set_property = empathy_camera_menu_set_property;
+ object_class->get_property = empathy_camera_menu_get_property;
+ object_class->constructed = empathy_camera_menu_constructed;
+ object_class->dispose = empathy_camera_menu_dispose;
+
+ g_object_class_install_property (object_class, PROP_WINDOW,
+ g_param_spec_object ("window", "window", "window",
+ EMPATHY_TYPE_CALL_WINDOW,
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+ g_type_class_add_private (object_class, sizeof (EmpathyCameraMenuPrivate));
+}
+
+EmpathyCameraMenu *
+empathy_camera_menu_new (EmpathyCallWindow *window)
+{
+ return g_object_new (EMPATHY_TYPE_CAMERA_MENU,
+ "window", window,
+ NULL);
+}
diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h
new file mode 100644
index 000000000..f105baf22
--- /dev/null
+++ b/src/empathy-camera-menu.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Collabora Ltd.
+ *
+ * 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_CAMERA_MENU_H__
+#define __EMPATHY_CAMERA_MENU_H__
+
+#include <glib-object.h>
+
+#include "empathy-call-window.h"
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_CAMERA_MENU (empathy_camera_menu_get_type ())
+#define EMPATHY_CAMERA_MENU(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CAMERA_MENU, EmpathyCameraMenu))
+#define EMPATHY_CAMERA_MENU_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CAMERA_MENU, EmpathyCameraMenuClass))
+#define EMPATHY_IS_CAMERA_MENU(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CAMERA_MENU))
+#define EMPATHY_IS_CAMERA_MENU_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CAMERA_MENU))
+#define EMPATHY_CAMERA_MENU_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CAMERA_MENU, EmpathyCameraMenuClass))
+
+typedef struct _EmpathyCameraMenu EmpathyCameraMenu;
+typedef struct _EmpathyCameraMenuPrivate EmpathyCameraMenuPrivate;
+typedef struct _EmpathyCameraMenuClass EmpathyCameraMenuClass;
+
+struct _EmpathyCameraMenu
+{
+ GObject parent;
+ EmpathyCameraMenuPrivate *priv;
+};
+
+struct _EmpathyCameraMenuClass
+{
+ GObjectClass parent_class;
+};
+
+GType empathy_camera_menu_get_type (void) G_GNUC_CONST;
+
+EmpathyCameraMenu * empathy_camera_menu_new (EmpathyCallWindow *window);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_CAMERA_MENU_H__ */
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 3874fe8d0..294c6afe0 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -115,6 +115,9 @@ typedef struct
/* Service (CM, Client) chooser store */
GtkListStore *service_store;
+ /* Debug to show upon creation */
+ gchar *select_name;
+
/* Misc. */
gboolean dispose_run;
TpAccountManager *am;
@@ -697,6 +700,13 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy,
COL_UNIQUE_NAME, out,
-1);
+ if (priv->select_name != NULL &&
+ !tp_strdiff (name, priv->select_name))
+ {
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->chooser), &iter);
+ tp_clear_pointer (&priv->select_name, g_free);
+ }
+
g_free (name);
}
@@ -1369,6 +1379,37 @@ tree_view_search_equal_func_cb (GtkTreeModel *model,
}
static void
+empathy_debug_window_select_name (EmpathyDebugWindow *self,
+ const gchar *name)
+{
+ EmpathyDebugWindowPriv *priv = GET_PRIV (self);
+ GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store);
+ GtkTreeIter iter;
+ gchar *iter_name;
+ gboolean valid, found = FALSE;
+
+ for (valid = gtk_tree_model_get_iter_first (model, &iter);
+ valid;
+ valid = gtk_tree_model_iter_next (model, &iter))
+ {
+ gtk_tree_model_get (model, &iter,
+ COL_NAME, &iter_name,
+ -1);
+
+ if (!tp_strdiff (name, iter_name))
+ found = TRUE;
+
+ g_free (iter_name);
+
+ if (found)
+ break;
+ }
+
+ if (found)
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->chooser), &iter);
+}
+
+static void
am_prepared_cb (GObject *am,
GAsyncResult *res,
gpointer user_data)
@@ -1670,6 +1711,8 @@ debug_window_finalize (GObject *object)
char *key;
GList *values;
+ g_free (priv->select_name);
+
g_hash_table_iter_init (&iter, priv->cache);
while (g_hash_table_iter_next (&iter, (gpointer *) &key,
@@ -1700,6 +1743,9 @@ debug_window_dispose (GObject *object)
if (priv->name_owner_changed_signal != NULL)
tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);
+ if (priv->new_debug_message_signal != NULL)
+ tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
+
if (priv->proxy != NULL)
{
debug_window_set_enabled (EMPATHY_DEBUG_WINDOW (object), FALSE);
@@ -1707,9 +1753,6 @@ debug_window_dispose (GObject *object)
g_object_unref (priv->proxy);
}
- if (priv->new_debug_message_signal != NULL)
- tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
-
if (priv->service_store != NULL)
g_object_unref (priv->service_store);
@@ -1747,3 +1790,20 @@ empathy_debug_window_new (GtkWindow *parent)
return GTK_WIDGET (g_object_new (EMPATHY_TYPE_DEBUG_WINDOW,
"transient-for", parent, NULL));
}
+
+void
+empathy_debug_window_show (EmpathyDebugWindow *self,
+ const gchar *name)
+{
+ EmpathyDebugWindowPriv *priv = GET_PRIV (self);
+
+ if (priv->service_store != NULL)
+ {
+ empathy_debug_window_select_name (self, name);
+ }
+ else
+ {
+ g_free (priv->select_name);
+ priv->select_name = g_strdup (name);
+ }
+}
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 22eec3f6f..9815c85de 100644
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -58,6 +58,9 @@ GType empathy_debug_window_get_type (void) G_GNUC_CONST;
GtkWidget * empathy_debug_window_new (GtkWindow *parent);
+void empathy_debug_window_show (EmpathyDebugWindow *self,
+ const gchar *name);
+
G_END_DECLS
#endif /* __EMPATHY_DEBUG_WINDOW_H__ */
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 3d38e7103..664dc211a 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -30,6 +30,7 @@
#define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
static GtkWidget *window = NULL;
+static gchar *service = NULL;
static void
activate_cb (GApplication *app)
@@ -46,6 +47,52 @@ activate_cb (GApplication *app)
{
gtk_window_present (GTK_WINDOW (window));
}
+
+ if (service != NULL)
+ empathy_debug_window_show (EMPATHY_DEBUG_WINDOW (window),
+ service);
+}
+
+static gint
+command_line_cb (GApplication *application,
+ GApplicationCommandLine *command_line,
+ gpointer user_data)
+{
+ GError *error = NULL;
+ gchar **argv;
+ gint argc;
+ gint retval = 0;
+
+ GOptionContext *optcontext;
+ GOptionEntry options[] = {
+ { "show-service", 's',
+ 0, G_OPTION_ARG_STRING, &service,
+ N_("Show a particular service"),
+ NULL },
+ { NULL }
+ };
+
+ optcontext = g_option_context_new (N_("- Empathy Debugger"));
+ g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+ g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+
+ argv = g_application_command_line_get_arguments (command_line, &argc);
+
+ if (!g_option_context_parse (optcontext, &argc, &argv, &error))
+ {
+ g_print ("%s\nRun '%s --help' to see a full list of available command "
+ "line options.\n",
+ error->message, argv[0]);
+
+ retval = 1;
+ }
+
+ g_option_context_free (optcontext);
+ g_strfreev (argv);
+
+ g_application_activate (application);
+
+ return retval;
}
int
@@ -60,8 +107,9 @@ main (int argc,
empathy_gtk_init ();
app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME,
- G_APPLICATION_FLAGS_NONE);
+ G_APPLICATION_HANDLES_COMMAND_LINE);
g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
+ g_signal_connect (app, "command-line", G_CALLBACK (command_line_cb), NULL);
g_set_application_name (_("Empathy Debugger"));
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 1551b475d..ec5a275d4 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -14,6 +14,7 @@
#include "empathy-invite-participant-dialog.h"
+#include <libempathy-gtk/empathy-contact-chooser.h>
#include <libempathy-gtk/empathy-individual-view.h>
#include <libempathy-gtk/empathy-ui-utils.h>
@@ -25,24 +26,12 @@ enum
PROP_TP_CHAT = 1
};
-typedef struct _AddTemporaryIndividualCtx AddTemporaryIndividualCtx;
-
struct _EmpathyInviteParticipantDialogPrivate
{
EmpathyTpChat *tp_chat;
- TpAccountManager *account_mgr;
-
- EmpathyIndividualStore *store;
- EmpathyIndividualView *view;
+ GtkWidget *chooser;
GtkWidget *invite_button;
-
- GPtrArray *search_words;
- gchar *search_str;
-
- /* Context representing the FolksIndividual which are added because of the
- * current search from the user. */
- AddTemporaryIndividualCtx *add_temp_ctx;
};
static void
@@ -86,93 +75,24 @@ invite_participant_dialog_set_property (GObject *object,
};
}
-struct _AddTemporaryIndividualCtx
-{
- EmpathyInviteParticipantDialog *self;
- /* List of owned FolksIndividual */
- GList *individuals;
-};
-
-static AddTemporaryIndividualCtx *
-add_temporary_individual_ctx_new (EmpathyInviteParticipantDialog *self)
-{
- AddTemporaryIndividualCtx *ctx = g_slice_new0 (AddTemporaryIndividualCtx);
-
- ctx->self = self;
- return ctx;
-}
-
-static void
-add_temporary_individual_ctx_free (AddTemporaryIndividualCtx *ctx)
-{
- GList *l;
-
- /* Remove all the individuals from the model */
- for (l = ctx->individuals; l != NULL; l = g_list_next (l))
- {
- FolksIndividual *individual = l->data;
-
- individual_store_remove_individual_and_disconnect (ctx->self->priv->store,
- individual);
-
- g_object_unref (individual);
- }
-
- g_list_free (ctx->individuals);
- g_slice_free (AddTemporaryIndividualCtx, ctx);
-}
-
static void
invite_participant_dialog_dispose (GObject *object)
{
EmpathyInviteParticipantDialog *self = (EmpathyInviteParticipantDialog *)
object;
- tp_clear_pointer (&self->priv->add_temp_ctx,
- add_temporary_individual_ctx_free);
-
tp_clear_object (&self->priv->tp_chat);
- tp_clear_object (&self->priv->store);
- tp_clear_pointer (&self->priv->search_words, g_ptr_array_unref);
- tp_clear_pointer (&self->priv->search_str, g_free);
-
- tp_clear_object (&self->priv->account_mgr);
G_OBJECT_CLASS (empathy_invite_participant_dialog_parent_class)->dispose (
object);
}
static void
-empathy_invite_participant_dialog_class_init (
- EmpathyInviteParticipantDialogClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->get_property = invite_participant_dialog_get_property;
- object_class->set_property = invite_participant_dialog_set_property;
- object_class->dispose = invite_participant_dialog_dispose;
-
- g_type_class_add_private (object_class,
- sizeof (EmpathyInviteParticipantDialogPrivate));
-
- g_object_class_install_property (object_class,
- PROP_TP_CHAT,
- g_param_spec_object ("tp-chat", "EmpathyTpChat", "EmpathyTpChat",
- EMPATHY_TYPE_TP_CHAT,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-view_selection_changed_cb (GtkWidget *treeview,
+selection_changed_cb (GtkWidget *treeview,
+ FolksIndividual *selected,
EmpathyInviteParticipantDialog *self)
{
- FolksIndividual *individual;
-
- individual = empathy_individual_view_dup_selected (self->priv->view);
-
- gtk_widget_set_sensitive (self->priv->invite_button, individual != NULL);
-
- tp_clear_object (&individual);
+ gtk_widget_set_sensitive (self->priv->invite_button, selected != NULL);
}
/* Return the TpContact of @individual which is on the same connection as the
@@ -186,7 +106,7 @@ get_tp_contact_for_chat (EmpathyInviteParticipantDialog *self,
GeeSet *personas;
GeeIterator *iter;
- chat_conn = tp_channel_borrow_connection ((TpChannel *) self->priv->tp_chat);
+ chat_conn = tp_channel_borrow_connection (TP_CHANNEL (self->priv->tp_chat));
personas = folks_individual_get_personas (individual);
iter = gee_iterable_iterator (GEE_ITERABLE (personas));
@@ -217,51 +137,32 @@ get_tp_contact_for_chat (EmpathyInviteParticipantDialog *self,
}
static gboolean
-filter_func (GtkTreeModel *model,
- GtkTreeIter *iter,
+filter_individual (EmpathyContactChooser *chooser,
+ FolksIndividual *individual,
+ gboolean is_online,
+ gboolean searching,
gpointer user_data)
{
EmpathyInviteParticipantDialog *self = user_data;
- FolksIndividual *individual;
- TpContact *contact;
- gboolean is_online;
GList *members, *l;
- gboolean display = FALSE;
-
- gtk_tree_model_get (model, iter,
- EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
- EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, &is_online,
- -1);
-
- if (individual == NULL)
- goto out;
+ TpContact *contact;
+ gboolean display = TRUE;
- if (self->priv->search_words == NULL)
- {
- /* Not searching, display online contacts */
- if (!is_online)
- goto out;
- }
- else
- {
- if (!empathy_individual_match_string (individual,
- self->priv->search_str, self->priv->search_words))
- goto out;
- }
+ /* Filter out offline contacts if we are not searching */
+ if (!searching && !is_online)
+ return FALSE;
/* Filter out individuals not having a persona on the same connection as the
* EmpathyTpChat. */
contact = get_tp_contact_for_chat (self, individual);
if (contact == NULL)
- goto out;
+ return FALSE;
/* Filter out contacts which are already in the chat */
members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (
self->priv->tp_chat));
- display = TRUE;
-
for (l = members; l != NULL; l = g_list_next (l))
{
EmpathyContact *member = l->data;
@@ -283,143 +184,18 @@ filter_func (GtkTreeModel *model,
g_list_free_full (members, g_object_unref);
-out:
- tp_clear_object (&individual);
return display;
}
static void
-get_contacts_cb (TpConnection *connection,
- guint n_contacts,
- TpContact * const *contacts,
- const gchar * const *requested_ids,
- GHashTable *failed_id_errors,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
+invite_participant_dialog_constructed (GObject *object)
{
EmpathyInviteParticipantDialog *self =
- (EmpathyInviteParticipantDialog *) weak_object;
- AddTemporaryIndividualCtx *ctx = user_data;
- TpAccount *account;
- TpfPersonaStore *store;
- FolksIndividual *individual;
- TpfPersona *persona_new;
- GeeSet *personas;
-
- if (self->priv->add_temp_ctx != ctx)
- /* another request has been started */
- return;
-
- if (n_contacts != 1)
- return;
-
- account = g_object_get_data (G_OBJECT (connection), "account");
-
- store = tpf_persona_store_new (account);
- personas = GEE_SET (
- gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
- g_direct_hash, g_direct_equal));
- persona_new = tpf_persona_new (contacts[0], store);
- gee_collection_add (GEE_COLLECTION (personas),
- tpf_persona_new (contacts[0], store));
-
- individual = folks_individual_new (personas);
-
- /* Pass ownership to the list */
- ctx->individuals = g_list_prepend (ctx->individuals, individual);
-
- individual_store_add_individual_and_connect (self->priv->store, individual);
-
- g_clear_object (&persona_new);
- g_clear_object (&personas);
- g_object_unref (store);
-}
-
-static void
-add_temporary_individuals (EmpathyInviteParticipantDialog *self,
- const gchar *id)
-{
- GList *accounts, *l;
-
- tp_clear_pointer (&self->priv->add_temp_ctx,
- add_temporary_individual_ctx_free);
-
- if (tp_str_empty (id))
- return;
-
- self->priv->add_temp_ctx = add_temporary_individual_ctx_new (self);
-
- /* Try to add an individual for each connected account */
- accounts = tp_account_manager_get_valid_accounts (self->priv->account_mgr);
- for (l = accounts; l != NULL; l = g_list_next (l))
- {
- TpAccount *account = l->data;
- TpConnection *conn;
- TpContactFeature features[] = { TP_CONTACT_FEATURE_ALIAS,
- TP_CONTACT_FEATURE_AVATAR_DATA,
- TP_CONTACT_FEATURE_PRESENCE,
- TP_CONTACT_FEATURE_CAPABILITIES };
-
- conn = tp_account_get_connection (account);
- if (conn == NULL)
- continue;
-
- /* One day we'll have tp_connection_get_account()... */
- g_object_set_data_full (G_OBJECT (conn), "account",
- g_object_ref (account), g_object_unref);
-
- tp_connection_get_contacts_by_id (conn, 1, &id, G_N_ELEMENTS (features),
- features, get_contacts_cb, self->priv->add_temp_ctx, NULL,
- G_OBJECT (self));
- }
-
- g_list_free (accounts);
-}
-
-static void
-search_text_changed (GtkEntry *entry,
- EmpathyInviteParticipantDialog *self)
-{
- const gchar *id;
-
- tp_clear_pointer (&self->priv->search_words, g_ptr_array_unref);
- tp_clear_pointer (&self->priv->search_str, g_free);
-
- id = gtk_entry_get_text (entry);
-
- self->priv->search_words = empathy_live_search_strip_utf8_string (id);
- self->priv->search_str = g_strdup (id);
-
- add_temporary_individuals (self, id);
-
- empathy_individual_view_refilter (self->priv->view);
-}
-
-static void
-empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self)
-{
+ (EmpathyInviteParticipantDialog *) object;
GtkDialog *dialog = GTK_DIALOG (self);
GtkWidget *label;
char *str;
GtkWidget *content;
- EmpathyIndividualManager *mgr;
- GtkTreeSelection *selection;
- GtkWidget *scroll;
- GtkWidget *search_entry;
- GQuark features[] = { TP_ACCOUNT_MANAGER_FEATURE_CORE, 0 };
-
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- self, EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG,
- EmpathyInviteParticipantDialogPrivate);
-
- self->priv->account_mgr = tp_account_manager_dup ();
-
- /* We don't wait for the CORE feature to be prepared, which is fine as we
- * won't use the account manager until user starts searching. Furthermore,
- * the AM has probably already been prepared by another Empathy
- * component. */
- tp_proxy_prepare_async (self->priv->account_mgr, features, NULL, NULL);
content = gtk_dialog_get_content_area (dialog);
@@ -436,39 +212,17 @@ empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self)
gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- /* Search entry */
- search_entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (content), search_entry, FALSE, TRUE, 6);
- gtk_widget_show (search_entry);
-
- g_signal_connect (search_entry, "changed",
- G_CALLBACK (search_text_changed), self);
-
- /* Add the treeview */
- mgr = empathy_individual_manager_dup_singleton ();
- self->priv->store = empathy_individual_store_new (mgr);
- g_object_unref (mgr);
+ /* contact chooser */
+ self->priv->chooser = empathy_contact_chooser_new ();
- empathy_individual_store_set_show_groups (self->priv->store, FALSE);
+ empathy_contact_chooser_set_filter_func (
+ EMPATHY_CONTACT_CHOOSER (self->priv->chooser), filter_individual, self);
- self->priv->view = empathy_individual_view_new (self->priv->store,
- EMPATHY_INDIVIDUAL_VIEW_FEATURE_NONE, EMPATHY_INDIVIDUAL_FEATURE_NONE);
+ gtk_box_pack_start (GTK_BOX (content), self->priv->chooser, TRUE, TRUE, 6);
+ gtk_widget_show (self->priv->chooser);
- empathy_individual_view_set_custom_filter (self->priv->view,
- filter_func, self);
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->view));
-
- g_signal_connect (selection, "changed",
- G_CALLBACK (view_selection_changed_cb), self);
-
- scroll = gtk_scrolled_window_new (NULL, NULL);
-
- gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (self->priv->view));
-
- gtk_box_pack_start (GTK_BOX (content), scroll, TRUE, TRUE, 6);
- gtk_widget_show (GTK_WIDGET (self->priv->view));
- gtk_widget_show (scroll);
+ g_signal_connect (self->priv->chooser, "selection-changed",
+ G_CALLBACK (selection_changed_cb), self);
self->priv->invite_button = gtk_dialog_add_button (dialog, _("Invite"),
GTK_RESPONSE_ACCEPT);
@@ -481,6 +235,35 @@ empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self)
gtk_window_set_default_size (GTK_WINDOW (self), -1, 400);
}
+static void
+empathy_invite_participant_dialog_class_init (
+ EmpathyInviteParticipantDialogClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->get_property = invite_participant_dialog_get_property;
+ object_class->set_property = invite_participant_dialog_set_property;
+ object_class->constructed = invite_participant_dialog_constructed;
+ object_class->dispose = invite_participant_dialog_dispose;
+
+ g_type_class_add_private (object_class,
+ sizeof (EmpathyInviteParticipantDialogPrivate));
+
+ g_object_class_install_property (object_class,
+ PROP_TP_CHAT,
+ g_param_spec_object ("tp-chat", "EmpathyTpChat", "EmpathyTpChat",
+ EMPATHY_TYPE_TP_CHAT,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ self, EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG,
+ EmpathyInviteParticipantDialogPrivate);
+}
+
GtkWidget *
empathy_invite_participant_dialog_new (GtkWindow *parent,
EmpathyTpChat *tp_chat)
@@ -504,7 +287,8 @@ empathy_invite_participant_dialog_get_selected (
FolksIndividual *individual;
TpContact *contact;
- individual = empathy_individual_view_dup_selected (self->priv->view);
+ individual = empathy_contact_chooser_dup_selected (
+ EMPATHY_CONTACT_CHOOSER (self->priv->chooser));
if (individual == NULL)
return NULL;
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index a9e76a286..3ecb939a4 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1875,9 +1875,9 @@ main_window_edit_blocked_contacts_cb (GtkAction *action,
G_CALLBACK (gtk_widget_destroy), NULL);
}
-static void
-main_window_edit_preferences_cb (GtkAction *action,
- EmpathyMainWindow *window)
+void
+empathy_main_window_show_preferences (EmpathyMainWindow *window,
+ const gchar *tab)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
@@ -1890,6 +1890,17 @@ main_window_edit_preferences_cb (GtkAction *action,
} else {
gtk_window_present (GTK_WINDOW (priv->preferences));
}
+
+ if (tab != NULL)
+ empathy_preferences_show_tab (
+ EMPATHY_PREFERENCES (priv->preferences), tab);
+}
+
+static void
+main_window_edit_preferences_cb (GtkAction *action,
+ EmpathyMainWindow *window)
+{
+ empathy_main_window_show_preferences (window, NULL);
}
static void
@@ -1903,42 +1914,7 @@ static void
main_window_help_debug_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- GdkDisplay *display;
- GError *error = NULL;
- gchar *path;
- GAppInfo *app_info;
- GdkAppLaunchContext *context = NULL;
-
- /* Try to run from source directory if possible */
- path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
- "empathy-debugger", NULL);
-
- if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
- g_free (path);
- path = g_build_filename (BIN_DIR, "empathy-debugger", NULL);
- }
-
- app_info = g_app_info_create_from_commandline (path, NULL, 0, &error);
- if (app_info == NULL) {
- DEBUG ("Failed to create app info: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- display = gdk_display_get_default ();
- context = gdk_display_get_app_launch_context (display);
-
- if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
- &error)) {
- g_warning ("Failed to open debug window: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
-out:
- tp_clear_object (&app_info);
- tp_clear_object (&context);
- g_free (path);
+ empathy_launch_program (BIN_DIR, "empathy-debugger", NULL);
}
static void
diff --git a/src/empathy-main-window.h b/src/empathy-main-window.h
index 38879fb29..cb0ae3cf0 100644
--- a/src/empathy-main-window.h
+++ b/src/empathy-main-window.h
@@ -53,6 +53,9 @@ GType empathy_main_window_get_type (void);
GtkWidget *empathy_main_window_dup (void);
+void empathy_main_window_show_preferences (EmpathyMainWindow *window,
+ const gchar *tab);
+
G_END_DECLS
#endif /* __EMPATHY_MAIN_WINDOW_H__ */
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
new file mode 100644
index 000000000..dc3d0f006
--- /dev/null
+++ b/src/empathy-mic-menu.c
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2011 Collabora Ltd.
+ *
+ * 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
+ *
+ * GtkAction code based on gnome-terminal's TerminalTabsMenu object.
+ * Thanks guys!
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include "empathy-mic-menu.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include <libempathy/empathy-debug.h>
+
+struct _EmpathyMicMenuPrivate
+{
+ /* Borrowed ref; the call window actually owns us. */
+ EmpathyCallWindow *window;
+
+ /* Given away ref; the call window's UI manager now owns this. */
+ GtkActionGroup *action_group;
+
+ /* An invisible radio action so new microphones are always in the
+ * same radio group. */
+ GtkAction *anchor_action;
+
+ /* The merge ID used with the UI manager. We need to keep this
+ * around so in _clean we can remove all the items we've added
+ * before and start again. */
+ guint ui_id;
+
+ /* TRUE if we're in _update and so calling _set_active. */
+ gboolean in_update;
+
+ /* Queue of GtkRadioActions. */
+ GQueue *microphones;
+};
+
+G_DEFINE_TYPE (EmpathyMicMenu, empathy_mic_menu, G_TYPE_OBJECT);
+
+#define MONITOR_KEY "empathy-mic-menu-is-monitor"
+
+enum
+{
+ PROP_WINDOW = 1,
+};
+
+static void empathy_mic_menu_update (EmpathyMicMenu *self);
+
+static void
+empathy_mic_menu_init (EmpathyMicMenu *self)
+{
+ EmpathyMicMenuPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_MIC_MENU, EmpathyMicMenuPrivate);
+
+ self->priv = priv;
+}
+
+static void
+empathy_mic_menu_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyMicMenu *self = EMPATHY_MIC_MENU (object);
+ EmpathyMicMenuPrivate *priv = self->priv;
+
+ switch (property_id)
+ {
+ case PROP_WINDOW:
+ priv->window = g_value_get_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+empathy_mic_menu_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyMicMenu *self = EMPATHY_MIC_MENU (object);
+ EmpathyMicMenuPrivate *priv = self->priv;
+
+ switch (property_id)
+ {
+ case PROP_WINDOW:
+ g_value_set_object (value, priv->window);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+empathy_mic_menu_clean (EmpathyMicMenu *self)
+{
+ EmpathyMicMenuPrivate *priv = self->priv;
+ GtkUIManager *ui_manager;
+
+ if (priv->ui_id == 0)
+ return;
+
+ ui_manager = empathy_call_window_get_ui_manager (priv->window);
+
+ gtk_ui_manager_remove_ui (ui_manager, priv->ui_id);
+ gtk_ui_manager_ensure_update (ui_manager);
+ priv->ui_id = 0;
+}
+
+static void
+empathy_mic_menu_change_mic_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EmpathyGstAudioSrc *audio = EMPATHY_GST_AUDIO_SRC (source_object);
+ EmpathyMicMenu *self = user_data;
+ GError *error = NULL;
+
+ if (!empathy_audio_src_change_microphone_finish (audio, result, &error))
+ {
+ DEBUG ("Failed to change microphone: %s", error->message);
+ g_clear_error (&error);
+
+ /* We call update here because if this change operation failed
+ * and we don't update the menu items, it'll point to the wrong
+ * device. We don't want to call it if the change was successful
+ * because we'll get the notify::microphone signal fired in a
+ * bit and the current value hasn't changed so it'd keep jumping
+ * between these values like there's no tomorrow, etc. */
+ empathy_mic_menu_update (self);
+ }
+}
+
+static void
+empathy_mic_menu_activate_cb (GtkToggleAction *action,
+ EmpathyMicMenu *self)
+{
+ EmpathyMicMenuPrivate *priv = self->priv;
+ EmpathyGstAudioSrc *audio;
+ gint value;
+
+ if (priv->in_update)
+ return;
+
+ audio = empathy_call_window_get_audio_src (priv->window);
+
+ g_object_get (action, "value", &value, NULL);
+
+ empathy_audio_src_change_microphone_async (audio, value,
+ empathy_mic_menu_change_mic_cb, self);
+}
+
+static void
+empathy_mic_menu_update (EmpathyMicMenu *self)
+{
+ EmpathyMicMenuPrivate *priv = self->priv;
+ GList *l;
+ GtkUIManager *ui_manager;
+ EmpathyGstAudioSrc *audio;
+ guint current_mic;
+
+ ui_manager = empathy_call_window_get_ui_manager (priv->window);
+
+ audio = empathy_call_window_get_audio_src (priv->window);
+ current_mic = empathy_audio_src_get_microphone (audio);
+
+ empathy_mic_menu_clean (self);
+ priv->ui_id = gtk_ui_manager_new_merge_id (ui_manager);
+
+ for (l = priv->microphones->head; l != NULL; l = l->next)
+ {
+ GtkRadioAction *action = l->data;
+ const gchar *name = gtk_action_get_name (GTK_ACTION (action));
+ gint value;
+ gboolean active;
+
+ g_object_get (action, "value", &value, NULL);
+
+ active = (value == (gint) current_mic);
+
+ if (active)
+ {
+ priv->in_update = TRUE;
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+ priv->in_update = FALSE;
+ }
+
+ /* If action is a monitor then don't show it in the UI, BUT do
+ * display it regardless if it is the current device. This is so
+ * we don't have a rubbish UI by showing monitor devices in
+ * Empathy, but still show the correct device when someone plays
+ * with pavucontrol. */
+ if (g_object_get_data (G_OBJECT (action), MONITOR_KEY) != NULL
+ && !active)
+ continue;
+
+ gtk_ui_manager_add_ui (ui_manager, priv->ui_id,
+ /* TODO: this should probably be passed from the call
+ * window, seeing that it's a reference to
+ * empathy-call-window.ui. */
+ "/menubar1/edit/menumicrophone",
+ name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+ }
+}
+
+static void
+empathy_mic_menu_add_microphone (EmpathyMicMenu *self,
+ const gchar *name,
+ const gchar *description,
+ guint source_idx,
+ gboolean is_monitor)
+{
+ EmpathyMicMenuPrivate *priv = self->priv;
+ GtkRadioAction *action;
+ GSList *group;
+
+ action = gtk_radio_action_new (name, description, NULL, NULL, source_idx);
+ gtk_action_group_add_action_with_accel (priv->action_group,
+ GTK_ACTION (action), NULL);
+
+ /* Set MONITOR_KEY on the action to non-NULL if it's a monitor
+ * because we don't want to show monitors if we can help it. */
+ if (is_monitor)
+ {
+ g_object_set_data (G_OBJECT (action), MONITOR_KEY,
+ GUINT_TO_POINTER (TRUE));
+ }
+
+ group = gtk_radio_action_get_group (GTK_RADIO_ACTION (priv->anchor_action));
+ gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group);
+
+ g_queue_push_tail (priv->microphones, action);
+
+ g_signal_connect (action, "activate",
+ G_CALLBACK (empathy_mic_menu_activate_cb), self);
+}
+
+static void
+empathy_mic_menu_notify_microphone_cb (EmpathyGstAudioSrc *audio,
+ GParamSpec *pspec,
+ EmpathyMicMenu *self)
+{
+ empathy_mic_menu_update (self);
+}
+
+static void
+empathy_mic_menu_microphone_added_cb (EmpathyGstAudioSrc *audio,
+ guint source_idx,
+ const gchar *name,
+ const gchar *description,
+ gboolean is_monitor,
+ EmpathyMicMenu *self)
+{
+ empathy_mic_menu_add_microphone (self, name, description,
+ source_idx, is_monitor);
+
+ empathy_mic_menu_update (self);
+}
+
+static void
+empathy_mic_menu_microphone_removed_cb (EmpathyGstAudioSrc *audio,
+ guint source_idx,
+ EmpathyMicMenu *self)
+{
+ EmpathyMicMenuPrivate *priv = self->priv;
+ GList *l;
+
+ for (l = priv->microphones->head; l != NULL; l = l->next)
+ {
+ GtkRadioAction *action = l->data;
+ gint value;
+
+ g_object_get (action, "value", &value, NULL);
+
+ if (value != (gint) source_idx)
+ {
+ action = NULL;
+ continue;
+ }
+
+ g_signal_handlers_disconnect_by_func (action,
+ G_CALLBACK (empathy_mic_menu_activate_cb), self);
+
+ gtk_action_group_remove_action (priv->action_group, GTK_ACTION (action));
+ g_queue_remove (priv->microphones, action);
+ break;
+ }
+
+ empathy_mic_menu_update (self);
+}
+
+static void
+empathy_mic_menu_get_microphones_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EmpathyGstAudioSrc *audio = EMPATHY_GST_AUDIO_SRC (source_object);
+ EmpathyMicMenu *self = user_data;
+ GError *error = NULL;
+ const GList *mics = NULL;
+
+ mics = empathy_audio_src_get_microphones_finish (audio, result, &error);
+
+ if (error != NULL)
+ {
+ DEBUG ("Failed to get microphone list: %s", error->message);
+ g_clear_error (&error);
+ return;
+ }
+
+ for (; mics != NULL; mics = mics->next)
+ {
+ EmpathyAudioSrcMicrophone *mic = mics->data;
+
+ empathy_mic_menu_add_microphone (self, mic->name,
+ mic->description, mic->index, mic->is_monitor);
+ }
+
+ empathy_mic_menu_update (self);
+}
+
+static void
+empathy_mic_menu_constructed (GObject *obj)
+{
+ EmpathyMicMenu *self = EMPATHY_MIC_MENU (obj);
+ EmpathyMicMenuPrivate *priv = self->priv;
+ GtkUIManager *ui_manager;
+ EmpathyGstAudioSrc *audio;
+
+ g_assert (EMPATHY_IS_CALL_WINDOW (priv->window));
+
+ ui_manager = empathy_call_window_get_ui_manager (priv->window);
+ audio = empathy_call_window_get_audio_src (priv->window);
+
+ g_assert (GTK_IS_UI_MANAGER (ui_manager));
+ g_assert (EMPATHY_IS_GST_AUDIO_SRC (audio));
+
+ /* Okay let's go go go. */
+
+ priv->action_group = gtk_action_group_new ("EmpathyMicMenu");
+ gtk_ui_manager_insert_action_group (ui_manager, priv->action_group, -1);
+ /* the UI manager now owns this */
+ g_object_unref (priv->action_group);
+
+ priv->anchor_action = g_object_new (GTK_TYPE_RADIO_ACTION,
+ "name", "EmpathyMicMenuAnchorAction",
+ NULL);
+ gtk_action_group_add_action (priv->action_group, priv->anchor_action);
+ g_object_unref (priv->anchor_action);
+
+ tp_g_signal_connect_object (audio, "notify::microphone",
+ G_CALLBACK (empathy_mic_menu_notify_microphone_cb), self, 0);
+ tp_g_signal_connect_object (audio, "microphone-added",
+ G_CALLBACK (empathy_mic_menu_microphone_added_cb), self, 0);
+ tp_g_signal_connect_object (audio, "microphone-removed",
+ G_CALLBACK (empathy_mic_menu_microphone_removed_cb), self, 0);
+
+ priv->microphones = g_queue_new ();
+
+ empathy_audio_src_get_microphones_async (audio,
+ empathy_mic_menu_get_microphones_cb, self);
+}
+
+static void
+empathy_mic_menu_dispose (GObject *obj)
+{
+ EmpathyMicMenu *self = EMPATHY_MIC_MENU (obj);
+ EmpathyMicMenuPrivate *priv = self->priv;
+
+ if (priv->microphones != NULL)
+ g_queue_free (priv->microphones);
+ priv->microphones = NULL;
+
+ G_OBJECT_CLASS (empathy_mic_menu_parent_class)->dispose (obj);
+}
+
+static void
+empathy_mic_menu_class_init (EmpathyMicMenuClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->set_property = empathy_mic_menu_set_property;
+ object_class->get_property = empathy_mic_menu_get_property;
+ object_class->constructed = empathy_mic_menu_constructed;
+ object_class->dispose = empathy_mic_menu_dispose;
+
+ g_object_class_install_property (object_class, PROP_WINDOW,
+ g_param_spec_object ("window", "window", "window",
+ EMPATHY_TYPE_CALL_WINDOW,
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+ g_type_class_add_private (object_class, sizeof (EmpathyMicMenuPrivate));
+}
+
+EmpathyMicMenu *
+empathy_mic_menu_new (EmpathyCallWindow *window)
+{
+ return g_object_new (EMPATHY_TYPE_MIC_MENU,
+ "window", window,
+ NULL);
+}
diff --git a/src/empathy-mic-menu.h b/src/empathy-mic-menu.h
new file mode 100644
index 000000000..87691ae6d
--- /dev/null
+++ b/src/empathy-mic-menu.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Collabora Ltd.
+ *
+ * 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_MIC_MENU_H__
+#define __EMPATHY_MIC_MENU_H__
+
+#include <glib-object.h>
+
+#include "empathy-call-window.h"
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_MIC_MENU (empathy_mic_menu_get_type ())
+#define EMPATHY_MIC_MENU(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_MIC_MENU, EmpathyMicMenu))
+#define EMPATHY_MIC_MENU_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_MIC_MENU, EmpathyMicMenuClass))
+#define EMPATHY_IS_MIC_MENU(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_MIC_MENU))
+#define EMPATHY_IS_MIC_MENU_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_MIC_MENU))
+#define EMPATHY_MIC_MENU_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_MIC_MENU, EmpathyMicMenuClass))
+
+typedef struct _EmpathyMicMenu EmpathyMicMenu;
+typedef struct _EmpathyMicMenuPrivate EmpathyMicMenuPrivate;
+typedef struct _EmpathyMicMenuClass EmpathyMicMenuClass;
+
+struct _EmpathyMicMenu
+{
+ GObject parent;
+ EmpathyMicMenuPrivate *priv;
+};
+
+struct _EmpathyMicMenuClass
+{
+ GObjectClass parent_class;
+};
+
+GType empathy_mic_menu_get_type (void) G_GNUC_CONST;
+
+EmpathyMicMenu * empathy_mic_menu_new (EmpathyCallWindow *window);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_MIC_MENU_H__ */
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 9c737b991..9dc7f58bf 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -52,6 +52,17 @@ G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
#define GET_PRIV(self) ((EmpathyPreferencesPriv *)((EmpathyPreferences *) self)->priv)
+static const gchar * empathy_preferences_tabs[] =
+{
+ "general",
+ "notifications",
+ "sounds",
+ "calls",
+ "location",
+ "spell",
+ "themes",
+};
+
struct _EmpathyPreferencesPriv {
GtkWidget *notebook;
@@ -72,6 +83,10 @@ struct _EmpathyPreferencesPriv {
GtkWidget *checkbutton_notifications_contact_signin;
GtkWidget *checkbutton_notifications_contact_signout;
+ GtkWidget *scale_call_volume;
+ GtkWidget *adj_call_volume;
+ GtkWidget *echo_cancellation;
+
GtkWidget *treeview_spell_checker;
GtkWidget *checkbutton_location_publish;
@@ -90,6 +105,7 @@ struct _EmpathyPreferencesPriv {
GSettings *gsettings;
GSettings *gsettings_chat;
+ GSettings *gsettings_call;
GSettings *gsettings_loc;
GSettings *gsettings_notify;
GSettings *gsettings_sound;
@@ -256,6 +272,18 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
"active",
G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (priv->gsettings_call,
+ EMPATHY_PREFS_CALL_SOUND_VOLUME,
+ priv->adj_call_volume,
+ "value",
+ G_SETTINGS_BIND_DEFAULT);
+
+ g_settings_bind (priv->gsettings_call,
+ EMPATHY_PREFS_CALL_ECHO_CANCELLATION,
+ priv->echo_cancellation,
+ "active",
+ G_SETTINGS_BIND_DEFAULT);
+
g_settings_bind (priv->gsettings,
EMPATHY_PREFS_AUTOCONNECT,
priv->checkbutton_autoconnect,
@@ -1071,6 +1099,13 @@ preferences_themes_setup (EmpathyPreferences *preferences)
preferences);
}
+static gchar *
+preferences_call_format_volume_cb (GtkScale *scale,
+ gdouble value)
+{
+ return g_strdup_printf ("%g%%", value);
+}
+
static void
empathy_preferences_response (GtkDialog *widget,
gint response)
@@ -1087,6 +1122,7 @@ empathy_preferences_finalize (GObject *self)
g_object_unref (priv->gsettings);
g_object_unref (priv->gsettings_chat);
+ g_object_unref (priv->gsettings_call);
g_object_unref (priv->gsettings_loc);
g_object_unref (priv->gsettings_notify);
g_object_unref (priv->gsettings_sound);
@@ -1117,6 +1153,8 @@ empathy_preferences_init (EmpathyPreferences *preferences)
GtkBuilder *gui;
gchar *filename;
GtkWidget *page;
+ GtkWidget *call_volume_scale_box;
+ GtkWidget *call_volume_bar_box;
priv = preferences->priv = G_TYPE_INSTANCE_GET_PRIVATE (preferences,
EMPATHY_TYPE_PREFERENCES, EmpathyPreferencesPriv);
@@ -1159,6 +1197,11 @@ empathy_preferences_init (EmpathyPreferences *preferences)
"checkbutton_location_resource_network", &priv->checkbutton_location_resource_network,
"checkbutton_location_resource_cell", &priv->checkbutton_location_resource_cell,
"checkbutton_location_resource_gps", &priv->checkbutton_location_resource_gps,
+ "call_volume_scale_box", &call_volume_scale_box,
+ "call_volume_bar_box", &call_volume_bar_box,
+ "call_volume_scale", &priv->scale_call_volume,
+ "call_volume_adjustment", &priv->adj_call_volume,
+ "call_echo_cancellation", &priv->echo_cancellation,
NULL);
g_free (filename);
@@ -1169,6 +1212,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
priv->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
+ priv->gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
priv->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA);
priv->gsettings_notify = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA);
priv->gsettings_sound = g_settings_new (EMPATHY_PREFS_SOUNDS_SCHEMA);
@@ -1182,6 +1226,15 @@ empathy_preferences_init (EmpathyPreferences *preferences)
preferences, 0);
preferences_preview_theme_changed_cb (priv->theme_manager, preferences);
+ g_signal_connect (priv->scale_call_volume, "format-value",
+ G_CALLBACK (preferences_call_format_volume_cb),
+ preferences);
+
+#ifndef HAVE_CALL
+ gtk_widget_hide (call_volume_scale_box);
+ gtk_widget_hide (call_volume_bar_box);
+#endif
+
preferences_themes_setup (preferences);
preferences_setup_widgets (preferences);
@@ -1194,11 +1247,11 @@ empathy_preferences_init (EmpathyPreferences *preferences)
preferences_sound_load (preferences);
if (empathy_spell_supported ()) {
- page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 2);
+ page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), EMPATHY_PREFERENCES_TAB_SPELL);
gtk_widget_show (page);
}
- page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 3);
+ page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), EMPATHY_PREFERENCES_TAB_LOCATION);
#ifdef HAVE_GEOCLUE
gtk_widget_show (page);
#else
@@ -1206,6 +1259,29 @@ empathy_preferences_init (EmpathyPreferences *preferences)
#endif
}
+static EmpathyPreferencesTab
+empathy_preferences_tab_from_string (const gchar *str)
+{
+ guint i;
+
+ for (i = 0; i < G_N_ELEMENTS (empathy_preferences_tabs); i++)
+ {
+ if (!tp_strdiff (str, empathy_preferences_tabs[i]))
+ return i;
+ }
+
+ g_warn_if_reached ();
+ return -1;
+}
+
+const gchar *
+empathy_preferences_tab_to_string (EmpathyPreferencesTab tab)
+{
+ g_return_val_if_fail (tab < G_N_ELEMENTS (empathy_preferences_tabs), NULL);
+
+ return empathy_preferences_tabs[tab];
+}
+
GtkWidget *
empathy_preferences_new (GtkWindow *parent)
{
@@ -1222,3 +1298,13 @@ empathy_preferences_new (GtkWindow *parent)
return self;
}
+
+void
+empathy_preferences_show_tab (EmpathyPreferences *self,
+ const gchar *page)
+{
+ EmpathyPreferencesPriv *priv = GET_PRIV (self);
+
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
+ empathy_preferences_tab_from_string (page));
+}
diff --git a/src/empathy-preferences.h b/src/empathy-preferences.h
index 0d7204fcc..fef0646d7 100644
--- a/src/empathy-preferences.h
+++ b/src/empathy-preferences.h
@@ -50,12 +50,28 @@ struct _EmpathyPreferencesClass {
GtkDialogClass parent_class;
};
+/* Keep this enum and the array in empathy-preferences.c in sync */
+typedef enum
+{
+ EMPATHY_PREFERENCES_TAB_GENERAL,
+ EMPATHY_PREFERENCES_TAB_NOTIFICATIONS,
+ EMPATHY_PREFERENCES_TAB_SOUNDS,
+ EMPATHY_PREFERENCES_TAB_CALLS,
+ EMPATHY_PREFERENCES_TAB_LOCATION,
+ EMPATHY_PREFERENCES_TAB_SPELL,
+ EMPATHY_PREFERENCES_TAB_THEMES,
+} EmpathyPreferencesTab;
+
GType empathy_preferences_get_type (void);
GtkWidget *empathy_preferences_new (GtkWindow *parent);
-G_END_DECLS
+void empathy_preferences_show_tab (EmpathyPreferences *self,
+ const gchar *tab);
-#endif /* __EMPATHY_PREFERENCES_H__ */
+const gchar *
+empathy_preferences_tab_to_string (EmpathyPreferencesTab tab);
+G_END_DECLS
+#endif /* __EMPATHY_PREFERENCES_H__ */
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 2549d51ad..791f3fbd9 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
+ <object class="GtkAdjustment" id="call_volume_adjustment">
+ <property name="upper">150</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -457,6 +462,163 @@
</packing>
</child>
<child>
+ <object class="GtkBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="call_volume_scale_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Input volume</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="call_volume_scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">call_volume_adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="call_volume_bar_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Input level</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="progressbar2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="call_echo_cancellation">
+ <property name="label">_Echo Cancellation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Audio</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label608">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Calls</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -667,7 +829,7 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child type="tab">
@@ -677,7 +839,7 @@
<property name="label" translatable="yes">Location</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -796,7 +958,7 @@
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child type="tab">
@@ -806,7 +968,7 @@
<property name="label" translatable="yes">Spell Checking</property>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -946,7 +1108,7 @@
</child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child type="tab">
@@ -956,9 +1118,15 @@
<property name="label" translatable="yes">Themes</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label12"/>
+ <widget name="label13"/>
+ </widgets>
+ </object>
</interface>
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
new file mode 100644
index 000000000..463a73c61
--- /dev/null
+++ b/src/empathy-rounded-actor.c
@@ -0,0 +1,68 @@
+/*
+ * empathy-rounded-actor.c - Source for EmpathyRoundedActor
+ * Copyright (C) 2011 Collabora Ltd.
+ * @author Emilio Pozuelo Monfort <emilio.pozuelo@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 <clutter/clutter.h>
+#include <clutter-gtk/clutter-gtk.h>
+
+#include "empathy-rounded-actor.h"
+
+G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
+
+static void
+empathy_rounded_actor_paint (ClutterActor *actor)
+{
+ ClutterActorBox allocation = { 0, };
+ gfloat width, height;
+
+ clutter_actor_get_allocation_box (actor, &allocation);
+ clutter_actor_box_get_size (&allocation, &width, &height);
+
+ cogl_path_new ();
+
+ /* create and store a path describing a rounded rectangle */
+ cogl_path_round_rectangle (0, 0, width, height, height / 2, 0.1);
+
+ cogl_clip_push_from_path ();
+
+ CLUTTER_ACTOR_CLASS (empathy_rounded_actor_parent_class)->paint (actor);
+
+ cogl_clip_pop ();
+}
+
+static void
+empathy_rounded_actor_init (EmpathyRoundedActor *self)
+{
+}
+
+static void
+empathy_rounded_actor_class_init (EmpathyRoundedActorClass *klass)
+{
+ ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+
+ actor_class->paint = empathy_rounded_actor_paint;
+}
+
+ClutterActor *
+empathy_rounded_actor_new (void)
+{
+ return CLUTTER_ACTOR (
+ g_object_new (EMPATHY_TYPE_ROUNDED_ACTOR, NULL));
+}
diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
new file mode 100644
index 000000000..e4c83b078
--- /dev/null
+++ b/src/empathy-rounded-actor.h
@@ -0,0 +1,63 @@
+/*
+ * empathy-rounded-actor.h - Header for EmpathyRoundedActor
+ * Copyright (C) 2011 Collabora Ltd.
+ * @author Emilio Pozuelo Monfort <emilio.pozuelo@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_ROUNDED_ACTOR_H__
+#define __EMPATHY_ROUNDED_ACTOR_H__
+
+#include <glib-object.h>
+#include <clutter-gtk/clutter-gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyRoundedActor EmpathyRoundedActor;
+typedef struct _EmpathyRoundedActorClass EmpathyRoundedActorClass;
+
+struct _EmpathyRoundedActorClass {
+ GtkClutterActorClass parent_class;
+};
+
+struct _EmpathyRoundedActor {
+ GtkClutterActor parent;
+};
+
+GType empathy_rounded_actor_get_type (void);
+
+/* TYPE MACROS */
+#define EMPATHY_TYPE_ROUNDED_ACTOR \
+ (empathy_rounded_actor_get_type ())
+#define EMPATHY_ROUNDED_ACTOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_ROUNDED_ACTOR, \
+ EmpathyRoundedActor))
+#define EMPATHY_ROUNDED_ACTOR_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ROUNDED_ACTOR, \
+ EmpathyRoundedActorClass))
+#define EMPATHY_IS_ROUNDED_ACTOR(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ROUNDED_ACTOR))
+#define EMPATHY_IS_ROUNDED_ACTOR_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ROUNDED_ACTOR))
+#define EMPATHY_ROUNDED_ACTOR_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ROUNDED_ACTOR, \
+ EmpathyRoundedActorClass))
+
+ClutterActor *empathy_rounded_actor_new (void);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_ROUNDED_ACTOR_H__*/
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 19b7b2fad..d60c0753b 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -54,8 +54,6 @@
#include "empathy-video-src.h"
#include "ev-sidebar.h"
-#define BUTTON_ID "empathy-call-dtmf-button-id"
-
#define CONTENT_HBOX_BORDER_WIDTH 6
#define CONTENT_HBOX_SPACING 3
#define CONTENT_HBOX_CHILDREN_PACKING_PADDING 3
@@ -346,7 +344,7 @@ dtmf_button_pressed_cb (GtkButton *button, EmpathyStreamedMediaWindow *window)
g_object_get (priv->handler, "tp-call", &call, NULL);
- button_quark = g_quark_from_static_string (BUTTON_ID);
+ button_quark = g_quark_from_static_string (EMPATHY_DTMF_BUTTON_ID);
event = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (button),
button_quark));
@@ -369,51 +367,6 @@ dtmf_button_released_cb (GtkButton *button, EmpathyStreamedMediaWindow *window)
}
static GtkWidget *
-empathy_streamed_media_window_create_dtmf (EmpathyStreamedMediaWindow *self)
-{
- GtkWidget *table;
- int i;
- GQuark button_quark;
- struct {
- const gchar *label;
- TpDTMFEvent event;
- } dtmfbuttons[] = { { "1", TP_DTMF_EVENT_DIGIT_1 },
- { "2", TP_DTMF_EVENT_DIGIT_2 },
- { "3", TP_DTMF_EVENT_DIGIT_3 },
- { "4", TP_DTMF_EVENT_DIGIT_4 },
- { "5", TP_DTMF_EVENT_DIGIT_5 },
- { "6", TP_DTMF_EVENT_DIGIT_6 },
- { "7", TP_DTMF_EVENT_DIGIT_7 },
- { "8", TP_DTMF_EVENT_DIGIT_8 },
- { "9", TP_DTMF_EVENT_DIGIT_9 },
- { "#", TP_DTMF_EVENT_HASH },
- { "0", TP_DTMF_EVENT_DIGIT_0 },
- { "*", TP_DTMF_EVENT_ASTERISK },
- { NULL, } };
-
- button_quark = g_quark_from_static_string (BUTTON_ID);
-
- table = gtk_table_new (4, 3, TRUE);
-
- for (i = 0; dtmfbuttons[i].label != NULL; i++)
- {
- GtkWidget *button = gtk_button_new_with_label (dtmfbuttons[i].label);
- gtk_table_attach (GTK_TABLE (table), button, i % 3, i % 3 + 1,
- i/3, i/3 + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-
- g_object_set_qdata (G_OBJECT (button), button_quark,
- GUINT_TO_POINTER (dtmfbuttons[i].event));
-
- g_signal_connect (G_OBJECT (button), "pressed",
- G_CALLBACK (dtmf_button_pressed_cb), self);
- g_signal_connect (G_OBJECT (button), "released",
- G_CALLBACK (dtmf_button_released_cb), self);
- }
-
- return table;
-}
-
-static GtkWidget *
empathy_streamed_media_window_create_video_input_add_slider (EmpathyStreamedMediaWindow *self,
gchar *label_text, GtkWidget *bin)
{
@@ -1180,7 +1133,9 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self)
ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "video-input",
_("Video input"), page);
- priv->dtmf_panel = empathy_streamed_media_window_create_dtmf (self);
+ priv->dtmf_panel = empathy_create_dtmf_dialpad (G_OBJECT (self),
+ G_CALLBACK (dtmf_button_pressed_cb),
+ G_CALLBACK (dtmf_button_released_cb));
ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "dialpad",
_("Dialpad"), priv->dtmf_panel);
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 15d8f79e1..ceb344215 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -123,8 +123,8 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
/* allocate any data required by the object here */
if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
- NULL, "gconfvideosrc")) == NULL)
- g_error ("Couldn't add \"gconfvideosrc\" (gst-plugins-good missing?)");
+ NULL, "v4l2src")) == NULL)
+ g_error ("Couldn't add \"v4l2src\" (gst-plugins-good missing?)");
/* we need to save our source to priv->src */
priv->src = element;
@@ -361,3 +361,27 @@ out:
return result;
}
+void
+empathy_video_src_change_device (EmpathyGstVideoSrc *self,
+ const gchar *device)
+{
+ EmpathyGstVideoSrcPrivate *priv = EMPATHY_GST_VIDEO_SRC_GET_PRIVATE (self);
+ GstState state;
+
+ gst_element_get_state (priv->src, &state, NULL, 0);
+
+ gst_element_set_state (priv->src, GST_STATE_NULL);
+ g_object_set (priv->src, "device", device, NULL);
+ gst_element_set_state (priv->src, state);
+}
+
+gchar *
+empathy_video_src_dup_device (EmpathyGstVideoSrc *self)
+{
+ EmpathyGstVideoSrcPrivate *priv = EMPATHY_GST_VIDEO_SRC_GET_PRIVATE (self);
+ gchar *device;
+
+ g_object_get (priv->src, "device", &device, NULL);
+
+ return device;
+}
diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h
index fae5563eb..6a88b79eb 100644
--- a/src/empathy-video-src.h
+++ b/src/empathy-video-src.h
@@ -81,6 +81,10 @@ void empathy_video_src_set_channel (GstElement *src,
guint empathy_video_src_get_channel (GstElement *src,
EmpathyGstVideoSrcChannel channel);
+void empathy_video_src_change_device (EmpathyGstVideoSrc *self,
+ const gchar *device);
+gchar * empathy_video_src_dup_device (EmpathyGstVideoSrc *self);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_GST_VIDEO_SRC_H__*/
diff --git a/src/empathy.c b/src/empathy.c
index 6e2b165dc..3506319fa 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -106,6 +106,8 @@ struct _EmpathyApp
/* Properties */
gboolean no_connect;
gboolean start_hidden;
+ gboolean show_preferences;
+ gchar *preferences_tab;
gboolean activated;
@@ -171,6 +173,8 @@ empathy_app_finalize (GObject *object)
void (*finalize) (GObject *) =
G_OBJECT_CLASS (empathy_app_parent_class)->finalize;
+ g_free (self->preferences_tab);
+
if (self->window != NULL)
gtk_widget_destroy (self->window);
@@ -230,11 +234,31 @@ new_ft_handler_cb (EmpathyFTFactory *factory,
g_object_unref (handler);
}
+static gboolean
+empathy_app_local_command_line (GApplication *app,
+ gchar ***arguments,
+ gint *exit_status);
+
static int
empathy_app_command_line (GApplication *app,
GApplicationCommandLine *cmdline)
{
EmpathyApp *self = (EmpathyApp *) app;
+ gchar **args, **argv;
+ gint argc, exit_status, i;
+
+ args = g_application_command_line_get_arguments (cmdline, &argc);
+ /* We have to make an extra copy of the array, since g_option_context_parse()
+ * assumes that it can remove strings from the array without freeing them. */
+ argv = g_new (gchar*, argc + 1);
+ for (i = 0; i <= argc; i++)
+ argv[i] = args[i];
+
+ if (empathy_app_local_command_line (app, &argv, &exit_status))
+ DEBUG ("failed to parse command line!");
+
+ g_free (argv);
+ g_strfreev (args);
if (!self->activated)
{
@@ -273,6 +297,10 @@ empathy_app_command_line (GApplication *app,
self->start_hidden = FALSE;
}
+ if (self->show_preferences)
+ empathy_main_window_show_preferences (EMPATHY_MAIN_WINDOW (self->window),
+ self->preferences_tab);
+
if (!self->start_hidden)
empathy_window_present (GTK_WINDOW (self->window));
@@ -284,6 +312,22 @@ empathy_app_command_line (GApplication *app,
}
static gboolean
+preferences_cb (const char *option_name,
+ const char *value,
+ gpointer data,
+ GError **error)
+{
+ EmpathyApp *self = data;
+
+ self->show_preferences = TRUE;
+
+ g_free (self->preferences_tab);
+ self->preferences_tab = g_strdup (value);
+
+ return TRUE;
+}
+
+static gboolean
show_version_cb (const char *option_name,
const char *value,
gpointer data,
@@ -303,6 +347,7 @@ empathy_app_local_command_line (GApplication *app,
gboolean no_connect = FALSE, start_hidden = FALSE;
GOptionContext *optcontext;
+ GOptionGroup *group;
GOptionEntry options[] = {
{ "no-connect", 'n',
0, G_OPTION_ARG_NONE, &no_connect,
@@ -312,19 +357,32 @@ empathy_app_local_command_line (GApplication *app,
0, G_OPTION_ARG_NONE, &start_hidden,
N_("Don't display the contact list or any other dialogs on startup"),
NULL },
+ { "show-preferences", 'p',
+ G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, &preferences_cb,
+ NULL, NULL },
{ "version", 'v',
G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version_cb,
NULL, NULL },
{ NULL }
};
+ /* We create a group so that GOptionArgFuncs get the user data */
+ group = g_option_group_new ("empathy", NULL, NULL, app, NULL);
+ g_option_group_add_entries (group, options);
+
optcontext = g_option_context_new (N_("- Empathy IM Client"));
g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
- g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+ g_option_context_set_main_group (optcontext, group);
+ g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
- argv = *arguments;
- for (i = 0; argv[i] != NULL; i++)
- argc++;
+ argc = g_strv_length (*arguments);
+
+ /* We dup the args because g_option_context_parse() sets things to NULL,
+ * but we want to parse all the command line to the primary instance
+ * if necessary. */
+ argv = g_new (gchar*, argc + 1);
+ for (i = 0; i <= argc; i++)
+ argv[i] = (*arguments)[i];
if (!g_option_context_parse (optcontext, &argc, &argv, &error))
{
@@ -337,6 +395,8 @@ empathy_app_local_command_line (GApplication *app,
retval = TRUE;
}
+ g_free (argv);
+
g_option_context_free (optcontext);
self->no_connect = no_connect;
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index 6c5615ec3..801bd0b50 100644
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -41,15 +41,8 @@ main (int argc,
manager = empathy_contact_manager_dup_singleton ();
dialog = empathy_contact_blocking_dialog_new (NULL);
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_main_quit), NULL);
+ gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_show (dialog);
-
- gtk_main ();
-
- gtk_widget_destroy (dialog);
g_object_unref (manager);
-
return 0;
}