aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING-DOCS451
-rw-r--r--COPYING.LGPL504
-rw-r--r--COPYING.SHARE-ALIKE61
-rw-r--r--Makefile.am14
-rw-r--r--NEWS28
-rw-r--r--configure.ac34
-rw-r--r--data/empathy.schemas.in18
-rw-r--r--data/icons/Makefile.am18
-rw-r--r--data/icons/hicolor_apps_16x16_im-aim.pngbin0 -> 795 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-icq.pngbin0 -> 936 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-yahoo.pngbin0 -> 906 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-aim.pngbin0 -> 1134 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-icq.pngbin0 -> 1359 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-yahoo.pngbin0 -> 1261 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-aim.pngbin0 -> 1218 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-icq.pngbin0 -> 1512 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-yahoo.pngbin0 -> 1411 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-aim.pngbin0 -> 1777 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-icq.pngbin0 -> 2121 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-yahoo.pngbin0 -> 1955 bytes
-rw-r--r--data/icons/hicolor_apps_48x48_im-aim.pngbin0 -> 2953 bytes
-rw-r--r--data/icons/hicolor_apps_48x48_im-icq.pngbin0 -> 3418 bytes
-rw-r--r--data/icons/hicolor_apps_48x48_im-yahoo.pngbin0 -> 3211 bytes
-rw-r--r--data/icons/hicolor_apps_scalable_im-aim.svg183
-rw-r--r--data/icons/hicolor_apps_scalable_im-icq.svg200
-rw-r--r--data/icons/hicolor_apps_scalable_im-yahoo.svg266
-rw-r--r--extensions/Logger.xml179
-rw-r--r--extensions/Makefile.am6
-rw-r--r--extensions/all.xml2
-rw-r--r--extensions/generic-types.xml6
-rw-r--r--extensions/misc.xml1
-rw-r--r--help/C/hide-contacts.page42
-rw-r--r--help/C/irc-join-pwd.page30
-rw-r--r--help/C/offline-contacts.page51
-rw-r--r--help/Makefile.am2
-rw-r--r--help/de/de.po2150
-rw-r--r--help/es/es.po193
-rw-r--r--help/it/it.po158
-rw-r--r--libempathy-gtk/empathy-conf.h1
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c3
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c220
-rw-r--r--libempathy-gtk/empathy-contact-list-store.h9
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c129
-rw-r--r--libempathy-gtk/empathy-contact-list-view.h3
-rw-r--r--libempathy-gtk/empathy-contact-menu.c49
-rw-r--r--libempathy-gtk/empathy-contact-menu.h1
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.c76
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.h7
-rw-r--r--libempathy-gtk/empathy-contact-widget.c86
-rw-r--r--libempathy-gtk/empathy-contact-widget.h1
-rw-r--r--libempathy-gtk/empathy-string-parser.c8
-rw-r--r--libempathy-gtk/empathy-ui-utils.c22
-rw-r--r--libempathy-gtk/empathy-ui-utils.h3
-rw-r--r--libempathy/empathy-chatroom-manager.c2
-rw-r--r--libempathy/empathy-contact-list.c47
-rw-r--r--libempathy/empathy-contact-list.h17
-rw-r--r--libempathy/empathy-contact-manager.c317
-rw-r--r--libempathy/empathy-dispatcher.c5
-rw-r--r--libempathy/empathy-idle.c17
-rw-r--r--libempathy/empathy-log-store-empathy.c7
-rw-r--r--libempathy/empathy-log-store-empathy.h5
-rw-r--r--libempathy/empathy-tp-chat.c10
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/br.po3021
-rw-r--r--po/de.po486
-rw-r--r--po/en_GB.po506
-rw-r--r--po/es.po426
-rw-r--r--po/eu.po2071
-rw-r--r--po/fr.po749
-rw-r--r--po/gl.po648
-rw-r--r--po/it.po4
-rw-r--r--po/lv.po2240
-rw-r--r--po/pa.po1107
-rw-r--r--po/pl.po438
-rw-r--r--po/ro.po567
-rw-r--r--po/ru.po2431
-rw-r--r--po/sl.po454
-rw-r--r--po/sr.po2271
-rw-r--r--po/sr@latin.po2271
-rw-r--r--po/uk.po2280
-rw-r--r--po/zh_HK.po500
-rw-r--r--po/zh_TW.po500
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am8
-rw-r--r--src/cc-empathy-accounts-page.c35
-rw-r--r--src/cc-empathy-accounts-page.h1
-rw-r--r--src/cc-empathy-accounts-panel.c26
-rw-r--r--src/empathy-account-assistant.c5
-rw-r--r--src/empathy-accounts-dialog.c2
-rw-r--r--src/empathy-accounts.c2
-rw-r--r--src/empathy-call-window.c13
-rw-r--r--src/empathy-chat-window.c6
-rw-r--r--src/empathy-debugger.c50
-rw-r--r--src/empathy-invite-participant-dialog.c7
-rw-r--r--src/empathy-invite-participant-dialog.h3
-rw-r--r--src/empathy-main-window.c53
-rw-r--r--src/empathy-map-view.c4
-rw-r--r--src/empathy-migrate-butterfly-logs.c213
-rw-r--r--src/empathy-migrate-butterfly-logs.h32
-rw-r--r--src/empathy-status-icon.c2
100 files changed, 18164 insertions, 10912 deletions
diff --git a/COPYING-DOCS b/COPYING-DOCS
new file mode 100644
index 000000000..2f7e03ca5
--- /dev/null
+++ b/COPYING-DOCS
@@ -0,0 +1,451 @@
+
+ GNU Free Documentation License
+ Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The "Document", below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as "you". You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification. Examples of
+transparent image formats include PNG, XCF and JPG. Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications". You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns. See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation. If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works. A
+public wiki that anybody can edit is an example of such a server. A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/COPYING.LGPL b/COPYING.LGPL
new file mode 100644
index 000000000..602bfc946
--- /dev/null
+++ b/COPYING.LGPL
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/COPYING.SHARE-ALIKE b/COPYING.SHARE-ALIKE
new file mode 100644
index 000000000..23fba3041
--- /dev/null
+++ b/COPYING.SHARE-ALIKE
@@ -0,0 +1,61 @@
+Attribution-ShareAlike 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+"Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+to Distribute and Publicly Perform Adaptations.
+For the avoidance of doubt:
+
+Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+8. Miscellaneous
+
+Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/Makefile.am b/Makefile.am
index 798df830f..bd8dd6828 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,11 +11,15 @@ DISTCHECK_CONFIGURE_FLAGS = \
--disable-schemas-install
EXTRA_DIST = \
- ChangeLog \
- ChangeLog.old \
- README \
- CONTRIBUTORS \
- autogen.sh
+ CONTRIBUTORS \
+ COPYING-DOCS \
+ COPYING.LGPL \
+ COPYING.SHARE-ALIKE \
+ ChangeLog \
+ ChangeLog.old \
+ README \
+ autogen.sh \
+ $(NULL)
DISTCLEANFILES = \
ChangeLog
diff --git a/NEWS b/NEWS
index 251941d7e..52d1814e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+NEW in 2.29.92
+==============
+
+This release disables clickable links in status messages as they trigger a
+nasty issue in GTK+.
+
+Bugs fixed:
+ - Fixed #330394, im-* icons broken (Guillaume Desmottes)
+ - Fixed #607626, buddy info tooltip should be prevented from showing if a popup menu is shown in the contact list (Mike Ruprecht)
+
+Translations:
+ - Updated de Translation (Christian Kirbach)
+ - Updated en_GB Translation (Philip Withnall)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated fr Translation (Claude Paroz)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated lv Translation (Anita Reitere)
+ - Updated pa Translation (A S Alam)
+ - Updated pt_BR Translation (Jonh Wendell)
+ - Updated ro Translation (Adi Roiban)
+ - Updated sr@latin Translation (Branko Kokanović)
+ - Updated sr Translation (Branko Kokanović)
+ - Updated zh_HK Translation (Chao-Hsiung Liao)
+ - Updated zh_TW Translation (Chao-Hsiung Liao)
+
+Documentation translations:
+ - Updated de Documentation translation (Mario Blättermann)
+
NEW in 2.29.91.2
================
diff --git a/configure.ac b/configure.ac
index e32b4ca54..952ff13cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [29])
-m4_define([empathy_micro_version], [91])
-m4_define([empathy_nano_version], [2])
+m4_define([empathy_micro_version], [92])
+m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],
@@ -442,6 +442,7 @@ if test "x$enable_meego" != "xno"; then
if test "x$have_meego" = "xyes"; then
AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
+ chain_enable_favourite_contacts="yes"
fi
else
have_meego="no"
@@ -456,6 +457,34 @@ AC_SUBST(MEEGO_CFLAGS)
AC_SUBST(MEEGO_LIBS)
# -----------------------------------------------------------
+# favourite contacts support
+# -----------------------------------------------------------
+AC_ARG_ENABLE(favourite_contacts,
+ AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@],
+ [Enable favourite contacts]), ,
+ enable_favourite_contacts=no)
+
+if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then
+ PKG_CHECK_MODULES(TELEPATHY_LOGGER,
+ [
+ telepathy-logger
+ ], have_telepathy_logger="yes", have_telepathy_logger="no")
+
+ if test "x$have_telepathy_logger" = "xyes"; then
+ have_favourite_contacts="yes"
+ AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support])
+ fi
+else
+ have_favourite_contacts="no"
+fi
+
+if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
+
+# -----------------------------------------------------------
# nautilus-sendto
# -----------------------------------------------------------
AC_ARG_ENABLE(nautilus-sendto,
@@ -551,6 +580,7 @@ Configure summary:
Location awareness (Geoclue): ${have_geoclue}
Adium themes (Webkit).......: ${have_webkit}
Meego widgets ..............: ${have_meego}
+ Favourite contacts .........: ${have_favourite_contacts}
Control center embedding....: ${have_control_center_embedding}
Logging:
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 0a6b4f118..e151fb5f0 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -6,7 +6,7 @@
<applyto>/apps/empathy/ui/show_offline</applyto>
<owner>empathy</owner>
<type>bool</type>
- <default>false</default>
+ <default>true</default>
<locale name="C">
<short>Show offline contacts</short>
<long>
@@ -20,7 +20,7 @@
<applyto>/apps/empathy/contacts/sort_criterium</applyto>
<owner>empathy</owner>
<type>string</type>
- <default>name</default>
+ <default>state</default>
<locale name="C">
<short>Contact list sort criterion</short>
<long>
@@ -536,6 +536,20 @@
</schema>
<schema>
+ <key>/schemas/apps/empathy/butterfly_logs_migrated</key>
+ <applyto>/apps/empathy/butterfly_logs_migrated</applyto>
+ <owner>empathy</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Empathy has migrated butterfly logs</short>
+ <long>
+ Whether Empathy has migrated butterfly logs.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/empathy/file_transfer/default_folder</key>
<applyto>/apps/empathy/file_transfer_default_folder</applyto>
<owner>empathy</owner>
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 13c166576..a579544dc 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -23,10 +23,12 @@ private_icons = \
hicolor_actions_24x24_im-message-new.png \
hicolor_status_16x16_im-message.png \
hicolor_status_16x16_user-typing.png \
+ hicolor_apps_16x16_im-aim.png \
hicolor_apps_16x16_im-ekiga.png \
hicolor_apps_16x16_im-facebook.png \
hicolor_apps_16x16_im-gizmo.png \
hicolor_apps_16x16_im-google-talk.png \
+ hicolor_apps_16x16_im-icq.png \
hicolor_apps_16x16_im-irc.png \
hicolor_apps_16x16_im-xmpp.png \
hicolor_apps_16x16_im-msn.png \
@@ -40,11 +42,14 @@ private_icons = \
hicolor_apps_16x16_im-mxit.png \
hicolor_apps_16x16_im-myspace.png \
hicolor_apps_16x16_im-sametime.png \
+ hicolor_apps_16x16_im-yahoo.png \
hicolor_apps_16x16_im-zephyr.png \
+ hicolor_apps_22x22_im-aim.png \
hicolor_apps_22x22_im-ekiga.png \
hicolor_apps_22x22_im-facebook.png \
hicolor_apps_22x22_im-gizmo.png \
hicolor_apps_22x22_im-google-talk.png \
+ hicolor_apps_22x22_im-icq.png \
hicolor_apps_22x22_im-irc.png \
hicolor_apps_22x22_im-xmpp.png \
hicolor_apps_22x22_im-msn.png \
@@ -58,10 +63,13 @@ private_icons = \
hicolor_apps_22x22_im-mxit.png \
hicolor_apps_22x22_im-myspace.png \
hicolor_apps_22x22_im-sametime.png \
+ hicolor_apps_22x22_im-yahoo.png \
hicolor_apps_22x22_im-zephyr.png \
+ hicolor_apps_24x24_im-aim.png \
hicolor_apps_24x24_im-ekiga.png \
hicolor_apps_24x24_im-gizmo.png \
hicolor_apps_24x24_im-google-talk.png \
+ hicolor_apps_24x24_im-icq.png \
hicolor_apps_24x24_im-irc.png \
hicolor_apps_24x24_im-xmpp.png \
hicolor_apps_24x24_im-msn.png \
@@ -75,10 +83,13 @@ private_icons = \
hicolor_apps_24x24_im-mxit.png \
hicolor_apps_24x24_im-myspace.png \
hicolor_apps_24x24_im-sametime.png \
+ hicolor_apps_24x24_im-yahoo.png \
hicolor_apps_24x24_im-zephyr.png \
+ hicolor_apps_32x32_im-aim.png \
hicolor_apps_32x32_im-ekiga.png \
hicolor_apps_32x32_im-gizmo.png \
hicolor_apps_32x32_im-google-talk.png \
+ hicolor_apps_32x32_im-icq.png \
hicolor_apps_32x32_im-irc.png \
hicolor_apps_32x32_im-xmpp.png \
hicolor_apps_32x32_im-msn.png \
@@ -92,11 +103,14 @@ private_icons = \
hicolor_apps_32x32_im-mxit.png \
hicolor_apps_32x32_im-myspace.png \
hicolor_apps_32x32_im-sametime.png \
+ hicolor_apps_32x32_im-yahoo.png \
hicolor_apps_32x32_im-zephyr.png \
+ hicolor_apps_48x48_im-aim.png \
hicolor_apps_48x48_im-ekiga.png \
hicolor_apps_48x48_im-facebook.png \
hicolor_apps_48x48_im-gizmo.png \
hicolor_apps_48x48_im-google-talk.png \
+ hicolor_apps_48x48_im-icq.png \
hicolor_apps_48x48_im-irc.png \
hicolor_apps_48x48_im-xmpp.png \
hicolor_apps_48x48_im-msn.png \
@@ -110,10 +124,13 @@ private_icons = \
hicolor_apps_48x48_im-mxit.png \
hicolor_apps_48x48_im-myspace.png \
hicolor_apps_48x48_im-sametime.png \
+ hicolor_apps_48x48_im-yahoo.png \
hicolor_apps_48x48_im-zephyr.png \
+ hicolor_apps_scalable_im-aim.svg \
hicolor_apps_scalable_im-ekiga.svg \
hicolor_apps_scalable_im-gizmo.svg \
hicolor_apps_scalable_im-google-talk.svg \
+ hicolor_apps_scalable_im-icq.svg \
hicolor_apps_scalable_im-irc.svg \
hicolor_apps_scalable_im-xmpp.svg \
hicolor_apps_scalable_im-msn.svg \
@@ -127,6 +144,7 @@ private_icons = \
hicolor_apps_scalable_im-mxit.svg \
hicolor_apps_scalable_im-myspace.svg \
hicolor_apps_scalable_im-sametime.svg \
+ hicolor_apps_scalable_im-yahoo.svg \
hicolor_apps_scalable_im-zephyr.svg \
hicolor_status_16x16_empathy-available.png \
hicolor_status_16x16_empathy-away.png \
diff --git a/data/icons/hicolor_apps_16x16_im-aim.png b/data/icons/hicolor_apps_16x16_im-aim.png
new file mode 100644
index 000000000..cf66dcd63
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_im-aim.png
Binary files differ
diff --git a/data/icons/hicolor_apps_16x16_im-icq.png b/data/icons/hicolor_apps_16x16_im-icq.png
new file mode 100644
index 000000000..316fdd457
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_im-icq.png
Binary files differ
diff --git a/data/icons/hicolor_apps_16x16_im-yahoo.png b/data/icons/hicolor_apps_16x16_im-yahoo.png
new file mode 100644
index 000000000..c5e44f056
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_im-yahoo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_22x22_im-aim.png b/data/icons/hicolor_apps_22x22_im-aim.png
new file mode 100644
index 000000000..54df62d9a
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_im-aim.png
Binary files differ
diff --git a/data/icons/hicolor_apps_22x22_im-icq.png b/data/icons/hicolor_apps_22x22_im-icq.png
new file mode 100644
index 000000000..f62a5876d
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_im-icq.png
Binary files differ
diff --git a/data/icons/hicolor_apps_22x22_im-yahoo.png b/data/icons/hicolor_apps_22x22_im-yahoo.png
new file mode 100644
index 000000000..b205ab2c3
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_im-yahoo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-aim.png b/data/icons/hicolor_apps_24x24_im-aim.png
new file mode 100644
index 000000000..d49e32cdd
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-aim.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-icq.png b/data/icons/hicolor_apps_24x24_im-icq.png
new file mode 100644
index 000000000..a8878947d
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-icq.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-yahoo.png b/data/icons/hicolor_apps_24x24_im-yahoo.png
new file mode 100644
index 000000000..81c647849
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-yahoo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_32x32_im-aim.png b/data/icons/hicolor_apps_32x32_im-aim.png
new file mode 100644
index 000000000..c05501f5d
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_im-aim.png
Binary files differ
diff --git a/data/icons/hicolor_apps_32x32_im-icq.png b/data/icons/hicolor_apps_32x32_im-icq.png
new file mode 100644
index 000000000..6227a1eda
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_im-icq.png
Binary files differ
diff --git a/data/icons/hicolor_apps_32x32_im-yahoo.png b/data/icons/hicolor_apps_32x32_im-yahoo.png
new file mode 100644
index 000000000..45c95caf1
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_im-yahoo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_48x48_im-aim.png b/data/icons/hicolor_apps_48x48_im-aim.png
new file mode 100644
index 000000000..b27fab6a7
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_im-aim.png
Binary files differ
diff --git a/data/icons/hicolor_apps_48x48_im-icq.png b/data/icons/hicolor_apps_48x48_im-icq.png
new file mode 100644
index 000000000..f8d8fffff
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_im-icq.png
Binary files differ
diff --git a/data/icons/hicolor_apps_48x48_im-yahoo.png b/data/icons/hicolor_apps_48x48_im-yahoo.png
new file mode 100644
index 000000000..91c3d16e2
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_im-yahoo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_scalable_im-aim.svg b/data/icons/hicolor_apps_scalable_im-aim.svg
new file mode 100644
index 000000000..a7a2cfa20
--- /dev/null
+++ b/data/icons/hicolor_apps_scalable_im-aim.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:export-xdpi="90.000000"
+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+ width="48px"
+ height="48px"
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
+ sodipodi:docname="im-aim.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient3251">
+ <stop
+ style="stop-color:#fff7ac;stop-opacity:1;"
+ offset="0"
+ id="stop3253" />
+ <stop
+ style="stop-color:#edd400;stop-opacity:1;"
+ offset="1"
+ id="stop3255" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3243">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3245" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3247" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3243"
+ id="radialGradient3249"
+ cx="24.04163"
+ cy="39.514717"
+ fx="24.04163"
+ fy="39.514717"
+ r="15.733126"
+ gradientTransform="matrix(1,0,0,0.348315,6.722053e-17,25.75116)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3251"
+ id="radialGradient3257"
+ cx="26.870058"
+ cy="3.2516198"
+ fx="26.870058"
+ fy="3.2516198"
+ r="7.9736066"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.511972,-1.028868e-15,1.028868e-15,1.511972,-13.75671,-1.664737)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3251"
+ id="radialGradient3259"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.52848,-2.079185e-16,2.079185e-16,4.52848,-94.81046,-11.47328)"
+ cx="26.870058"
+ cy="3.2516198"
+ fx="26.870058"
+ fy="3.2516198"
+ r="7.9736066" />
+ </defs>
+ <sodipodi:namedview
+ stroke="#c4a000"
+ fill="#edd400"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.25490196"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="42.616408"
+ inkscape:cy="25.23267"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="924"
+ inkscape:window-height="731"
+ inkscape:window-x="411"
+ inkscape:window-y="312" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:title>IM - AIM</dc:title>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:#000000;fill:url(#radialGradient3257);fill-opacity:1.0;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.09797096;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path2364"
+ sodipodi:cx="26.870058"
+ sodipodi:cy="9.4626808"
+ sodipodi:rx="7.4246211"
+ sodipodi:ry="7.4246211"
+ d="M 34.294679 9.4626808 A 7.4246211 7.4246211 0 1 1 19.445437,9.4626808 A 7.4246211 7.4246211 0 1 1 34.294679 9.4626808 z"
+ transform="matrix(0.910771,0,0,0.910771,2.397591,0.844346)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.27472527;color:#000000;fill:url(#radialGradient3249);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path3241"
+ sodipodi:cx="24.04163"
+ sodipodi:cy="39.514717"
+ sodipodi:rx="15.733126"
+ sodipodi:ry="5.4800777"
+ d="M 39.774755 39.514717 A 15.733126 5.4800777 0 1 1 8.3085041,39.514717 A 15.733126 5.4800777 0 1 1 39.774755 39.514717 z"
+ transform="matrix(1.359551,0,0,1,-9.174517,0.53033)" />
+ <path
+ style="opacity:1;color:#000000;fill:url(#radialGradient3259);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.00000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 20.036427,15.171311 C 23.867954,16.972932 27.124267,20.632287 35.355339,17.594408 L 37.123106,22.455767 C 34.55959,23.869777 30.722477,24.689174 25.809398,24.223534 L 38.714096,37.216622 L 33.932242,41.519922 L 24.005019,31.092699 C 19.989024,38.129447 14.737746,40.886761 10.606602,43.403806 L 7.1354076,37.927408 C 27.421671,27.388564 9.791093,22.209341 20.036427,15.171311 z "
+ id="path3239"
+ sodipodi:nodetypes="cccccccccc" />
+ <path
+ transform="matrix(0.754004,0,0,0.754004,6.609935,2.327784)"
+ d="M 34.294679 9.4626808 A 7.4246211 7.4246211 0 1 1 19.445437,9.4626808 A 7.4246211 7.4246211 0 1 1 34.294679 9.4626808 z"
+ sodipodi:ry="7.4246211"
+ sodipodi:rx="7.4246211"
+ sodipodi:cy="9.4626808"
+ sodipodi:cx="26.870058"
+ id="path3261"
+ style="opacity:0.61538462;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.32625341;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path3281"
+ d="M 20.168321,16.392033 C 23.617623,18.013928 27.580342,21.308233 34.709049,18.885907 L 35.929701,21.871792 C 33.621916,23.144743 27.912016,23.788649 22.957806,22.90071 L 37.201493,37.113148 L 33.990417,40.11216 L 23.803514,29.412636 C 20.375647,35.778662 15.679476,39.479661 10.929197,42.026861 L 8.5855316,38.315528 C 27.098078,28.390518 12.163791,21.571714 20.168321,16.392033 z "
+ style="opacity:0.7032967;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_scalable_im-icq.svg b/data/icons/hicolor_apps_scalable_im-icq.svg
new file mode 100644
index 000000000..22f06ec1b
--- /dev/null
+++ b/data/icons/hicolor_apps_scalable_im-icq.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:export-xdpi="90.000000"
+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+ width="48px"
+ height="48px"
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
+ sodipodi:docname="im-icq.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4876">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4878" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4880" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4876"
+ id="radialGradient4882"
+ cx="24.25"
+ cy="39.5"
+ fx="24.25"
+ fy="39.5"
+ r="19.75"
+ gradientTransform="matrix(1,0,0,0.341772,0,26)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ stroke="#fcaf3e"
+ fill="#edd400"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.25490196"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="33.11761"
+ inkscape:cy="23.847589"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="750"
+ inkscape:window-height="546"
+ inkscape:window-x="533"
+ inkscape:window-y="347" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:title>IM - ICQ</dc:title>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4856"
+ d="M 22.405204,25.633363 L 7.5213078,29.093917 C 4.7544871,29.218216 2.4269788,27.090843 2.3026795,24.324022 C 2.1783801,21.557201 4.3057539,19.229694 7.072574,19.105394 L 22.206817,21.217386 C 23.430043,21.162431 24.459045,22.102955 24.513999,23.326181 C 24.568952,24.549407 23.628431,25.578409 22.405204,25.633363 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 24.466812,20.280122 L 28.686207,5.5933087 C 29.923971,3.1156712 32.915071,2.1175056 35.392708,3.3552698 C 37.870346,4.5930337 38.868511,7.5841333 37.630747,10.06177 L 28.421239,22.255652 C 27.874018,23.351029 26.551637,23.792323 25.456261,23.245101 C 24.360884,22.697879 23.91959,21.375499 24.466812,20.280122 z "
+ id="path4854"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 19.518735,23.347808 L 8.3359268,19.196609 C 6.4804543,18.086915 5.8800625,15.699796 6.9897565,13.844322 C 8.0994508,11.988851 10.486571,11.388459 12.342043,12.498152 L 21.289859,20.386386 C 22.110174,20.876988 22.37561,21.932346 21.885008,22.752659 C 21.394407,23.572974 20.339049,23.838409 19.518735,23.347808 z "
+ id="path4858"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4860"
+ d="M 21.392197,22.256135 L 11.644708,10.487856 C 10.296996,8.0682652 11.159916,5.0353815 13.579508,3.6876687 C 15.999099,2.3399561 19.031983,3.2028765 20.379695,5.6224676 L 25.253979,20.105121 C 25.849811,21.174835 25.468309,22.515689 24.398595,23.111519 C 23.328881,23.70735 21.988027,23.325849 21.392197,22.256135 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 26.160166,21.538521 L 41.184376,18.749437 C 43.953989,18.749437 46.183676,20.979125 46.183676,23.748737 C 46.183676,26.518349 43.953989,28.748037 41.184376,28.748037 L 26.160166,25.958953 C 24.935706,25.958953 23.94995,24.973197 23.94995,23.748737 C 23.94995,22.524277 24.935706,21.538521 26.160166,21.538521 z "
+ id="rect4849"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4852"
+ d="M 27.368096,19.62061 L 36.436303,11.871076 C 38.308641,10.790081 40.686233,11.427155 41.767229,13.299493 C 42.848224,15.171831 42.211149,17.549424 40.338812,18.630419 L 29.093415,22.60895 C 28.265645,23.086863 27.214499,22.80521 26.736586,21.977439 C 26.258672,21.149669 26.540326,20.098523 27.368096,19.62061 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 23.527372,20.093359 L 21.009809,8.4336228 C 20.946895,6.2725496 22.636025,4.4821185 24.7971,4.4192026 C 26.958172,4.3562875 28.748604,6.0454185 28.811519,8.2064914 L 26.976547,19.992944 C 27.004363,20.948366 26.25759,21.739925 25.302167,21.767739 C 24.346745,21.795555 23.555186,21.048781 23.527372,20.093359 z "
+ id="path4862"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.53846154;color:#000000;fill:url(#radialGradient4882);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path4874"
+ sodipodi:cx="24.25"
+ sodipodi:cy="39.5"
+ sodipodi:rx="19.75"
+ sodipodi:ry="6.75"
+ d="M 44 39.5 A 19.75 6.75 0 1 1 4.5,39.5 A 19.75 6.75 0 1 1 44 39.5 z"
+ transform="matrix(1,0,0,1.5,0,-23.125)" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4864"
+ d="M 25.46208,26.080991 L 21.468238,40.830737 C 20.268587,43.327051 17.293134,44.370934 14.79682,43.171282 C 12.300506,41.97163 11.256624,38.996177 12.456275,36.499864 L 21.477846,24.166289 C 22.008218,23.062656 23.323681,22.60115 24.427314,23.131522 C 25.530948,23.661895 25.992454,24.977357 25.46208,26.080991 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 22.082795,27.542459 L 13.134405,35.430041 C 11.278852,36.539601 8.8917762,35.939035 7.7822162,34.083481 C 6.6726576,32.227928 7.2732234,29.840853 9.1287758,28.731293 L 20.311887,24.580908 C 21.132236,24.090365 22.187575,24.355878 22.678116,25.176228 C 23.168658,25.996578 22.903145,27.051916 22.082795,27.542459 z "
+ id="path4868"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 28.506055,24.058095 L 38.432733,35.675624 C 39.817365,38.074278 39.001021,41.120029 36.602365,42.504661 C 34.203711,43.889293 31.15796,43.072949 29.773329,40.674294 L 24.677687,26.268033 C 24.065535,25.207575 24.426444,23.861034 25.486901,23.248881 C 26.547361,22.636727 27.893903,22.997638 28.506055,24.058095 z "
+ id="path4870"
+ sodipodi:nodetypes="ccsccsc" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4872"
+ d="M 26.404273,26.253336 L 29.10021,37.873125 C 29.196234,40.03298 27.534738,41.849085 25.374881,41.945109 C 23.215027,42.041133 21.398921,40.379636 21.302898,38.219781 L 22.957041,26.406594 C 22.914587,25.451709 23.649144,24.648802 24.604028,24.606349 C 25.558912,24.563896 26.361821,25.298453 26.404273,26.253336 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ id="path4866"
+ d="M 29.612568,23.187841 L 40.857676,27.16719 C 42.729935,28.248321 43.366836,30.625959 42.285705,32.49822 C 41.204574,34.370479 38.826935,35.00738 36.954675,33.92625 L 27.887032,26.176057 C 27.059296,25.698083 26.777718,24.646916 27.255693,23.819181 C 27.733666,22.991444 28.784833,22.709868 29.612568,23.187841 z "
+ style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#fcaf3e;stroke-width:1.54177701;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path4838"
+ sodipodi:cx="24.748737"
+ sodipodi:cy="23.251263"
+ sodipodi:rx="8.6620579"
+ sodipodi:ry="8.6620579"
+ d="M 33.410795 23.251263 A 8.6620579 8.6620579 0 1 1 16.086679,23.251263 A 8.6620579 8.6620579 0 1 1 33.410795 23.251263 z"
+ transform="matrix(0.648602,0,0,0.648602,8.82557,8.168736)" />
+ <path
+ transform="matrix(0.529696,0,0,0.529696,11.76835,10.93345)"
+ d="M 33.410795 23.251263 A 8.6620579 8.6620579 0 1 1 16.086679,23.251263 A 8.6620579 8.6620579 0 1 1 33.410795 23.251263 z"
+ sodipodi:ry="8.6620579"
+ sodipodi:rx="8.6620579"
+ sodipodi:cy="23.251263"
+ sodipodi:cx="24.748737"
+ id="path4884"
+ style="opacity:0.36263736;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.88787568;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_scalable_im-yahoo.svg b/data/icons/hicolor_apps_scalable_im-yahoo.svg
new file mode 100644
index 000000000..b09197769
--- /dev/null
+++ b/data/icons/hicolor_apps_scalable_im-yahoo.svg
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48.000000px"
+ height="48.000000px"
+ id="svg4376"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
+ sodipodi:docname="im-yahoo.svg"
+ inkscape:export-filename="/home/tigert/Desktop/face-grin.png"
+ inkscape:export-xdpi="90.000000"
+ inkscape:export-ydpi="90.000000"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient3337">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3339" />
+ <stop
+ id="stop3345"
+ offset="0.5"
+ style="stop-color:#000000;stop-opacity:0.51923078;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="1"
+ id="stop3341" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3290">
+ <stop
+ style="stop-color:#fffcde;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop3292" />
+ <stop
+ id="stop3294"
+ offset="0.64485979"
+ style="stop-color:#f6e76a;stop-opacity:1.0000000;" />
+ <stop
+ style="stop-color:#ffb738;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop3296" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3068">
+ <stop
+ style="stop-color:#cccccc;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop3070" />
+ <stop
+ id="stop3076"
+ offset="0.34579438"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1.0000000;"
+ offset="0.72486681"
+ id="stop3078" />
+ <stop
+ style="stop-color:#cecece;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop3072" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4565">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4567" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4569" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4565"
+ id="radialGradient1360"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,25.71429)"
+ cx="24.714285"
+ cy="38.571430"
+ fx="24.714285"
+ fy="38.571430"
+ r="19.714285" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3290"
+ id="radialGradient1362"
+ gradientUnits="userSpaceOnUse"
+ cx="29.288071"
+ cy="15.720984"
+ fx="29.158466"
+ fy="15.755712"
+ r="8.9020796" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3068"
+ id="linearGradient2132"
+ x1="9.7892637"
+ y1="29.629091"
+ x2="38.390732"
+ y2="29.629091"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.048897,0.000000,0.000000,1.000000,-1.267931,0.000000)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3337"
+ id="linearGradient3343"
+ x1="10.375"
+ y1="30.71875"
+ x2="37.9375"
+ y2="30.71875"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ fill="#a40000"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.19607843"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="65.044949"
+ inkscape:cy="12.529569"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1183"
+ inkscape:window-height="971"
+ inkscape:window-x="123"
+ inkscape:window-y="25"
+ stroke="#8f5902" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>IM - Yahoo</dc:title>
+ <dc:subject>
+ <rdf:Bag />
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title />
+ </cc:Agent>
+ </dc:contributor>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.53164560;color:#000000;fill:url(#radialGradient1360);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.40487173;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ id="path4563"
+ sodipodi:cx="24.714285"
+ sodipodi:cy="38.571430"
+ sodipodi:rx="19.714285"
+ sodipodi:ry="6.5714288"
+ d="M 44.428570 38.571430 A 19.714285 6.5714288 0 1 1 5.0000000,38.571430 A 19.714285 6.5714288 0 1 1 44.428570 38.571430 z" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1362);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#9c8c0a;stroke-width:0.48004404;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ id="path4320"
+ sodipodi:cx="31.112698"
+ sodipodi:cy="19.008621"
+ sodipodi:rx="8.6620579"
+ sodipodi:ry="8.6620579"
+ d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.450640,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z"
+ transform="matrix(2.083142,0.000000,0.000000,2.083142,-40.54715,-16.49224)" />
+ <path
+ d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.450640,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z"
+ sodipodi:ry="8.6620579"
+ sodipodi:rx="8.6620579"
+ sodipodi:cy="19.008621"
+ sodipodi:cx="31.112698"
+ id="path4322"
+ style="opacity:0.67721522;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50510627;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc"
+ transform="matrix(1.979782,0.000000,0.000000,1.979782,-37.33128,-14.52746)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1.0000000;stroke:#555753;stroke-width:1.0000000;stroke-linecap:butt;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ id="path1364"
+ sodipodi:cx="-3.8125000"
+ sodipodi:cy="1.8750000"
+ sodipodi:rx="2.9375000"
+ sodipodi:ry="2.8750000"
+ d="M -0.87500000,1.8750000 A 2.9375000,2.8750000 0 0 1 -6.3564497,3.3124999"
+ sodipodi:start="0.0000000"
+ sodipodi:end="2.6179939"
+ sodipodi:open="true"
+ transform="matrix(-0.965926,-0.258819,0.258819,-0.965926,24.53442,17.20131)" />
+ <path
+ transform="matrix(-0.965926,-0.258819,0.258819,-0.965926,15.78442,17.20131)"
+ sodipodi:open="true"
+ sodipodi:end="2.6179939"
+ sodipodi:start="0.0000000"
+ d="M -0.87500000,1.8750000 A 2.9375000,2.8750000 0 0 1 -6.3564497,3.3124999"
+ sodipodi:ry="2.8750000"
+ sodipodi:rx="2.9375000"
+ sodipodi:cy="1.8750000"
+ sodipodi:cx="-3.8125000"
+ id="path2094"
+ style="fill:none;fill-opacity:1.0000000;stroke:#555753;stroke-width:1.0000000;stroke-linecap:butt;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="czcc"
+ id="path2096"
+ d="M 9.1875355,21.044769 C 7.6485541,28.612147 13.879571,38.212295 24.038687,38.212295 C 34.286185,38.212295 40.544215,29.781871 38.758727,21.107269 L 9.1875355,21.044769 z "
+ style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2132);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#8f5902;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 9.4409398,20.615864 C 7.6602852,29.43779 14.599952,38.703673 24.250001,38.703673 C 34.253546,38.703673 40.902217,29.12529 38.621563,20.553364 L 9.4409398,20.615864 z "
+ id="path2756"
+ sodipodi:nodetypes="czcc" />
+ <path
+ style="opacity:1;color:#000000;fill:url(#linearGradient3343);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 10.375,27.875 C 11.23086,30.08164 12.138535,32.236465 13.8125,33.625 C 20.614421,32.921143 27.552502,32.83001 34.6875,33.625 C 36.241097,32.157764 37.383184,30.279018 37.9375,27.8125 C 28.842417,29.312007 19.63631,29.035121 10.375,27.875 z "
+ id="path2462"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+</svg>
diff --git a/extensions/Logger.xml b/extensions/Logger.xml
new file mode 100644
index 000000000..a3778296d
--- /dev/null
+++ b/extensions/Logger.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" ?>
+<node name="/Logger"
+ xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+ <tp:copyright>Copyright © 2009 Collabora Ltd.</tp:copyright>
+ <tp:license xmlns="http://www.w3.org/1999/xhtml">
+ <p>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.</p>
+
+<p>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.</p>
+
+<p>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 Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+ </tp:license>
+ <interface name="org.freedesktop.Telepathy.Logger.DRAFT"
+ tp:causes-havoc="experimental">
+ <tp:added version="0.1">(as a draft)</tp:added>
+
+ <tp:docstring>
+ An interface for requesting information from the Telepathy Logger
+ service.
+ </tp:docstring>
+
+ <tp:struct name="Chat_Message" array-name="Chat_Message_List">
+ <tp:member type="s" name="Sender">
+ <tp:docstring>
+ The identifier of the contact who originated this message.
+ </tp:docstring>
+ </tp:member>
+
+ <tp:member type="s" name="Message">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ The body of the message sent to a 1-1 Chat or a Chat Room.
+ </tp:docstring>
+ </tp:member>
+
+ <tp:member type="x" name="Timestamp" tp:type="Unix_Timestamp64">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ Unix timestamp for the log entry
+ </tp:docstring>
+ </tp:member>
+
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>It represents a single message, received or sent.</p>
+ <p>The receiver is implicit in the request: if the sender is the user,
+ the receiver is the identifier in chat_id paramenter, if the sender is
+ not the user, the user is consequently the receiver of the message</p>
+ </tp:docstring>
+ </tp:struct>
+
+ <method name="GetRecentMessages"
+ tp:name-for-bindings="Get_Recent_Messages">
+ <arg direction="in" name="Account" type="o" tp:type="Account">
+ <tp:docstring>
+ The account path for the TpAccount to which the conversation is related
+ </tp:docstring>
+ </arg>
+
+ <arg direction="in" name="Identifier" type="s">
+ <tp:docstring>
+ The buddy's identifier for the conversation
+ </tp:docstring>
+ </arg>
+
+ <arg direction="in" name="Is_Chatroom" type="b">
+ <tp:docstring>
+ Whether the conversation is a chatroom (i.e., XMPP MUC) or not
+ </tp:docstring>
+ </arg>
+
+ <arg direction="in" name="Lines" type="u">
+ <tp:docstring>
+ how many entries will be returned.
+
+ NOTE: to retreive information that would generate high traffic, use
+ the library API approach instead of DBus.
+ </tp:docstring>
+ </arg>
+
+ <arg direction="out" name="Messages" type="a(ssx)"
+ tp:type="Chat_Message[]" />
+
+ <tp:docstring>
+ Request the last Lines entries of logs for the specified couple
+ Account+Identifier.
+ </tp:docstring>
+ </method>
+
+ <method name="GetFavouriteContacts"
+ tp:name-for-bindings="Get_Favourite_Contacts">
+ <arg direction="out" name="Favourite_Contacts" type="a(oas)">
+ <tp:docstring>
+ The favourite contacts, as an array of TpAccounts and their contact
+ identifiers.
+ </tp:docstring>
+ </arg>
+
+ <tp:docstring>
+ Returns the favourite contacts.
+ </tp:docstring>
+ </method>
+
+ <method name="AddFavouriteContact"
+ tp:name-for-bindings="Add_Favourite_Contact">
+ <arg direction="in" name="Account" type="o" tp:type="Account">
+ <tp:docstring>
+ The object path for the TpAccount to which the contact belongs
+ </tp:docstring>
+ </arg>
+
+ <arg direction="in" name="Identifier" type="s">
+ <tp:docstring>
+ The favourite contact's identifier
+ </tp:docstring>
+ </arg>
+
+ <tp:docstring>
+ Add a contact's designation as a favourite. This method may not be
+ called until the service is ready. See the <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
+ </tp:docstring>
+ </method>
+
+ <method name="RemoveFavouriteContact"
+ tp:name-for-bindings="Remove_Favourite_Contact">
+ <arg direction="in" name="Account" type="o" tp:type="Account">
+ <tp:docstring>
+ The object path for the TpAccount to which the contact belongs
+ </tp:docstring>
+ </arg>
+
+ <arg direction="in" name="Identifier" type="s">
+ <tp:docstring>
+ The favourite contact's identifier
+ </tp:docstring>
+ </arg>
+
+ <tp:docstring>
+ Remove a contact's designation as a favourite. This method may not be
+ called until the service is ready. See the <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
+ </tp:docstring>
+ </method>
+
+ <signal name="FavouriteContactsChanged"
+ tp:name-for-bindings="Favourite_Contacts_Changed">
+ <tp:docstring>
+ The set of favourite contacts has changed.
+ </tp:docstring>
+
+ <arg name="Account" type="o" tp:type="Account">
+ <tp:docstring>
+ An account associated with the contact.
+ </tp:docstring>
+ </arg>
+
+ <arg name="Added" type="as">
+ <tp:docstring>
+ List of contact identifiers of contacts which are now favourites.
+ </tp:docstring>
+ </arg>
+
+ <arg name="Removed" type="as">
+ <tp:docstring>
+ List of contact identifiers of contacts which are no longer favourites.
+ </tp:docstring>
+ </arg>
+ </signal>
+
+ </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index fc77796e4..8ea05ae6b 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,7 +13,9 @@ EXTRA_DIST = \
generic-types.xml \
misc.xml \
Debug.xml \
- Channel_Interface_Conference.xml
+ Channel_Interface_Conference.xml \
+ Logger.xml \
+ $(NULL)
noinst_LTLIBRARIES = libemp-extensions.la
@@ -114,7 +116,7 @@ _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \
--subclass=TpProxy \
--subclass-assert=TP_IS_PROXY \
--iface-quark-prefix=EMP_IFACE_QUARK \
- --tp-proxy-api=0.7.6 \
+ --tp-proxy-api=0.10.0 \
$< Emp_Cli _gen/cli-misc
_gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml \
diff --git a/extensions/all.xml b/extensions/all.xml
index 1def2fbde..d0b9173c0 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -14,6 +14,8 @@
from="Telepathy specification"/>
<tp:external-type name="Handle" type="u"
from="Telepathy specification"/>
+ <tp:external-type name="Account" type="o"
+ from="Telepathy specification"/>
</tp:generic-types>
diff --git a/extensions/generic-types.xml b/extensions/generic-types.xml
index fe27d36c9..fdab14be8 100644
--- a/extensions/generic-types.xml
+++ b/extensions/generic-types.xml
@@ -7,10 +7,10 @@
(1970-01-01T00:00:00Z)</tp:docstring>
</tp:simple-type>
- <tp:simple-type name="Unix_Timestamp64" type="t">
- <tp:docstring>An unsigned 64-bit integer representing time as the number
+ <tp:simple-type name="Unix_Timestamp64" type="x">
+ <tp:docstring>An signed 64-bit integer representing time as the number
of seconds elapsed since the Unix epoch
- (1970-01-01T00:00:00Z)</tp:docstring>
+ (1970-01-01T00:00:00Z); negative for times before the epoch</tp:docstring>
<tp:rationale>The Text interface is the only user of Unix_Timestamp so
far, and we'd like to be Y2038 compatible in future
diff --git a/extensions/misc.xml b/extensions/misc.xml
index f866663c0..6fe06d8ab 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -6,5 +6,6 @@
<xi:include href="Debug.xml" />
<xi:include href="Channel_Interface_Conference.xml" />
+<xi:include href="Logger.xml" />
</tp:spec>
diff --git a/help/C/hide-contacts.page b/help/C/hide-contacts.page
new file mode 100644
index 000000000..f0609a62d
--- /dev/null
+++ b/help/C/hide-contacts.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:e="http://projectmallard.org/experimental/"
+ type="topic" style="task"
+ id="hide-contacts">
+
+ <info>
+ <link type="guide" xref="index#contacts"/>
+ <desc>Hide the offline contacts from your <gui>Contact List</gui>.</desc>
+ <revision pkgversion="2.30" version="0.1" date="2010-03-11" status="review"/>
+ <credit type="author">
+ <name>Milo Casagrande</name>
+ <email>milo@ubuntu.com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+ <title>Hide offline contacts</title>
+
+ <p>
+ 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.
+ </p>
+ <p>
+ To hide the contacts that are offline:
+ </p>
+
+ <steps>
+ <item>
+ <p>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>.</p>
+ </item>
+ <item>
+ <p>
+ To show the offline contacts again, repeat the same procedure above.
+ </p>
+ </item>
+ </steps>
+
+</page>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index befbaf05a..b8fd52afb 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -6,12 +6,13 @@
<info>
<link type="guide" xref="irc-manage#manage"/>
<link type="seealso" xref="irc-join-room"/>
- <desc><app>Empathy</app> does not currently support password-protected IRC chat rooms.</desc>
+ <desc>Enter password-protected IRC chat rooms.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review">
<!--
<e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
-->
</revision>
+ <revision pkgversion="2.30" version="0.2" date="2010-03-12" status="review"/>
<credit type="author">
<name>Milo Casagrande</name>
<email>milo@ubuntu.com</email>
@@ -19,17 +20,28 @@
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
-<!--
- <copyright>
- <year>2009</year>
- <name>GNOME Documentation Project</name>
- </copyright>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
</info>
<title>Join a protected IRC chat room</title>
- <p>It is not currently possible to join a password-protected IRC chat room.</p>
+ <p>
+ On some IRC networks, private IRC rooms may be protected with a password.
+ </p>
+ <p>
+ To join such a room, if you know the password:
+ </p>
+ <steps>
+ <item>
+ <p>
+ <link xref="irc-join-room">Join the room</link>.
+ </p>
+ </item>
+ <item>
+ <p>
+ In the <gui>This room is protected by a password</gui> text box, type the
+ IRC room password, and click on <gui style="button">Join</gui>.
+ </p>
+ </item>
+ </steps>
</page>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
deleted file mode 100644
index 33e1de215..000000000
--- a/help/C/offline-contacts.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
- xmlns:e="http://projectmallard.org/experimental/"
- type="topic" style="task"
- id="offline-contacts">
-
- <info>
- <link type="guide" xref="index#contacts"/>
- <desc>See all of your contacts, even those that are not online.</desc>
- <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
- <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review">
- <!--
- <e:review by="shaunm@gnome.org" date="2009-09-01" status="done"/>
- -->
- </revision>
- <revision pkgversion="2.28" version="0.3" date="2009-09-05" status="review"/>
- <credit type="author">
- <name>Milo Casagrande</name>
- <email>milo@ubuntu.com</email>
- </credit>
- <license>
- <p>Creative Commons Share Alike 3.0</p>
- </license>
-<!--
- <copyright>
- <year>2009</year>
- <name>GNOME Documentation Project</name>
- </copyright>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
- </info>
-
- <title>Show offline contacts</title>
-
- <p>Normally, <app>Empathy</app> only shows your contacts that are currently
- online. You can show all of your contacts instead, including those that
- are offline.</p>
-
- <steps>
- <item>
- <p>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>.</p>
- </item>
- <item>
- <p>
- To hide the offline contacts again, repeat the same procedure above.
- </p>
- </item>
- </steps>
-
-</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 76303c65f..feb0c210e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -33,6 +33,7 @@ DOC_PAGES = \
geolocation-turn.page \
geolocation-what-is.page \
group-conversations.page \
+ hide-contacts.page \
import-account.page \
index.page \
introduction.page \
@@ -44,7 +45,6 @@ DOC_PAGES = \
irc-send-file.page \
irc-start-conversation.page \
license.page \
- offline-contacts.page \
prev-conv.page \
prob-conn-acctdisabled.page \
prob-conn-auth.page \
diff --git a/help/de/de.po b/help/de/de.po
index e69db3e4c..45edb108a 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-18 10:10+0000\n"
-"PO-Revision-Date: 2009-10-17 20:41+0200\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-12 23:01+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,30 +21,10 @@ msgstr ""
"X-Poedit-Language: German\n"
"X-Poedit-Country: GERMANY\n"
-#: C/legal.xml:3(p)
-msgid ""
-"This work is licensed under a <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
-"License</link>."
-msgstr ""
-"Dieses Werk wird unter einer <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
-"License</link> veröffentlicht."
-
-#: C/legal.xml:6(p)
-msgid ""
-"As a special exception, the copyright holders give you permission to copy, "
-"modify, and distribute the example code contained in this document under the "
-"terms of your choosing, without restriction."
-msgstr ""
-"Als besondere Ausnahme geben Ihnen die Urheberrechtsinhaber die Genehmigung, "
-"den in diesem Dokument enthaltenen Beispielcode ohne Einschränkung unter den "
-"Bedingungen Ihrer Wahl zu verbreiten."
-
#. 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:41(None) C/video-call.page:57(None)
-#: C/audio-video.page:66(None) C/audio-call.page:59(None)
+#: C/video-call.page:45(None) C/video-call.page:61(None)
+#: C/audio-video.page:70(None) C/audio-call.page:63(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "a"
@@ -52,53 +32,76 @@ msgstr "a"
msgid "Start a video conversation with one of your contacts."
msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
-#: C/video-call.page:20(name) C/status-icons.page:16(name)
+#: 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:17(name) C/prob-conn-neterror.page:17(name)
-#: C/prob-conn-name.page:16(name) C/prob-conn-auth.page:20(name)
+#: C/remove-account.page:17(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/offline-contacts.page:17(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:17(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:16(name) C/introduction.page:13(name)
-#: C/index.page:15(name) C/import-account.page:23(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:13(name)
-#: C/disable-account.page:19(name) C/create-account.page:17(name)
-#: C/audio-video.page:16(name) C/audio-call.page:17(name)
-#: C/add-account.page:18(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:18(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:17(name) C/audio-video.page:17(name)
+#: C/audio-call.page:18(name) C/add-account.page:19(name)
msgid "Milo Casagrande"
msgstr "Milo Casagrande"
-#: C/video-call.page:21(email) C/status-icons.page:17(email)
+#: 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:18(email) C/prob-conn-neterror.page:18(email)
-#: C/prob-conn-name.page:17(email) C/prob-conn-auth.page:21(email)
+#: C/remove-account.page:18(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/offline-contacts.page:18(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:18(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:17(email) C/introduction.page:14(email)
-#: C/index.page:16(email) C/import-account.page:24(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/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
+#: C/irc-nick-password.page:19(email) C/irc-manage.page:19(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/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:14(email) C/disable-account.page:20(email)
-#: C/create-account.page:18(email) C/audio-video.page:17(email)
-#: C/audio-call.page:18(email) C/add-account.page:19(email)
+#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
+#: C/create-account.page:18(email) C/audio-video.page:18(email)
+#: C/audio-call.page:19(email) C/add-account.page:20(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
-#: C/video-call.page:31(title)
+#: 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/salut-protocol.page:22(p)
+#: C/remove-account.page:21(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:22(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:21(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:27(p)
+#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
+#: C/account-irc.page:18(p)
+msgid "Creative Commons Share Alike 3.0"
+msgstr "Creative Commons Share Alike 3.0"
+
+#: C/video-call.page:35(title)
msgid "Start a video conversation"
msgstr "Eine Video-Unterhaltung beginnen"
-#: C/video-call.page:33(p)
+#: C/video-call.page:37(p)
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 "
@@ -110,71 +113,72 @@ msgstr ""
"Kontentypen zur Verfügung. Außerdem muss die andere Person mit einer "
"Anwendung arbeiten, die Videoanrufe unterstützt."
-#: C/video-call.page:40(p)
+#: C/video-call.page:44(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. Alternatively, right click "
-"the contact and choose <gui>Video Call</gui>."
+"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>."
msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
-"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen. Alternativ "
-"klicken Sie mit der rechten Maustaste auf den Kontakt und wählen Sie "
-"<gui>Videoanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
+"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
+"style=\"menuitem\">Videoanruf</gui>. Alternativ klicken Sie mit der rechten "
+"Maustaste auf den Kontakt und wählen Sie <gui>Videoanruf</gui>."
-#: C/video-call.page:46(p) C/audio-call.page:48(p)
+#: C/video-call.page:50(p) C/audio-call.page:52(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 ""
-"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, "
-"sehen Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die "
-"Gesamtzeit der Unterhaltung."
+"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, sehen "
+"Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die Gesamtzeit der "
+"Unterhaltung."
-#: C/video-call.page:51(p) C/audio-call.page:53(p)
+#: C/video-call.page:55(p) C/audio-call.page:57(p)
msgid ""
-"To end the conversation, choose <guiseq><gui>Call</gui><gui>Hang up</gui></"
-"guiseq>."
+"To end the conversation, choose <guiseq><gui style=\"menu\">Call</gui><gui "
+"style=\"menuitem\">Hang up</gui></guiseq>."
msgstr ""
-"Um eine Unterhaltung zu beenden, wählen Sie <guiseq><gui>Anruf</"
-"gui><gui>Auflegen</gui></guiseq>."
+"Um eine Unterhaltung zu beenden, wählen Sie <guiseq><gui style=\"menu"
+"\">Anruf</gui><gui style=\"menuitem\">Auflegen</gui></guiseq>."
-#: C/video-call.page:55(p)
+#: C/video-call.page:59(p)
msgid ""
-"To turn a video conversation into an adio conversation, choose "
-"<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the <media "
-"type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</"
-"media> toolbar button to deselect it."
+"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 ""
-"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui>Anruf</gui><gui>Video senden</gui></guiseq>, oder klicken "
-"Sie auf den <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">Videoanruf</media>-Knopf in der Werkzeugleiste, um dies zu "
-"deaktivieren."
+"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video aus</"
+"gui></guiseq> oder klicken Sie auf den Werkzeugleistenknopf <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</"
+"media>, um ihn zu deaktivieren."
#. 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:36(None)
+#: C/status-icons.page:39(None)
msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
msgstr "a"
#. 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:42(None)
+#: C/status-icons.page:45(None)
msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
msgstr "a"
#. 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:50(None)
+#: C/status-icons.page:53(None)
msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
msgstr "a"
#. 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:59(None) C/status-icons.page:66(None)
+#: C/status-icons.page:62(None) C/status-icons.page:69(None)
msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
msgstr "a"
@@ -182,36 +186,35 @@ msgstr "a"
msgid "Understanding the various statuses and status icons."
msgstr "Erläuterung der verschiedenen Status und deren Symbole."
-#: C/status-icons.page:20(name) C/salut-protocol.page:33(cite)
-#: C/prev-conv.page:20(name) C/prev-conv.page:35(cite)
-#: C/import-account.page:27(name) C/disable-account.page:23(name)
-#: C/audio-video.page:105(cite) C/audio-video.page:113(cite)
-#: C/audio-call.page:36(cite) C/add-account.page:22(name)
-#: C/accounts-window.page:18(name) C/account-jabber.page:13(name)
-#: C/account-irc.page:13(name)
+#: 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:23(name) C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name) C/account-irc.page:14(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:24(email)
-#: C/add-account.page:23(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:14(email) C/account-irc.page:14(email)
+#: C/import-account.page:28(email) C/disable-account.page:25(email)
+#: C/add-account.page:24(email) C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email) C/account-irc.page:15(email)
msgid "shaunm@gnome.org"
msgstr "shaunm@gnome.org"
-#: C/status-icons.page:32(title)
+#: C/status-icons.page:35(title)
msgid "Status Types and Icons"
msgstr "Typen des Anwesenheitsstatus und Symbole"
-#: C/status-icons.page:36(media)
+#: C/status-icons.page:39(media)
msgid "Available icon"
msgstr "Symbol »Verfügbar«"
-#: C/status-icons.page:37(gui)
+#: C/status-icons.page:40(gui)
msgid "Available"
msgstr "Verfügbar"
-#: C/status-icons.page:38(p)
+#: 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."
@@ -220,38 +223,38 @@ msgstr ""
"befinden und somit Unterhaltungen mit Ihren Kontakten führen können. Sie "
"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
-#: C/status-icons.page:42(media)
+#: C/status-icons.page:45(media)
msgid "Busy icon"
msgstr "Symbol »Beschäftigt«"
-#: C/status-icons.page:43(gui)
+#: C/status-icons.page:46(gui)
msgid "Busy"
msgstr "Beschäftigt"
-#: C/status-icons.page:44(p)
+#: 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 "
+"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 ""
-"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte "
-"darüber informieren wollen, dass Sie gerade keine Unterhaltung wünschen. "
-"Diese können Sie trotzdem noch kontaktieren, beispielsweise in dringenden "
-"Fällen. Per Vorgabe zeigt <app>Empathy</app> keine einblendenden "
-"Benachrichtigungen an oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie "
-"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
+"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte darüber "
+"informieren wollen, dass Sie gerade keine Unterhaltung wünschen. Diese können "
+"Sie trotzdem noch kontaktieren, beispielsweise in dringenden Fällen. Per "
+"Vorgabe zeigt <app>Empathy</app> keine einblendenden Benachrichtigungen an "
+"oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie können für diesen "
+"Status eine benutzerdefinierte Nachricht festlegen."
-#: C/status-icons.page:50(media)
+#: C/status-icons.page:53(media)
msgid "Away icon"
msgstr "Symbol »Abwesend«"
-#: C/status-icons.page:51(gui)
+#: C/status-icons.page:54(gui)
msgid "Away"
msgstr "Abwesend"
-#: C/status-icons.page:52(p)
+#: 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 "
@@ -264,32 +267,32 @@ msgstr ""
"abwesend, wenn Sie Ihren Rechner für einen gewissen Zeitraum nicht bedienen "
"oder wenn der Bildschirmschoner eingeschaltet ist. <app>Empathy</app> zeigt "
"keine einblendenden Benachrichtigungen an oder spielt Klänge ab, wenn Sie "
-"abwesend sind. Sie können für diesen Status eine benutzerdefinierte "
-"Nachricht festlegen."
+"abwesend sind. Sie können für diesen Status eine benutzerdefinierte Nachricht "
+"festlegen."
-#: C/status-icons.page:59(media) C/status-icons.page:66(media)
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
msgid "Offline icon"
msgstr "Symbol »Abgemeldet«"
-#: C/status-icons.page:60(gui)
-msgid "Hidden"
-msgstr "Verborgen"
+#: C/status-icons.page:63(gui)
+msgid "Invisible"
+msgstr "Unsichtbar"
-#: C/status-icons.page:61(p)
+#: C/status-icons.page:64(p)
msgid ""
-"When you set your status to <em>Hidden</em>, you will appear as offline to "
+"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 ""
-"Wenn Sie Ihren Status auf <em>Verborgen</em> setzen, erscheinen Sie für Ihre "
+"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für Ihre "
"Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten verbunden. "
"Sie sehen deren Status und können Unterhaltungen mit Ihnen beginnen."
-#: C/status-icons.page:67(gui)
+#: C/status-icons.page:70(gui)
msgid "Offline"
msgstr "Abgemeldet"
-#: C/status-icons.page:68(p)
+#: C/status-icons.page:71(p)
msgid ""
"Setting your status to <em>Offline</em> disconnects you from all of your "
"accounts."
@@ -301,11 +304,11 @@ msgstr ""
msgid "Share the desktop with your contacts."
msgstr "Freigeben der Arbeitsumgebung für Ihre Kontakte."
-#: C/share-desktop.page:25(title)
+#: C/share-desktop.page:28(title)
msgid "Share your desktop"
msgstr "Freigabe Ihrer Arbeitsumgebung"
-#: C/share-desktop.page:27(p)
+#: 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 "
@@ -317,7 +320,7 @@ msgstr ""
"Weise Ihre Arbeitsumgebung Ihren Kontakten zeigen, um ihnen bei der Lösung "
"von Problemen zu helfen oder selbst um Hilfe zu bitten."
-#: C/share-desktop.page:35(p)
+#: 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 "
@@ -327,38 +330,37 @@ msgstr ""
"entfernten Kontakte zu benutzen, ist eine auf Ihrem System installierte "
"Anwendung zum Betrachten entfernter Arbeitsumgebungen notwendig."
-#: C/share-desktop.page:43(p) C/send-message.page:32(p) C/send-file.page:37(p)
-#: C/favorite-rooms.page:62(p)
+#: C/share-desktop.page:46(p) C/send-message.page:35(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 ""
"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
"aus:"
-#: C/share-desktop.page:48(p)
+#: 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>."
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>."
msgstr ""
"Wählen Sie den Kontakt aus, für den Sie Ihre Arbeitsumgebung freigeben "
"wollen, und wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</"
"gui><gui>Meine Arbeitsumgebung freigeben</gui></guiseq>."
-#: C/share-desktop.page:54(p)
+#: 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 ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den "
-"Sie Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den Sie "
+"Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
"Arbeitsumgebung freigeben</gui>."
-#: C/share-desktop.page:62(p)
+#: 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."
+"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 ""
"Es wird eine Anfrage an den Kontakt gesendet, dem Sie Ihre Arbeitsumgebung "
"freigeben wollen. Falls diese akzeptiert wird, dann wird die voreingestellte "
@@ -366,7 +368,7 @@ msgstr ""
"Ihnen ermöglicht wird, die Verbindung zu dem Benutzer zu trennen, der Ihre "
"Arbeitsumgebung steuert."
-#: C/share-desktop.page:67(p)
+#: C/share-desktop.page:70(p)
msgid ""
"For more information about how to use the remote desktop viewer application, "
"refer to its help."
@@ -374,7 +376,7 @@ msgstr ""
"Für weitere Informationen über die Benutzung der Anwendung zum Betrachten "
"entfernter Arbeitsumgebungen ziehen Sie deren Hilfe zu Rate."
-#: C/share-desktop.page:74(p)
+#: 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."
@@ -382,7 +384,7 @@ msgstr ""
"Wenn Sie Ihre Arbeitsumgebung für jemanden freigeben, kann das eine sinkende "
"Systemleistung und eine langsamere Internetgeschwindigkeit zur Folge haben."
-#: C/share-desktop.page:80(p)
+#: 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> "
@@ -396,8 +398,7 @@ msgstr ""
#: C/set-custom-status.page:9(desc)
msgid "Add, edit or delete personal messages for your status."
msgstr ""
-"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren "
-"Status."
+"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren Status."
#: C/set-custom-status.page:15(name)
msgid "Jim Campbell"
@@ -407,20 +408,20 @@ msgstr "Jim Campbell"
msgid "jwcampbell@gmail.com"
msgstr "jwcampbell@gmail.com"
-#: C/set-custom-status.page:31(title)
+#: C/set-custom-status.page:34(title)
msgid "Set a custom message"
msgstr "Festlegen einer benutzerdefinierten Nachricht"
-#: C/set-custom-status.page:33(p)
+#: 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 ""
"Vielleicht wollen Sie eine benutzerdefinierte Nachricht für Ihren Status "
-"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für "
-"eine bestimmte Zeitspanne nicht verfügbar sein werden."
+"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für eine "
+"bestimmte Zeitspanne nicht verfügbar sein werden."
-#: C/set-custom-status.page:37(p)
+#: C/set-custom-status.page:40(p)
msgid ""
"It is possible to set a custom message based on the different statuses "
"available."
@@ -428,43 +429,43 @@ msgstr ""
"Es ist möglich, eine benutzerdefinierte Nachricht festzulegen, basierend auf "
"den verfügbaren Status."
-#: C/set-custom-status.page:43(p) C/set-custom-status.page:79(p)
+#: 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 ""
"Klicken Sie im<gui>Kontaktlisten</gui>-Fenster in die Auswahlliste oben."
-#: C/set-custom-status.page:49(p)
+#: 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>."
+"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 ""
-"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht "
-"zuordnen wollen. Sie müssen denjenigen mit der Bezeichnung "
-"<gui>Benutzerdefinierte Nachricht</gui> auswählen."
+"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht zuordnen "
+"wollen. Sie müssen denjenigen mit der Bezeichnung <gui>Benutzerdefinierte "
+"Nachricht</gui> auswählen."
-#: C/set-custom-status.page:55(p)
+#: 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."
+"Enter your custom message in the text box at the top of the window, and press "
+"<key>Enter</key> to set the message."
msgstr ""
"Geben Sie Ihre benutzerdefinierte Nachricht in das Textfeld am oberen Rand "
"des Fensters ein und drücken Sie die <gui>Eingabetaste</gui>, um sie zu "
"speichern."
-#: C/set-custom-status.page:61(p)
+#: 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."
+"use it again, click on the little star on the right of the text box where you "
+"wrote your custom message."
msgstr ""
"Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, "
-"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie "
-"anschließend auf den kleinen Stern an der rechten Seite des Textfeldes, in "
-"welches Sie Ihre benutzerdefinierte Nachricht eingegeben haben."
+"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie anschließend "
+"auf den kleinen Stern an der rechten Seite des Textfeldes, in welches Sie "
+"Ihre benutzerdefinierte Nachricht eingegeben haben."
-#: C/set-custom-status.page:66(p)
+#: 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."
@@ -473,57 +474,56 @@ msgstr ""
"nächsten Benutzung von <app>Empathy</app> nicht verfügbar sein. Sie wird nur "
"für die aktuelle Sitzung gespeichert."
-#: C/set-custom-status.page:75(title)
+#: C/set-custom-status.page:78(title)
msgid "Edit, remove and add a custom message"
msgstr ""
"Bearbeiten, Entfernen und Hinzufügen einer benutzerdefinierten Nachricht"
-#: C/set-custom-status.page:85(p)
+#: C/set-custom-status.page:88(p)
msgid "Select <gui>Edit Custom Message</gui>."
msgstr "Wählen Sie <gui>Benutzerdefinierte Nachrichten bearbeiten</gui>."
-#: C/set-custom-status.page:92(p)
+#: C/set-custom-status.page:95(p)
msgid "To edit a custom message:"
msgstr "So bearbeiten Sie eine benutzerdefinierte Nachricht:"
-#: C/set-custom-status.page:97(p)
+#: 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 ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
-#: C/set-custom-status.page:103(p)
+#: C/set-custom-status.page:106(p)
msgid "Type the new custom message and press <key>Enter</key> to modify it."
msgstr ""
"Geben Sie die neue benutzerdefinierte Nachricht ein und drücken Sie die "
"<key>Eingabetaste</gui>, um die Änderungen anzuwenden."
-#: C/set-custom-status.page:110(p)
+#: C/set-custom-status.page:113(p)
msgid "To remove a custom message:"
msgstr "So entfernen Sie eine benutzerdefinierte Nachricht:"
-#: C/set-custom-status.page:115(p)
+#: C/set-custom-status.page:118(p)
msgid ""
"From the <gui>Saved Presets</gui> box, select the status message you want to "
"remove."
msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie entfernen wollen."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie entfernen wollen."
-#: C/set-custom-status.page:121(p)
+#: C/set-custom-status.page:124(p)
msgid "Click on the <gui>Remove</gui> button."
msgstr "Klicken Sie auf den Knopf <gui>Entfernen</gui>."
-#: C/set-custom-status.page:128(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#: C/set-custom-status.page:131(p)
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
msgstr ""
-"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine "
-"neue benutzerdefinierte Nachricht hinzu:"
+"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine neue "
+"benutzerdefinierte Nachricht hinzu:"
-#: C/set-custom-status.page:133(p)
+#: 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."
@@ -531,23 +531,23 @@ msgstr ""
"Klicken Sie auf die Auswahlliste, um den Status auszuwählen, dem Sie die "
"benutzerdefinierte Nachricht zuordnen wollen."
-#: C/set-custom-status.page:139(p)
+#: C/set-custom-status.page:142(p)
msgid "Click on the text box, and type the new custom message."
msgstr ""
"Klicken Sie in das Textfeld und geben Sie die neue benutzerdefinierte "
"Nachricht ein."
-#: C/set-custom-status.page:144(p)
+#: C/set-custom-status.page:147(p)
msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
msgstr ""
"Klicken Sie auf <gui>Hinzufügen</gui>, um die neue Nachricht zu den "
"voreingestellten Nachrichten hinzuzufügen."
-#: C/set-custom-status.page:153(p)
+#: C/set-custom-status.page:156(p)
msgid "When finished, click on <gui>Close</gui>."
msgstr "Klicken Sie auf <gui>Schließen</gui>, sobald Sie fertig sind."
-#: C/set-custom-status.page:160(p)
+#: 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> "
@@ -562,67 +562,67 @@ msgid "Send a message to one of your contacts."
msgstr "Eine Nachricht an einen Ihrer Kontakte senden."
#: C/send-message.page:16(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:13(name)
-#: C/prob-conn-auth.page:16(name) C/prob-conn-acctdisabled.page:14(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/prob-conn.page:15(email) C/prob-conn-neterror.page:14(email)
-#: C/prob-conn-auth.page:17(email) C/prob-conn-acctdisabled.page:15(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:28(title)
+#: C/send-message.page:31(title)
msgid "Send a message to someone"
msgstr "Jemandem eine Nachricht senden"
-#: C/send-message.page:37(p)
+#: C/send-message.page:40(p)
msgid ""
"Double click the name of the contact that you want to have a conversation "
"with."
msgstr ""
-"Klicken Sie doppelt auf den Namen des Kontakts, mit dem Sie eine "
-"Unterhaltung beginnen wollen."
+"Klicken Sie doppelt auf den Namen des Kontakts, mit dem Sie eine Unterhaltung "
+"beginnen wollen."
-#: C/send-message.page:43(p)
+#: 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 ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, mit dem "
-"Sie eine Unterhaltung führen wollen, und klicken Sie anschließend auf "
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, mit dem Sie "
+"eine Unterhaltung führen wollen, und klicken Sie anschließend auf "
"<gui>Unterhaltung</gui>."
-#: C/send-message.page:51(p)
+#: C/send-message.page:54(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 ""
"Ein neues Fenster wird geöffnet. Geben Sie eine Nachricht in das Feld am "
-"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</gui>, "
-"um sie zu senden."
+"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</gui>, um "
+"sie zu senden."
#: C/send-file.page:8(desc)
msgid "Send a file from your computer to one of your contacts."
msgstr "Senden Sie eine Datei von Ihrem Rechner an einen Ihrer Kontakte."
-#: C/send-file.page:33(title)
+#: C/send-file.page:36(title)
msgid "Send files"
msgstr "Dateien senden"
-#: C/send-file.page:42(p)
+#: 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 ""
"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, dem Sie "
-"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei "
-"senden</gui>."
+"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei senden</"
+"gui>."
-#: C/send-file.page:47(p)
+#: 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>."
@@ -631,16 +631,16 @@ msgstr ""
"Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</gui><gui>Datei senden</gui></"
"guiseq>."
-#: C/send-file.page:55(p)
+#: C/send-file.page:58(p)
msgid "Select the file to send, and click on <gui>Send</gui>."
msgstr ""
"Wählen Sie die zu sendende Datei aus und klicken Sie auf <gui>Senden</gui>."
-#: C/send-file.page:60(p)
+#: C/send-file.page:63(p)
msgid "The <gui>File Transfers</gui> window will appear."
msgstr "Das Fenster <gui>Dateiübertragungen</gui> wird geöffnet."
-#: C/send-file.page:63(p)
+#: 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."
@@ -648,7 +648,7 @@ msgstr ""
"Warten Sie darauf, dass Ihr Kontakt die Dateiübertragung akzeptiert, oder "
"klicken Sie auf <gui>Stopp</gui>, um die Übertragung zu stoppen."
-#: C/send-file.page:69(p)
+#: C/send-file.page:72(p)
msgid ""
"Once the transfer is finished, it is possible to close the <gui>File "
"Transfers</gui> window."
@@ -656,18 +656,17 @@ msgstr ""
"Sobald die Dateiübertragung abgeschlossen ist, können Sie das Fenster "
"<gui>Dateiübertragungen</gui> schließen."
-#: C/send-file.page:77(p)
+#: 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 ""
-"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster "
-"aufgelistet sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu "
-"leeren. Dies entfernt die Dateien nur aus der Liste, aber nicht von Ihrem "
-"Rechner."
+"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster aufgelistet "
+"sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu leeren. Dies "
+"entfernt die Dateien nur aus der Liste, aber nicht von Ihrem Rechner."
-#: C/send-file.page:84(p)
+#: 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>."
@@ -675,36 +674,36 @@ msgstr ""
"Mit folgenden Diensten können Sie Dateien versenden: <em>Jabber</em>, "
"<em>Google Talk</em> und <em>People Nearby</em>."
-#: C/send-file.page:90(p)
+#: 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."
+"In order to send a file to someone, you need to be connected to the Internet, "
+"or to a local area network."
msgstr ""
"Um jemandem eine Datei senden zu können, müssen Sie mit dem Internet oder "
"einem lokalen Netzwerk verbunden sein."
#: C/salut-protocol.page:8(desc)
-msgid "Undesrtanding the People Nearby feature."
-msgstr "Erläuterungen zum Funktionsmerkmal »People Nearby«."
+msgid "Understanding the People Nearby feature."
+msgstr "Erläuterungen zum Funktionsmerkmal »Personen in der Nähe«."
-#: C/salut-protocol.page:30(title)
+#: C/salut-protocol.page:33(title)
msgid "What is People Nearby?"
msgstr "Was ist »People Nearby«?"
-#: C/salut-protocol.page:34(p)
+#: C/salut-protocol.page:37(p)
msgid "I'd like to see this played up a bit more."
msgstr "I'd like to see this played up a bit more."
-#: C/salut-protocol.page:37(p)
+#: 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 ""
"Der Dienst »People Nearby« ist ein Kommunikationsdienst, der ohne Server "
-"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und "
-"sich zu legitimieren, um den Dienst zu nutzen."
+"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und sich "
+"zu legitimieren, um den Dienst zu nutzen."
-#: C/salut-protocol.page:42(p)
+#: 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."
@@ -712,7 +711,7 @@ msgstr ""
"Dieses Nachrichtensystem ohne Server ist auf lokale Netzwerke beschränkt und "
"erfordert keine aktive Internetverbindung."
-#: C/salut-protocol.page:46(p)
+#: 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 "
@@ -722,36 +721,35 @@ msgstr ""
"automatisch ermittelt. Es ist möglich, ihnen Nachrichten und Dateien zu "
"senden, wie mit anderen Diensten auch."
-#: C/salut-protocol.page:51(p)
+#: C/salut-protocol.page:54(p)
msgid ""
"All the modern local area networks should be able to support this kind of "
"service."
msgstr ""
-"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst "
-"zu unterstützen."
+"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst zu "
+"unterstützen."
#: C/remove-account.page:8(desc)
msgid "Completely remove an account from <app>Empathy</app>."
msgstr "Ein Konto vollständig aus <app>Empathy</app> löschen."
-#: C/remove-account.page:29(title)
+#: C/remove-account.page:32(title)
msgid "Remove an account"
msgstr "Löschen eines Kontos"
-#: C/remove-account.page:31(p)
+#: C/remove-account.page:34(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."
+"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 ""
"Sie können ein Konto aus <app>Empathy</app> vollständig löschen, falls Sie "
"dieses nicht mehr benutzen wollen. Sollten Sie in Zukunft dieses Konto in "
"<app>Empathy</app> erneut nutzen wollen, dann müssen Sie die Kontendetails "
"erneut eingeben."
-#: C/remove-account.page:38(p) C/irc-nick-password.page:47(p)
-#: C/disable-account.page:44(p) C/add-account.page:43(p)
+#: C/remove-account.page:41(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:47(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
@@ -759,20 +757,20 @@ msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Bearbeiten</"
"gui><gui>Konten</gui></guiseq> oder drücken Sie <key>F4</key>."
-#: C/remove-account.page:42(p)
+#: C/remove-account.page:45(p)
msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"Select the account you wish to remove from the accounts list on the left side "
+"of the window."
msgstr ""
"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
"linken Seite des Fensters aus."
-#: C/remove-account.page:46(p)
+#: C/remove-account.page:49(p)
msgid "Click on the trash icon next to the account name to remove the account."
msgstr ""
"Klicken Sie auf das Müll-Symbol rechts neben dem Konto, um es zu entfernen."
-#: C/remove-account.page:49(p)
+#: C/remove-account.page:52(p)
msgid ""
"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
"button to permanently remove the account."
@@ -780,7 +778,7 @@ msgstr ""
"Ein Dialogfenster bittet darum, den Vorgang zu bestätigen. Klicken Sie auf "
"den Knopf <gui>Entfernen</gui>, um das Konto dauerhaft zu entfernen."
-#: C/remove-account.page:55(p)
+#: C/remove-account.page:58(p)
msgid ""
"Even after removing an account, <app>Empathy</app> does not delete your "
"conversation history for that account."
@@ -794,28 +792,35 @@ msgstr ""
"Diagnostizieren häufiger Verbindungsprobleme mit einem "
"Sofortnachrichtendienst."
-#: C/prob-conn.page:26(title)
+#: C/prob-conn.page:29(title)
msgid "Problems connecting to an instant messaging service"
msgstr "Probleme beim Verbinden zu einem Sofortnachrichtendienst"
+#. 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:107(None)
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr "a"
+
#: C/prob-conn-neterror.page:7(desc)
msgid ""
-"An error message which says \"<gui>Network error</gui>\" appears in the main "
+"An error message which says “<gui>Network error</gui>” appears in the main "
"window."
msgstr ""
"Eine Fehlermeldung mit dem Text »<gui>Netzwerkfehler</gui>« erscheint im "
"Hauptfenster."
-#: C/prob-conn-neterror.page:29(title)
-msgid "I get a message that says \"Network error\""
+#: C/prob-conn-neterror.page:33(title)
+msgid "I get a message that says “Network error”"
msgstr "Eine Meldung zeigt einen »Netzwerkfehler« an"
-#: C/prob-conn-neterror.page:32(cite)
+#: C/prob-conn-neterror.page:36(cite)
msgid "shaunm"
msgstr "shaunm"
# Blöd, dass diese Kommentare auch noch in der pot-Datei erscheinen. Mallard ist eben noch lange nicht da, wo es sein sollte.
-#: C/prob-conn-neterror.page:33(p)
+#: 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."
@@ -823,7 +828,7 @@ msgstr ""
"<app>Empathy</app> erlaubt es nicht mehr, ein IRC-Konto ohne einen gültigen "
"Spitznamen anzulegen"
-#: C/prob-conn-neterror.page:37(p)
+#: 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."
@@ -831,7 +836,7 @@ msgstr ""
"Dieser Fehler tritt auf, wenn <app>Empathy<app> aus irgendeinem Grund nicht "
"in der Lage ist, mit dem Sofortnachrichtendienst zu kommunizieren."
-#: C/prob-conn-neterror.page:41(p)
+#: 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."
@@ -839,21 +844,24 @@ msgstr ""
"Dieser Fehler tritt auch auf, wenn Sie ein IRC-Konto verwenden wollen, ohne "
"einen Spitznamen festzulegen."
-#: C/prob-conn-neterror.page:48(p) C/prob-conn-auth.page:41(p)
-#: C/prob-conn-acctdisabled.page:40(p)
+#: 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 ""
"Stellen Sie sicher, dass Sie mit dem Internet beziehungsweise mit einem "
"lokalen Netzwerk verbunden sind."
-#: C/prob-conn-neterror.page:53(p) C/prob-conn-name.page:38(p)
-#: C/prob-conn-auth.page:53(p)
-msgid "Click on the <gui>Edit Account</gui> button in the error message."
+#: 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 ""
-"Klicken Sie auf den <gui>Konto bearbeiten</gui>-Knopf in der Fehlermeldung."
+"Klicken Sie auf das <media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">Bearbeiten</media>-Symbol in der Fehlermeldung."
-#: C/prob-conn-neterror.page:60(p) C/prob-conn-acctdisabled.page:56(p)
+#: 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 "
@@ -863,23 +871,24 @@ msgstr ""
"korrekt sind. Es sollte möglich sein, diese Details auf der Webseite des "
"jeweiligen Sofortnachrichtendienstes zu finden."
-#: C/prob-conn-neterror.page:66(p)
+#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
msgid ""
-"In the case of an IRC account, type your nickname in the <gui>Nickname</gui> "
-"text box."
+"Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect "
+"to the service."
msgstr ""
-"Wenn es sich um ein IRC-Konto handelt, geben Sie Ihren Spitznamen in das "
-"Textfeld <gui>Spitzname</gui> ein."
+"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
+"erneut, um einen neuen Verbindungsversuch zu starten."
+
+#: C/prob-conn-neterror.page:90(title)
+msgid "Proxy support"
+msgstr "Proxy-Unterstützung"
-#: C/prob-conn-neterror.page:74(p) C/prob-conn-name.page:59(p)
-#: C/prob-conn-auth.page:63(p)
+#: C/prob-conn-neterror.page:91(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."
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
msgstr ""
-"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> neben dem Namen Ihres "
-"Kontos und aktivieren Sie es erneut, um einen neuen Verbindungsversuch zu "
-"starten."
+"Momentan ist es nicht möglich, <app>Empathy</app> so zu konfigurieren, dass "
+"es mit einem Proxy-Server zusammenarbeitet."
#: C/prob-conn-name.page:9(title)
msgid "“Name in use”"
@@ -893,11 +902,11 @@ msgstr ""
"Eine Fehlermeldung »<gui>Name bereits in Benutzung</gui>« erscheint im "
"Hauptfenster."
-#: C/prob-conn-name.page:28(title)
+#: C/prob-conn-name.page:32(title)
msgid "I get a message that says “Name in use”"
msgstr "Eine Meldung zeigt »Name bereits in Benutzung« an"
-#: C/prob-conn-name.page:30(p)
+#: 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 "
@@ -907,36 +916,44 @@ msgstr ""
"und Sie einen Spitznamen verwenden wollen, den in diesem bestimmten Netzwerk "
"bereits jemand anders gewählt hat."
-#: C/prob-conn-name.page:45(p)
+#: C/prob-conn-name.page:50(p)
msgid "In the <gui>Nickname</gui> text box, type a new nickname."
msgstr ""
"Geben Sie in das <guilabel>Spitzname</guilabel>-Textfeld einen neuen "
"Spitznamen ein."
-#: C/prob-conn-name.page:50(p)
+#: 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 ""
-"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk "
-"registriert haben, legen Sie für diesen Spitznamen ein Passwort fest. "
-"Weitere Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/"
-">."
+"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk registriert "
+"haben, legen Sie für diesen Spitznamen ein Passwort fest. Weitere "
+"Informationen hierzu finden Sie in <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 ""
+"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> neben dem Namen Ihres "
+"Kontos und aktivieren Sie es erneut, um einen neuen Verbindungsversuch zu "
+"starten."
#: C/prob-conn-auth.page:8(desc)
msgid ""
-"An error message which says \"<gui>Authentication failed</gui>\" appears in "
-"the main window."
+"An error message which says “<gui>Authentication failed</gui>” appears in the "
+"main window."
msgstr ""
"Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
"Hauptfenster."
-#: C/prob-conn-auth.page:32(title)
-msgid "I get a message that says \"Authentication failed\""
+#: C/prob-conn-auth.page:36(title)
+msgid "I get a message that says “Authentication failed”"
msgstr "Eine Meldung zeigt »Legitimierung fehlgeschlagen« an"
-#: C/prob-conn-auth.page:34(p)
+#: 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 "
@@ -946,17 +963,17 @@ msgstr ""
"erlaubt, weil Benutzername oder Passwort aus verschiedenen Gründen nicht "
"akzeptiert werden konnten."
-#: C/prob-conn-auth.page:46(p)
+#: 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."
+"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 ""
"Stellen Sie sicher, dass Sie bei dem Dienst ein Konto registriert haben, mit "
-"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, "
-"verweigern die meisten Dienste die Verbindung."
+"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, verweigern "
+"die meisten Dienste die Verbindung."
-#: C/prob-conn-auth.page:58(p) C/prob-conn-acctdisabled.page:51(p)
+#: 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 ""
@@ -965,17 +982,17 @@ 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."
+"The instant messaging account that you want to use is not enabled in the list "
+"of accounts."
msgstr ""
"Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der "
"Kontenliste nicht aktiviert."
-#: C/prob-conn-acctdisabled.page:30(title)
+#: C/prob-conn-acctdisabled.page:33(title)
msgid "My account is not enabled"
msgstr "Mein Konto ist nicht aktiviert"
-#: C/prob-conn-acctdisabled.page:32(p)
+#: 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 "
@@ -985,32 +1002,32 @@ msgstr ""
"aktiviert ist, wenn Sie eine neue Unterhaltung starten oder einen Raum "
"betreten wollen, könnten Ihre Kontendetails eventuell nicht korrekt sein."
-#: C/prob-conn-acctdisabled.page:45(p)
+#: 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 ""
-"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und "
-"wählen Sie den nicht funktionierenden Kontakt aus."
+"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und wählen "
+"Sie den nicht funktionierenden Kontakt aus."
-#: C/prob-conn-acctdisabled.page:62(p)
+#: C/prob-conn-acctdisabled.page:65(p)
msgid ""
-"Check that the <gui>Enabled</gui> check-box next to the name of your account "
-"is selected. If it is not, select the check-box to enalbe the account."
+"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
+"If it is not, select the check-box to enalbe the account."
msgstr ""
-"Stellen Sie sicher, dass das Ankreuzfeld <gui>Aktiviert</gui> neben dem "
-"Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie das "
-"Ankreuzfeld, um das Konto zu aktivieren."
+"Stellen Sie sicher, dass das Ankreuzfeld <gui style=\"checkbox\">Aktiviert</"
+"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie "
+"das Ankreuzfeld, um das Konto zu aktivieren."
#: C/prev-conv.page:8(desc)
msgid "Browse or search your previous conversations."
msgstr "Betrachten und Durchsuchen Ihrer früheren Unterhaltungen."
-#: C/prev-conv.page:32(title)
+#: C/prev-conv.page:35(title)
msgid "View previous conversations"
msgstr "Vorherige Unterhaltungen anschauen"
-#: C/prev-conv.page:36(p)
+#: 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, "
@@ -1024,11 +1041,11 @@ msgstr ""
"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
"bug."
-#: C/prev-conv.page:43(p)
+#: 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 "
+"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> speichert automatisch alle Ihre Text-Unterhaltungen, die "
@@ -1036,7 +1053,7 @@ msgstr ""
"früheren Unterhaltungen durchsuchen</link> oder <link xref=\"#browse"
"\">frühere Unterhaltungen anhand Kontakt und Datum suchen</link>."
-#: C/prev-conv.page:51(p)
+#: C/prev-conv.page:54(p)
msgid ""
"You do not need to be connected to the Internet to view and search your "
"previous conversations."
@@ -1044,32 +1061,31 @@ msgstr ""
"Sie müssen nicht mit dem Internet verbunden sein, um Ihre vorherigen "
"Unterhaltungen zu betrachten und zu durchsuchen."
-#: C/prev-conv.page:58(title)
+#: C/prev-conv.page:61(title)
msgid "Search previous conversations"
msgstr "Vorherige Unterhaltungen durchsuchen"
-#: C/prev-conv.page:60(p)
+#: C/prev-conv.page:63(p)
msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
+"You can perform a full-text search through all of your previous conversations."
msgstr ""
"Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen."
-#: C/prev-conv.page:64(p) C/prev-conv.page:93(p)
+#: 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>."
+"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
"gui><gui>Vorherige Unterhaltungen</gui></guiseq>. Alternativ drücken Sie "
"<key>F3</key>."
-#: C/prev-conv.page:68(p)
+#: C/prev-conv.page:71(p)
msgid "Select the <gui>Search</gui> tab."
msgstr "Wählen Sie den Reiter <gui>Suchen</gui>."
-#: C/prev-conv.page:71(p)
+#: 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>."
@@ -1078,16 +1094,16 @@ msgstr ""
"Sie suchen wollen. Klicken Sie auf <gui>Suchen</gui> oder drücken Sie die "
"<key>Eingabetaste</key>."
-#: C/prev-conv.page:75(p)
+#: 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 ""
"Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der "
-"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die "
-"Unterhaltungen nach Datum geordnet."
+"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die Unterhaltungen "
+"nach Datum geordnet."
-#: C/prev-conv.page:79(p)
+#: 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."
@@ -1095,11 +1111,11 @@ msgstr ""
"Klicken Sie auf eine Unterhaltung, um sie zu betrachten. <app>Empathy</app> "
"hebt in der Unterhaltung den Text hervor, der Ihren Suchbegriffen entspricht."
-#: C/prev-conv.page:86(title)
+#: C/prev-conv.page:89(title)
msgid "Browse previous conversations"
msgstr "Vorherige Unterhaltungen betrachten"
-#: C/prev-conv.page:88(p)
+#: C/prev-conv.page:91(p)
msgid ""
"You can browse your previous conversations with your contacts or in chat "
"rooms by date."
@@ -1107,19 +1123,19 @@ msgstr ""
"Sie können Ihre früheren Unterhaltungen mit Ihren Kontakten oder in "
"Unterhaltungsräumen anhand des Datums durchsuchen."
-#: C/prev-conv.page:97(p)
+#: C/prev-conv.page:100(p)
msgid "Select the <gui>Conversations</gui> tab."
msgstr "Wählen Sie den Reiter <gui>Unterhaltungen</gui>."
-#: C/prev-conv.page:100(p)
+#: 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."
+"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 ""
"Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte "
"und Unterhaltungsräume für dieses Konto wird darunter angezeigt."
-#: C/prev-conv.page:104(p)
+#: 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."
@@ -1128,7 +1144,7 @@ msgstr ""
"Unterhaltungen zu betrachten. Per Vorgabe wird die letzte Unterhaltung "
"angezeigt."
-#: C/prev-conv.page:108(p)
+#: 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 "
@@ -1141,16 +1157,16 @@ msgstr ""
"Klicken Sie auf die Pfeile neben den Monats- und Jahresangaben, um zu "
"früheren Daten zu gehen."
-#: C/prev-conv.page:114(p)
+#: 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 ""
-"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn "
-"in das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
+"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn in "
+"das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
"hervorgehoben."
-#: C/prev-conv.page:118(p)
+#: 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 "
@@ -1163,58 +1179,107 @@ msgstr ""
"Unterhaltungen anschauen</gui>. Das Fenster <gui>Vorherige Unterhaltungen</"
"gui> für den bereits ausgewählten Kontakt wird geöffnet."
-#: C/offline-contacts.page:8(desc)
-msgid "See all of your contacts, even those that are not online."
-msgstr "Sehen Sie alle Ihre Kontakte, auch wenn diese abgemeldet sind."
+#: C/license.page:8(desc)
+msgid "Legal information."
+msgstr "Rechtliche Hinweise."
-#: C/offline-contacts.page:29(title)
-msgid "Show offline contacts"
-msgstr "Abgemeldete Kontakte anzeigen"
+#: C/license.page:11(title)
+msgid "License"
+msgstr "Lizenz"
-#: C/offline-contacts.page:31(p)
+#: C/license.page:12(p)
msgid ""
-"Normally, <app>Empathy</app> only shows your contacts that are currently "
-"online. You can show all of your contacts instead, including those that are "
-"offline."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
msgstr ""
-"Normalerweise zeigt <app>Empathy</app> nur diejenigen Kontakte an, die "
-"verfügbar sind. Sie können alle Ihrer Kontakte anzeigen lassen, indem Sie "
-"die abgemeldeten Kontakte einschließen."
+"Dieses Werk wird unter einer »CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license« verbreitet."
+
+#: C/license.page:20(p)
+msgid "You are free:"
+msgstr "Es ist Ihnen gestattet:"
-#: C/offline-contacts.page:37(p)
+#: C/license.page:25(em)
+msgid "To share"
+msgstr "Freizugeben"
+
+#: C/license.page:26(p)
+msgid "To copy, distribute and transmit the work."
+msgstr ""
+"Das Werk bzw. den Inhalt zu vervielfältigen, zu verbreiten und öffentlich "
+"zugänglich zu machen."
+
+#: C/license.page:29(em)
+msgid "To remix"
+msgstr "Änderungen vorzunehmen"
+
+#: C/license.page:30(p)
+msgid "To adapt the work."
+msgstr "Abwandlungen und Bearbeitungen des Werkes bzw. Inhaltes anzufertigen."
+
+#: C/license.page:33(p)
+msgid "Under the following conditions:"
+msgstr "Unter den folgenden Bedingungen:"
+
+#: C/license.page:38(em)
+msgid "Attribution"
+msgstr "Weitergabe"
+
+#: C/license.page:39(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>."
+"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 ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
-"gui><gui>Abgemeldete Kontakte</gui></guiseq> oder drücken Sie "
-"<keyseq><key>Strg</key><key>H</key></keyseq>."
+"Sie dürfen das Werk nur unter gleichen Bedingungen weitergeben, wie Sie vom "
+"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr Werk "
+"aussieht)."
+
+#: C/license.page:46(em)
+msgid "Share Alike"
+msgstr "Share Alike"
-#: C/offline-contacts.page:42(p)
-msgid "To hide the offline contacts again, repeat the same procedure above."
+#: 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 ""
-"Um die abgemeldeten Kontakte wieder zu verbergen, wiederholen Sie den oben "
-"beschriebenen Vorgang."
+"Wenn Sie das lizenzierte Werk bzw. den lizenzierten Inhalt bearbeiten, "
+"abwandeln oder in anderer Weise erkennbar als Grundlage für eigenes Schaffen "
+"verwenden, dürfen Sie die daraufhin neu entstandenen Werke bzw. Inhalte nur "
+"unter Verwendung von Lizenzbedingungen weitergeben, die mit denen dieses "
+"Lizenzvertrages identisch, vergleichbar oder kompatibel sind."
+
+#: 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 ""
+"Den vollständigen Text der Lizenz finden sie auf der <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons-Webseite</"
+"link>. Oder Sie können den vollständigen <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/\">Commons Deed</link> lesen."
#: C/irc-start-conversation.page:8(desc)
msgid "Start a conversation witn an IRC contact."
msgstr "Eine Unterhaltung mit einem IRC-Kontakt starten."
-#: C/irc-start-conversation.page:27(title)
+#: C/irc-start-conversation.page:30(title)
msgid "Chat with somebody on IRC"
msgstr "Eine Unterhaltung mit jemandem im IRC führen"
-#: C/irc-start-conversation.page:29(p)
+#: 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 ""
"Sie können private Unterhaltungen mit anderen IRC-Benutzern außerhalb der "
-"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine "
-"Unterhaltung mit einem anderen IRC-Benutzer:"
+"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine Unterhaltung "
+"mit einem anderen IRC-Benutzer:"
-#: C/irc-start-conversation.page:34(p)
+#: 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 "
@@ -1225,22 +1290,22 @@ msgstr ""
"Alternativ klicken Sie mit der rechten Maustaste auf den Spitznamen des "
"Benutzers und wählen <gui>Unterhaltung</gui>."
-#: C/irc-start-conversation.page:42(p)
+#: 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."
+"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 ""
-"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste "
-"in <app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
+"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste in "
+"<app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
"Raumes, den Sie betreten haben. Verschiedene Räume können unterschiedliche "
"Kontaktlisten haben."
-#: C/irc-start-conversation.page:49(p)
+#: 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>."
+"window. If you do not see it, choose <guiseq><gui>Conversation</gui><gui>Show "
+"Contact List</gui></guiseq>."
msgstr ""
"Die Kontaktliste des IRC-Raumes befindet sich üblicherweise an der rechten "
"Seite des IRC-Fensters. Falls sie nicht angezeigt wird, wählen Sie "
@@ -1252,25 +1317,25 @@ msgstr ""
"Derzeit ist es nicht möglich, mit <app>Empathy</app> Dateien im IRC zu "
"versenden."
-#: C/irc-send-file.page:28(title)
+#: C/irc-send-file.page:31(title)
msgid "Send files over IRC"
msgstr "Dateien im IRC senden"
-#: C/irc-send-file.page:30(p)
+#: C/irc-send-file.page:33(p)
msgid "It is not currently possible to send files using IRC."
msgstr "Derzeit ist es nicht möglich, Dateien im IRC zu versenden."
#: C/irc-nick-password.page:10(desc)
msgid "Protect your nickname to prevent other IRC users from using it."
msgstr ""
-"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer "
-"ihn verwenden."
+"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer ihn "
+"verwenden."
-#: C/irc-nick-password.page:30(title)
+#: C/irc-nick-password.page:33(title)
msgid "Use a nickname password on IRC"
msgstr "Verwenden eines Passworts für einen Spitznamen im IRC"
-#: C/irc-nick-password.page:32(p)
+#: 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 "
@@ -1283,43 +1348,44 @@ msgstr ""
"Unterhaltungsräume können Sie ohne einen registrierten Spitznamen nicht "
"betreten."
-#: C/irc-nick-password.page:37(p)
+#: 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."
+"<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> unterstützt gegenwärtig die Registrierung von Spitznamen "
-"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein "
-"<em>Serverpasswort</em> an NickServ weiter. In diesen Netzwerken können Sie "
-"das IRC-Passwort in <app>Empathy</app> verwenden, um sich bei NickServ zu "
-"identifizieren. Das populäre FreeNode-Netzwerk verfügt bekanntermaßen über "
-"dieses Funktionsmerkmal."
+"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein <em>Serverpasswort</"
+"em> an NickServ weiter. In diesen Netzwerken können Sie das IRC-Passwort in "
+"<app>Empathy</app> verwenden, um sich bei NickServ zu identifizieren. Das "
+"populäre FreeNode-Netzwerk verfügt bekanntermaßen über dieses "
+"Funktionsmerkmal."
-#: C/irc-nick-password.page:43(p)
+#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
msgstr "So legen Sie ein IRC-Serverpasswort fest:"
-#: C/irc-nick-password.page:51(p)
+#: C/irc-nick-password.page:54(p)
msgid "Select the IRC account from the list on the left of the dialog."
msgstr ""
"Wählen Sie das IRC-Konto aus der Liste an der linken Seite des Dialogs aus."
-#: C/irc-nick-password.page:54(p)
+#: C/irc-nick-password.page:57(p)
msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"In the <gui>Password</gui> field, type the password you used to register your "
+"nikcname."
msgstr ""
"Geben Sie im Textfeld <gui>Passwort</gui> das Passwort ein, dass Sie bei der "
"Registrierung Ihres Spitznamens verwendet haben."
-#: C/irc-nick-password.page:60(p) C/import-account.page:58(p)
-msgid "Click <gui>Apply</gui>."
-msgstr "Klicken Sie auf <gui>Anwenden</gui>."
+#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
+#: C/add-account.page:70(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
-#: C/irc-nick-password.page:66(p)
+#: 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 "
@@ -1330,27 +1396,27 @@ msgstr ""
"gegenwärtig nicht möglich, mit <app>Empathy</app> einen IRC-Spitznamen zu "
"registrieren oder das Passwort für Ihren Spitznamen zu ändern."
-#: C/irc-manage.page:8(desc)
+#: C/irc-manage.page:9(desc)
msgid "How to use IRC with <app>Empathy</app>."
msgstr "Benutzung des IRC mit <app>Empathy</app>."
-#: C/irc-manage.page:29(title)
+#: C/irc-manage.page:33(title)
msgid "Internet Relay Chat (IRC)"
msgstr "Internet Relay Chat (IRC)"
-#: C/irc-manage.page:33(title)
+#: C/irc-manage.page:37(title)
msgid "IRC Chat Rooms and Conversations"
msgstr "IRC-Räume und Unterhaltungen"
-#: C/irc-manage.page:35(title)
+#: C/irc-manage.page:39(title)
msgid "Chat Rooms and Conversations"
msgstr "Unterhaltungsräume und Unterhaltungen"
-#: C/irc-manage.page:40(title)
+#: C/irc-manage.page:44(title)
msgid "Common IRC Problems"
msgstr "Häufige Probleme im IRC"
-#: C/irc-manage.page:42(title) C/index.page:50(title)
+#: C/irc-manage.page:46(title) C/index.page:52(title)
msgid "Common Problems"
msgstr "Häufig auftretende Probleme"
@@ -1358,11 +1424,11 @@ msgstr "Häufig auftretende Probleme"
msgid "Join an IRC channel."
msgstr "Betreten eines IRC-Kanals."
-#: C/irc-join-room.page:28(title)
+#: C/irc-join-room.page:31(title)
msgid "Join an IRC chat room"
msgstr "Betreten eines IRC-Unterhaltungsraumes"
-#: C/irc-join-room.page:30(p)
+#: 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-"
@@ -1372,8 +1438,8 @@ msgstr ""
"Netzwerk betreten, mit dem Sie verbunden sind. Weitere Informationen hierzu "
"finden Sie in <link xref=\"add-account\"/> und <link xref=\"account-irc\"/>."
-#: C/irc-join-room.page:36(p) C/group-conversations.page:55(p)
-#: C/group-conversations.page:119(p)
+#: 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>."
@@ -1381,7 +1447,7 @@ msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
"gui><gui>Betreten</gui></guiseq>."
-#: C/irc-join-room.page:42(p)
+#: 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."
@@ -1389,7 +1455,7 @@ msgstr ""
"Aus der <gui>Konto</gui>-Auswahlliste wählen Sie das IRC-Konto, das zu dem "
"Netzwerk gehört, welches Sie verwenden wollen."
-#: C/irc-join-room.page:48(p)
+#: 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>)."
@@ -1398,11 +1464,11 @@ msgstr ""
"ein, den Sie betreten wollen. Die Namen der IRC-Kanäle beginnen mit einem "
"Raute-Zeichen (<sys>#</sys>)."
-#: C/irc-join-room.page:54(p)
+#: C/irc-join-room.page:57(p)
msgid "Click <gui>Join</gui> to enter the room."
msgstr "Klicken Sie auf <gui>Betreten</gui>, um den Raum zu betreten."
-#: C/irc-join-room.page:61(p)
+#: C/irc-join-room.page:64(p)
msgid ""
"To join multiple rooms, you need to repeat the steps above for each room."
msgstr ""
@@ -1410,26 +1476,63 @@ msgstr ""
"jeden Raum wiederholen."
#: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Derzeit ist es nicht möglich, mit <app>Empathy</app> einen "
-"passwortgeschützten Raum im IRC zu betreten."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Betreten von passwortgeschützten Räumen im IRC"
-#: C/irc-join-pwd.page:28(title)
+#: C/irc-join-pwd.page:25(title)
msgid "Join a protected IRC chat room"
msgstr "Betreten eines passwortgeschützten Raumes im IRC"
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"On some IRC networks, private IRC rooms may be protected with a password."
+msgstr ""
+"In einigen IRC-Netzwerken können private IRC-Räume durch ein Passwort "
+"geschützt sein."
+
#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
+msgstr ""
+"So betreten Sie einen solchen Raum, falls Ihnen das Passwort bekannt ist:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link>."
+
+#: C/irc-join-pwd.page:40(p)
+msgid ""
+"In the <gui>This room is protected by a password</gui> text box, type the IRC "
+"room password, and click on <gui style=\"button\">Join</gui>."
+msgstr ""
+"Geben Sie im Textfeld <gui>Dieser Raum ist durch ein Kennwort geschützt</gui> "
+"das Passwort für den IRC-Raum ein und klicken Sie auf <gui style=\"button"
+"\">Beitreten</gui>."
+
+#: C/irc-commands.page:7(desc)
+msgid "The supported IRC commands."
+msgstr "Die unterstützten IRC-Befehle."
+
+#: C/irc-commands.page:18(title)
+msgid "Supported IRC commands"
+msgstr "Unterstützte IRC-Befehle"
+
+#: C/irc-commands.page:19(p)
msgid ""
-"It is not currently possible to join a password-protected IRC chat room."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
msgstr ""
-"Derzeit ist es nicht möglich, einen passwortgeschützten Raum zu betreten."
+"Um eine Liste der unterstützten IRC-Befehle in einem Unterhaltungsraum zu "
+"sehen, geben Sie <input>/help</input> ein und drücken Sie die "
+"<key>Eingabetaste</key>."
+
+#: C/irc-commands.page:24(p)
+msgid "All commands available have a small description on their usage."
+msgstr "Alle Befehle verfügen über eine Kurzbeschreibung der Benutzung."
#. 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:45(None)
+#: C/introduction.page:48(None)
msgid ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=489ba00b0fc377aba4c691210b6e0650"
@@ -1439,22 +1542,22 @@ msgstr "a"
msgid "Introduction to the <app>Empathy</app> instant messenger."
msgstr "Einführung in den <app>Empathy</app>-Sofortnachrichtendienst."
-#: C/introduction.page:25(title)
+#: C/introduction.page:28(title)
msgid "Introduction"
msgstr "Einführung"
-#: C/introduction.page:27(p)
+#: C/introduction.page:30(p)
msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video call, file transfers "
-"and all the most used messaging systems such as MSN and Google Talk."
+"<app>Empathy</app> is an instant messaging application for the GNOME Desktop. "
+"It supports text messaging, voice &amp; video call, file transfers and all "
+"the most used messaging systems such as MSN and Google Talk."
msgstr ""
"<app>Empathy</app> ist eine Sofortnachrichten-Anwendung für die GNOME-"
-"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, "
-"Dateiübertragungen sowie alle gängigen Nachrichtensysteme wie MSN und "
-"GoogleTalk werden unterstützt."
+"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, Dateiübertragungen "
+"sowie alle gängigen Nachrichtensysteme wie MSN und GoogleTalk werden "
+"unterstützt."
-#: C/introduction.page:32(p)
+#: C/introduction.page:35(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."
@@ -1463,7 +1566,7 @@ msgstr ""
"berufliche Zusammenarbeit erleichtern, aber es auch ermöglichen, mit Ihren "
"Freunden in Verbindung zu bleiben."
-#: C/introduction.page:36(p)
+#: C/introduction.page:39(p)
msgid ""
"You can group all the conversations in a single window, or have multiple "
"windows for different kind of conversations; easily search through your "
@@ -1474,46 +1577,61 @@ msgstr ""
"frühere Unterhaltungen durchsuchen und Ihre Arbeitsumgebung mit nur zwei "
"Klicks freigeben."
-#: C/introduction.page:43(title)
+#: C/introduction.page:46(title)
msgid "<gui>Contact List</gui> window"
msgstr "<gui>Kontaktlisten</gui>-Fenster"
-#: C/introduction.page:44(desc)
+#: C/introduction.page:47(desc)
msgid "<app>Empathy</app> main window"
msgstr "<app>Empathy</app>-Hauptfenster"
-#: C/introduction.page:46(p)
+#: C/introduction.page:49(p)
msgid "<app>Empathy</app> main window."
msgstr "<app>Empathy</app>-Hauptfenster."
-#: C/index.page:27(title)
+#. 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)
+msgid ""
+"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgstr "a"
+
+#: C/index.page:7(title) C/index.page:8(title)
msgid "Empathy Instant Messenger"
msgstr "Empathy Sofortnachrichtendienst"
-#: C/index.page:30(title)
+#: C/index.page:26(title)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Empathy-Sofortnachrichtendirnst-Logo</media> Empathy "
+"Sofortnachrichtendienst"
+
+#: C/index.page:32(title)
msgid "Text Conversations"
msgstr "Text-Unterhaltungen"
-#: C/index.page:34(title)
+#: C/index.page:36(title)
msgid "Audio and Video Conversations"
msgstr "Audio- und Video-Unterhaltungen"
-#: C/index.page:38(title)
+#: C/index.page:40(title)
msgid "Contact Management"
msgstr "Kontaktverwaltung"
-#: C/index.page:42(title)
+#: C/index.page:44(title)
msgid "Account Management"
msgstr "Kontenverwaltung"
-#: C/index.page:46(title)
+#: C/index.page:48(title)
msgid "Advanced Actions"
msgstr "Fortgeschrittene Aktionen"
#: C/import-account.page:10(desc)
msgid "Import an account from another instant messaging application."
-msgstr ""
-"Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
+msgstr "Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
#: C/import-account.page:19(name)
msgid "Peter Haslam"
@@ -1523,21 +1641,21 @@ msgstr "Peter Haslam"
msgid "peter.haslam@freenet.de"
msgstr "peter.haslam@freenet.de"
-#: C/import-account.page:39(title)
+#: C/import-account.page:42(title)
msgid "Import an existing account"
msgstr "Importieren eines vorhandenen Kontos"
-#: C/import-account.page:41(p)
+#: 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 ""
-"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import "
-"von Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig "
-"wird als einzige Anwendung <app>Pidgin</app> unterstützt."
+"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import von "
+"Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig wird "
+"als einzige Anwendung <app>Pidgin</app> unterstützt."
-#: C/import-account.page:47(p)
+#: 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."
@@ -1545,20 +1663,20 @@ msgstr ""
"Wenn Sie <app>Empathy</app> zum ersten Mal ausführen, dann bietet Ihnen ein "
"Assistent eine Reihe von Optionen zum Anlegen neuer Konten an."
-#: C/import-account.page:51(p)
+#: C/import-account.page:54(p)
msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"Select <gui>Yes, import my account details from</gui> and click <gui>Forward</"
+"gui>."
msgstr ""
"Wählen Sie <gui>Ja, meine Kontodetails importieren von</gui> und klicken Sie "
"auf <gui>Weiter</gui>."
-#: C/import-account.page:55(p)
+#: C/import-account.page:58(p)
msgid "Select the check box next to each account you wish to import."
msgstr ""
"Aktivieren Sie das Ankreuzfeld neben jedem Konto, das Sie importieren wollen."
-#: C/import-account.page:63(p)
+#: C/import-account.page:66(p)
msgid ""
"It is not currently possible to import accounts after you have completed the "
"first-run assistant."
@@ -1566,24 +1684,60 @@ msgstr ""
"Gegenwärtig ist es nicht möglich, Konten zu importieren, nachdem der "
"Einrichtungsassistent abgeschlossen ist."
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Verbergen von abgemeldeten Kontakten in Ihrer <gui>Kontaktliste</gui>."
+
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Abgemeldete Kontakte verbergen"
+
+#: 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 ""
+"Normalerweise zeigt <app>Empathy</app> alle Kontakte an: die angemeldeten "
+"Kontakte, mit denen Sie eine Unterhaltung führen können, und diejenigen "
+"Kontakte, die abgemeldet sind."
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "So verbergen Sie abgemeldete Kontakte:"
+
+#: 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 ""
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
+"gui><gui>Abgemeldete Kontakte</gui></guiseq> oder drücken Sie "
+"<keyseq><key>Strg</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr ""
+"Um die abgemeldeten Kontakte wieder anzuzeigen, wiederholen Sie den oben "
+"beschriebenen Vorgang."
+
#: C/group-conversations.page:8(desc)
msgid "Start or join a group conversation with your contacts."
-msgstr ""
-"Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
+msgstr "Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
-#: C/group-conversations.page:31(title)
+#: C/group-conversations.page:34(title)
msgid "Group conversations"
msgstr "Gruppenunterhaltungen"
-#: C/group-conversations.page:33(p)
+#: C/group-conversations.page:36(p)
msgid ""
-"Group conversations permits you to have text conversations with more than "
-"one contact at the same time."
+"Group conversations permits you to have text conversations with more than one "
+"contact at the same time."
msgstr ""
"Gruppenunterhaltungen ermöglichen Ihnen Textunterhaltungen mit mehreren "
"Kontakten zugleich."
-#: C/group-conversations.page:37(p)
+#: 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."
@@ -1591,7 +1745,7 @@ msgstr ""
"Für eine Gruppenunterhaltung benötigen Sie ein registriertes Konto bei "
"entweder Google Talk oder Jabber, oder ein »People Nearby«-Konto."
-#: C/group-conversations.page:43(p)
+#: 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."
@@ -1599,11 +1753,11 @@ msgstr ""
"Eine Gruppenunterhaltung können Sie nur mit denjenigen Kontakten führen, die "
"den gleichen Dienst wie Sie verwenden."
-#: C/group-conversations.page:51(title)
+#: C/group-conversations.page:54(title)
msgid "Start a group conversation"
msgstr "Starten einer Gruppenunterhaltung"
-#: C/group-conversations.page:60(p)
+#: 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."
@@ -1611,7 +1765,7 @@ msgstr ""
"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
"welches Sie für die Gruppenunterhaltung verwenden wollen."
-#: C/group-conversations.page:66(p)
+#: 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."
@@ -1619,11 +1773,11 @@ msgstr ""
"Geben Sie in das <guilabel>Server</guilabel>-Textfeld den Namen des Servers "
"ein, auf dem die Unterhaltung stattfinden soll."
-#: C/group-conversations.page:70(p)
+#: C/group-conversations.page:73(p)
msgid "Leave it empty if it will be on the current server."
msgstr "Lassen Sie dies leer, wenn es sich um den aktuellen Server handelt."
-#: C/group-conversations.page:75(p)
+#: C/group-conversations.page:78(p)
msgid ""
"In the <gui>Room</gui> text box, type the name you want to give to the "
"conversation."
@@ -1631,7 +1785,7 @@ msgstr ""
"Geben Sie in das <guilabel>Raum</guilabel>-Textfeld den Namen ein, den Sie "
"der neuen Unterhaltung zuweisen wollen."
-#: C/group-conversations.page:79(p)
+#: 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 "
@@ -1641,22 +1795,22 @@ msgstr ""
"öffentlich für Andere einsehbar, um den Raum zu betreten. Es ist nicht "
"möglich, einen privaten Raum zu erstellen."
-#: C/group-conversations.page:87(p)
+#: 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 ""
-"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an "
-"einer Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
+"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an einer "
+"Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
-#: C/group-conversations.page:94(p)
+#: C/group-conversations.page:97(p)
msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
msgstr ""
"Klicken Sie mit der rechten Maustaste auf den Kontakt, und wählen Sie "
"anschließend <guimenuitem>In Chatraum einladen</guimenuitem>."
-#: C/group-conversations.page:99(p)
+#: C/group-conversations.page:102(p)
msgid ""
"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
"gui></guiseq>."
@@ -1664,29 +1818,29 @@ msgstr ""
"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</gui><gui>In Chatraum "
"einladen</gui></guiseq>."
-#: C/group-conversations.page:104(p)
+#: 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."
+"If you have more than one group conversation open, select the one you want to "
+"invite your contacts."
msgstr ""
"Falls Sie mehrere Gruppenunterhaltung geöffnet haben, wählen Sie diejenige "
"aus, in welche Sie Ihre Kontakte einladen wollen."
-#: C/group-conversations.page:115(title)
+#: C/group-conversations.page:118(title)
msgid "Join a group conversation"
msgstr "Einer Gruppenunterhaltung beitreten"
-#: C/group-conversations.page:125(p)
+#: C/group-conversations.page:128(p)
msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
msgstr ""
-"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen "
-"Räume anzuzeigen."
+"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen Räume "
+"anzuzeigen."
-#: C/group-conversations.page:130(p)
+#: C/group-conversations.page:133(p)
msgid "Double-click on the name of a room to join it."
msgstr "Klicken Sie doppelt auf den Namen eines Raums, um ihn zu betreten."
-#: C/group-conversations.page:136(p)
+#: 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 "
@@ -1700,34 +1854,34 @@ msgstr ""
msgid "Understanding geolocation."
msgstr "Erläuterungen zu Geoposition"
-#: C/geolocation-what-is.page:30(title)
+#: C/geolocation-what-is.page:33(title)
msgid "What is geolocation"
msgstr "Was ist die Geoposition?"
-#: C/geolocation-what-is.page:32(p)
+#: 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 ""
"Geoposition ermöglicht Ihnen die Ermittlung des wirklichen geografischen "
-"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet "
-"verbunden ist."
+"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet verbunden "
+"ist."
-#: C/geolocation-what-is.page:34(p)
+#: C/geolocation-what-is.page:37(p)
msgid "With geolocation in <app>Empathy</app> you can:"
msgstr "Mit der Geoposition in <app>Empathy</app> können Sie:"
-#: C/geolocation-what-is.page:39(p)
+#: C/geolocation-what-is.page:42(p)
msgid "Publish your geographical location to your contacts."
msgstr "Ihren Kontakten Ihre geografische Position anzeigen."
-#: C/geolocation-what-is.page:44(p)
+#: C/geolocation-what-is.page:47(p)
msgid "See your contacts’ geographical location and quickly contact them."
msgstr ""
"Die geografische Position Ihrer Kontakte sehen und direkt eine Verbindung "
"herstellen."
-#: C/geolocation-what-is.page:49(p)
+#: C/geolocation-what-is.page:52(p)
msgid ""
"Set the accuracy of your location and the device used to discover your "
"location."
@@ -1735,7 +1889,7 @@ msgstr ""
"Die Genauigkeit Ihrer Position und das für die Ermittlung der Position "
"verwendete Gerät sehen."
-#: C/geolocation-what-is.page:57(p)
+#: 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."
@@ -1747,31 +1901,31 @@ msgstr ""
msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
msgstr "Aktivierung und Deaktivierung der Geoposition in <app>Empathy</gui>."
-#: C/geolocation-turn.page:30(title)
+#: C/geolocation-turn.page:33(title)
msgid "Activate/Deactivate geolocation"
msgstr "Aktivieren oder Deaktivieren der Geolokation"
-#: C/geolocation-turn.page:34(p)
+#: C/geolocation-turn.page:37(p)
msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
msgstr ""
"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq>."
-#: C/geolocation-turn.page:39(p)
+#: C/geolocation-turn.page:42(p)
msgid "Select the <gui>Location</gui> tab."
msgstr "Wählen Sie den Reiter <gui>Ort</gui>."
-#: C/geolocation-turn.page:44(p)
+#: C/geolocation-turn.page:47(p)
msgid ""
"Select <gui>Publish location to my contacts</gui> to activate geolocation."
msgstr ""
"Wählen Sie <gui>Position an meine Kontakte übermitteln</gui>, um Geoposition "
"zu aktivieren."
-#: C/geolocation-turn.page:47(p)
+#: C/geolocation-turn.page:50(p)
msgid "To deactivate geolocation, deselect it."
msgstr "Um Geoposition abzuschalten, deaktivieren Sie dies."
-#: C/geolocation-turn.page:52(p)
+#: C/geolocation-turn.page:55(p)
msgid ""
"To increase the accuracy of your position, deselect <gui>Reduce location "
"accuracy</gui>."
@@ -1779,7 +1933,7 @@ msgstr ""
"Um die Genauigkeit Ihrer Position zu erhöhen, deaktivieren Sie "
"<gui>Positionsgenauigkeit verringern</gui>."
-#: C/geolocation-turn.page:58(p)
+#: 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> "
@@ -1793,11 +1947,11 @@ msgstr ""
msgid "Services that supports geolocation and compatibility."
msgstr "Dienste, die Geoposition und Kompatibilität unterstützen."
-#: C/geolocation-supported.page:28(title)
+#: C/geolocation-supported.page:31(title)
msgid "Supported services"
msgstr "Unterstützte Dienste"
-#: C/geolocation-supported.page:30(p)
+#: 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 "
@@ -1807,7 +1961,7 @@ msgstr ""
"Jabber-Dienst kompatibel. Um es nutzen zu können, müssen Sie und Ihre "
"Kontakte über ein Jabber-Konto verfügen."
-#: C/geolocation-supported.page:36(p)
+#: 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 "
@@ -1817,11 +1971,11 @@ msgstr ""
"Funktionsmerkmal unterstützt. Die meisten Jabber-Server tun dies. Weitere "
"Informationen finden Sie auf der Webseite Ihres Dienstes."
-#: C/geolocation-supported.page:44(title)
+#: C/geolocation-supported.page:47(title)
msgid "Compatibility"
msgstr "Kompatibilität"
-#: C/geolocation-supported.page:46(p)
+#: 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 "
@@ -1835,15 +1989,15 @@ msgstr ""
msgid "What information are sent and to who."
msgstr "Welche Informationen gesendet werden und an wen."
-#: C/geolocation-privacy.page:29(title)
+#: C/geolocation-privacy.page:32(title)
msgid "Geolocation Privacy"
msgstr "Datenschutz bei Geoposition"
-#: C/geolocation-privacy.page:32(title)
+#: C/geolocation-privacy.page:35(title)
msgid "What information is sent"
msgstr "Gesendete Informationen"
-#: C/geolocation-privacy.page:33(p)
+#: 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, "
@@ -1853,49 +2007,49 @@ msgstr ""
"Etage und Raum sowie Ihre Postleitzahl, der Längengrad, der Breitengrad, die "
"Höhe über dem Meeresspiegel, die Geschwindigkeit die Funkpeilung."
-#: C/geolocation-privacy.page:37(p)
+#: 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."
+"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 ""
"Die Genauigkeit und die Menge der verfügbaren Informationen über Ihre "
"geografische Position hängen von der Software oder der Infrastruktur ab, die "
"für die Ermittlung Ihrer Position zum Einsatz kommt."
-#: C/geolocation-privacy.page:41(p)
+#: 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."
+"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 ""
"Verschiedene Arten von Netzwerken haben unterschiedliche "
"Genauigkeitseinstellungen und senden daher verschiedene Informationen. Die "
"Benutzung externer Geräte wie GPS oder Mobiltelefone erhöht die Genauigkeit "
"der gesendeten Informationen."
-#: C/geolocation-privacy.page:46(p)
+#: 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."
+"When the privacy mode is enabled, nothing more precise than your city will be "
+"sent, even if you are using an external device."
msgstr ""
"Wenn der Privatsphäre-Modus aktiviert ist, wird nichts Genaueres als "
"lediglich Angaben über die Stadt gesendet, in der Sie sich befinden, selbst "
"dann, wenn Sie ein externes Gerät verwenden."
-#: C/geolocation-privacy.page:53(title)
+#: C/geolocation-privacy.page:56(title)
msgid "Who can see the information sent"
msgstr "Wer die gesendeten Informationen sehen kann"
-#: C/geolocation-privacy.page:54(p)
+#: C/geolocation-privacy.page:57(p)
msgid "Only your contacts can see your geographical position."
msgstr "Nur Ihre Kontakte können Ihre geografische Position sehen."
-#: C/geolocation-privacy.page:60(title)
+#: C/geolocation-privacy.page:63(title)
msgid "What is the privacy mode"
msgstr "Datenschutzmodus"
-#: C/geolocation-privacy.page:61(p)
+#: 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."
@@ -1904,33 +2058,32 @@ msgstr ""
"Genauigkeit. Die Genauigkeit der zu Ihren Kontakten gesendeten geografischen "
"Position wird dabei verringert."
-#: C/geolocation-privacy.page:68(title)
+#: C/geolocation-privacy.page:71(title)
msgid "Privacy overview"
msgstr "Datenschutz-Überblick"
-#: C/geolocation-privacy.page:69(p)
+#: C/geolocation-privacy.page:72(p)
msgid ""
"Overview of the various geolocation privacy settings in <app>Empathy</app>."
msgstr ""
"Überblick über die verschiedenen Privatsphäre-Einstellungen für die "
"Geoposition in <app>Empathy</app>."
-#: C/geolocation-privacy.page:74(p)
+#: C/geolocation-privacy.page:77(p)
msgid "Geolocation is not enabled by default."
msgstr "Geoposition ist per Vorgabe nicht aktiviert."
-#: C/geolocation-privacy.page:79(p)
+#: C/geolocation-privacy.page:82(p)
msgid "Privacy mode is enabled by default."
msgstr "Der Datenschutzmodus ist per Vorgabe aktiviert."
-#: C/geolocation-privacy.page:84(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+#: C/geolocation-privacy.page:87(p)
+msgid "Privacy mode prevails even when using external and more precise devices."
msgstr ""
"Der Privatsphäre-Modus ist auch dann wirksam, wenn externe und genauere "
"Geräte benutzt werden."
-#: C/geolocation-privacy.page:89(p)
+#: C/geolocation-privacy.page:92(p)
msgid "Only your contacts can see your position."
msgstr "Nur Ihre Kontakte können Ihre Position sehen."
@@ -1938,20 +2091,20 @@ msgstr "Nur Ihre Kontakte können Ihre Position sehen."
msgid "<app>Empathy</app> does not publish my geographical position."
msgstr "<app>Empathy</app> übermittelt meine geografische Position nicht."
-#: C/geolocation-not-showing.page:29(title)
+#: C/geolocation-not-showing.page:32(title)
msgid "Geographical position not published"
msgstr "Geografische Position wird nicht veröffentlicht"
-#: C/geolocation-not-showing.page:31(p)
+#: 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 ""
-"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</"
-"app> möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
+"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</app> "
+"möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
"Genauigkeit zu bestimmen."
-#: C/geolocation-not-showing.page:35(p)
+#: 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."
@@ -1959,7 +2112,7 @@ msgstr ""
"In diesem Fall wird Ihre Position nicht übermittelt, aber Sie sind weiterhin "
"in der Lage, die Position Ihrer Kontakte zu sehen."
-#: C/geolocation-not-showing.page:39(p)
+#: 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."
@@ -1967,33 +2120,33 @@ msgstr ""
"Zum Übermitteln Ihrer geografischen Position können Sie ein externes Gerät "
"verwenden, wie beispielsweise ein GPS-Gerät."
-#: C/geolocation-not-showing.page:45(p)
+#: 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."
+"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 ""
"Um Ihre geografische Position übermitteln zu können, muss Ihr Jabber-Server "
-"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link "
-"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit "
-"PEP-Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
+"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link href="
+"\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit PEP-"
+"Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
"dieses Funktionsmerkmal derzeit nicht."
#: C/geolocation.page:8(desc)
msgid "Use and understand geolocation in <app>Empathy</app>."
msgstr "Benutzung von und Erläuterungen zur Geoposition in <gui>Empathy</gui>."
-#: C/geolocation.page:29(title)
+#: C/geolocation.page:32(title)
msgid "Geographical position"
msgstr "Die geografische Position"
-#: C/geolocation.page:32(title)
+#: C/geolocation.page:35(title)
msgid "Geolocation"
msgstr "Geoposition"
-#: C/geolocation.page:36(title)
+#: C/geolocation.page:39(title)
msgid "Fix common problems"
msgstr "Behebung häufig auftretender Probleme"
@@ -2001,77 +2154,77 @@ msgstr "Behebung häufig auftretender Probleme"
msgid "Set, join and manage favorite rooms."
msgstr "Einrichten, Betreten und Verwalten bevorzugter Räume."
-#: C/favorite-rooms.page:25(title)
+#: C/favorite-rooms.page:29(title)
msgid "Favorite rooms"
msgstr "Bevorzugte Räume"
-#: C/favorite-rooms.page:28(title)
+#: C/favorite-rooms.page:32(title)
msgid "Set a room as a favorite"
msgstr "Einen Raum als bevorzugt einrichten"
-#: C/favorite-rooms.page:31(p)
+#: C/favorite-rooms.page:35(p)
msgid "Join a room."
msgstr "Betreten eines Raumes."
-#: C/favorite-rooms.page:36(p)
+#: C/favorite-rooms.page:40(p)
msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an IRC "
+"room."
msgstr ""
"In <link xref=\"irc-join-room\"/> finden Sie weitere Informationen über das "
"Betreten eines Raumes im IRC."
-#: C/favorite-rooms.page:42(p)
+#: C/favorite-rooms.page:46(p)
msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"See <link xref=\"group-conversations\"/> for more information on how to start "
+"or join a group conversation."
msgstr ""
-"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen "
-"über das Starten oder Teilnehmen an einer Gruppenunterhaltung."
+"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen über "
+"das Starten oder Teilnehmen an einer Gruppenunterhaltung."
-#: C/favorite-rooms.page:50(p)
+#: C/favorite-rooms.page:54(p)
msgid ""
"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chatroom</gui></guiseq>."
+"gui><gui>Favorite Chat Room</gui></guiseq>."
msgstr ""
"Wählen Sie im Unterhaltungsfenster <guiseq><gui>Unterhaltung</"
"gui><gui>Favorisierter Chatraum</gui></guiseq>."
-#: C/favorite-rooms.page:59(title)
+#: C/favorite-rooms.page:63(title)
msgid "Join favorite rooms"
msgstr "Betreten bevorzugter Räume"
-#: C/favorite-rooms.page:67(p)
+#: C/favorite-rooms.page:71(p)
msgid "Press <key>F5</key>."
msgstr "Drücken Sie <key>F5</key>."
-#: C/favorite-rooms.page:72(p)
+#: C/favorite-rooms.page:76(p)
msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all "
+"your favorite rooms."
msgstr ""
"Wählen Sie <guiseq><gui>Raum</gui><gui>Favoriten betreten</gui></guiseq>, um "
"alle Ihre bevorzugten Räume zu betreten."
-#: C/favorite-rooms.page:78(p)
+#: C/favorite-rooms.page:82(p)
msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
msgstr ""
"Wählen Sie <gui>Raum</gui>, und wählen Sie den bevorzugten Raum aus, den Sie "
"betreten wollen."
-#: C/favorite-rooms.page:86(p)
+#: C/favorite-rooms.page:90(p)
msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
+"To join a favorite room, you need to be connected to the Internet and to your "
+"account."
msgstr ""
"Um einen bevorzugten Raum zu betreten, müssen Sie mit dem Internet und mit "
"Ihrem Konto verbunden sein."
-#: C/favorite-rooms.page:94(title)
+#: C/favorite-rooms.page:98(title)
msgid "Manage favorite rooms"
msgstr "Raumfavoriten verwalten"
-#: C/favorite-rooms.page:97(p)
+#: C/favorite-rooms.page:101(p)
msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
"gui><gui>Manage Favorites</gui></guiseq>."
@@ -2079,37 +2232,37 @@ msgstr ""
"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
"gui><gui>Favoriten verwalten</gui></guiseq>."
-#: C/favorite-rooms.page:103(p)
+#: 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 ""
-"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
-"dessen bevorzugte Räume Sie verwalten wollen."
+"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, dessen "
+"bevorzugte Räume Sie verwalten wollen."
-#: C/favorite-rooms.page:107(p)
+#: C/favorite-rooms.page:111(p)
msgid "Select <gui>All</gui> to see all you favorite rooms."
msgstr "Wählen Sie <gui>Alle</gui>, um alle Ihre bevorzugten Räume zu sehen."
-#: C/favorite-rooms.page:112(p)
+#: C/favorite-rooms.page:116(p)
msgid "Select the favorite room you want to manage:"
msgstr "Wählen Sie den bevorzugten Raum, den Sie verwalten wollen:"
-#: C/favorite-rooms.page:117(p)
+#: 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 ""
-"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum "
-"immer dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
+"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum immer "
+"dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
-#: C/favorite-rooms.page:123(p)
+#: C/favorite-rooms.page:127(p)
msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
msgstr ""
"Klicken Sie auf <gui>Entfernen</gui>, um den Raum aus Ihren bevorzugten "
"Räumen zu entfernen."
-#: C/favorite-rooms.page:130(p)
+#: C/favorite-rooms.page:134(p)
msgid "When done, click <gui>Close</gui>."
msgstr "Sobald Sie fertig sind, klicken Sie auf <gui>Schließen</gui>."
@@ -2119,11 +2272,11 @@ msgstr ""
"app>Empathy</app> daran hindern, die Verbindung zu einem Konto automatisch "
"herzustellen."
-#: C/disable-account.page:35(title)
+#: C/disable-account.page:39(title)
msgid "Disable an account"
msgstr "Deaktivieren eines Kontos"
-#: C/disable-account.page:37(p)
+#: 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-"
@@ -2133,10 +2286,10 @@ msgstr ""
"Sie können ein Konto deaktivieren, um zu verhindern, dass <app>Empathy</app> "
"sich an diesem Konto anmeldet. Das Konto wird dabei nicht völlig entfernt. "
"Vielleicht wollen Sie ein Konto deaktivieren und erneut aktivieren, wenn Sie "
-"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für "
-"andere Konten nutzen wollen."
+"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für andere "
+"Konten nutzen wollen."
-#: C/disable-account.page:48(p)
+#: 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."
@@ -2144,37 +2297,30 @@ msgstr ""
"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
"linken Seite des Dialogs aus."
-#: C/disable-account.page:52(p)
+#: C/disable-account.page:56(p)
msgid ""
"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window. This option is after your primary account details, but before any "
-"advanced settings."
+"window."
msgstr ""
"Entfernen Sie die Markierung von <gui style=\"checkbox\">Aktiviert</gui> an "
-"der rechten Seite des Fensters. Diese Option befindet sich hinter Ihren "
-"primären Kontendetails, aber vor den fortgeschrittenen Einstellungen."
-
-#: C/disable-account.page:57(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
+"der rechten Seite des Fensters."
-#: C/disable-account.page:63(p)
+#: C/disable-account.page:62(p)
msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui> and click <gui>Apply</gui>."
+"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
msgstr ""
"Um das Konto erneut zu aktivieren, wählen Sie <gui style=\"checkbox"
-"\">Aktiviert</gui> und klicken anschließend auf <gui>Anwenden</gui>."
+"\">Aktiviert</gui>."
#: C/create-account.page:9(desc)
msgid "Register for an account with one of the supported messaging services."
msgstr "Ein Konto bei einem der unterstützten Nachrichtendienste registrieren."
-#: C/create-account.page:29(title)
+#: C/create-account.page:32(title)
msgid "Register for a new account"
msgstr "Ein neues Konto registrieren"
-#: C/create-account.page:31(p)
+#: C/create-account.page:34(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
@@ -2182,40 +2328,40 @@ msgid ""
"app> to register for a new account, using the same steps as you would to "
"<link xref=\"add-account\">add an account</link>."
msgstr ""
-"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei "
-"einem Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-"
-"Anwendungen wie <gui>Empathy</gui> verbinden können. Für einige "
-"Kontenanbieter können Sie <gui>Empathy</gui> verwenden, um ein neues Konto "
-"zu registrieren, unter Anwendung der gleichen Schritte wie für das <link "
-"xref=\"add-account\">Hinzufügen eines Kontos</link>."
+"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei einem "
+"Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-Anwendungen "
+"wie <gui>Empathy</gui> verbinden können. Für einige Kontenanbieter können Sie "
+"<gui>Empathy</gui> verwenden, um ein neues Konto zu registrieren, unter "
+"Anwendung der gleichen Schritte wie für das <link xref=\"add-account"
+"\">Hinzufügen eines Kontos</link>."
-#: C/create-account.page:37(p)
+#: C/create-account.page:40(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 with "
-"<app>Empathy</app>."
+"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 with <app>Empathy</"
+"app>."
msgstr ""
"Diese Seite stellt für die verschiedenen Kontentypen Informationen über das "
"Anlegen eines neuen Kontos bereit. Sie sollten von Ihrem Dienstanbieter eine "
"Anmeldekennung und ein Passwort sowie eventuelle zusätzliche Informationen "
"erhalten haben, die Sie zum Verbinden mit <gui>Empathy</gui> benötigen."
-#: C/create-account.page:42(title) C/audio-video.page:161(p)
+#: C/create-account.page:45(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
-#: C/create-account.page:44(p)
+#: C/create-account.page:47(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 ist ein offenes Sofortnachrichtensystem. Wie E-Mail, erlaubt Jabber "
-"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen "
-"Jabber-Benutzern, unabhängig von deren Konto-Dienstanbietern."
+"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen Jabber-"
+"Benutzern, unabhängig von deren Konto-Dienstanbietern."
-#: C/create-account.page:48(p)
+#: C/create-account.page:51(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."
@@ -2225,22 +2371,21 @@ msgstr ""
"anlegen. Es gibt zahlreiche freie Jabber-Dienstanbieter, einer der "
"populärsten ist <link href=\"http://register.jabber.org/\">Jabber.org</link>."
-#: C/create-account.page:53(p)
+#: C/create-account.page:56(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 ""
-"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein "
-"Jabber-Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre "
-"Google Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die "
-"Verbindung."
+"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein Jabber-"
+"Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre Google "
+"Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die Verbindung."
-#: C/create-account.page:60(title) C/audio-video.page:181(p)
+#: C/create-account.page:63(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Personen in der Nähe"
-#: C/create-account.page:62(p)
+#: C/create-account.page:65(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, "
@@ -2250,18 +2395,18 @@ msgstr ""
"Sie müssen kein Konto bei einem Dienstanbieter anlegen, um dieses "
"Funktionsmerkmal nutzen zu können. Dieser Dienst ist immer dann verfügbar, "
"wenn Sie mit einem lokalen Netzwerk verbunden sind, zum Beispiel einem "
-"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst "
-"nutzen, werden im Netzwerk automatisch gefunden."
+"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst nutzen, "
+"werden im Netzwerk automatisch gefunden."
-#: C/create-account.page:67(p)
+#: C/create-account.page:70(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr "Weitere Informationen finden Sie in <link xref=\"salut-protocol\"/>."
-#: C/create-account.page:71(title) C/audio-video.page:196(p)
+#: C/create-account.page:74(title) C/audio-video.page:205(p)
msgid "SIP"
msgstr "SIP"
-#: C/create-account.page:73(p)
+#: C/create-account.page:76(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 "
@@ -2270,10 +2415,10 @@ msgid ""
msgstr ""
"SIP ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
"Internet. Sie müssen ein SIP-Konto bei einem Dienstanbieter erstellen. "
-"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie "
-"mit allen anderen SIP-Benutzern kommunizieren."
+"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie mit "
+"allen anderen SIP-Benutzern kommunizieren."
-#: C/create-account.page:78(p)
+#: C/create-account.page:81(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?"
@@ -2283,7 +2428,7 @@ msgstr ""
"<link href=\"https://signup.sipphone.com/new-users/app?class=NewUser;"
"proc=start\">Sipphone</link>."
-#: C/create-account.page:83(p)
+#: C/create-account.page:86(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 "
@@ -2293,33 +2438,33 @@ msgstr ""
"net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
"<app>Empathy</app>."
-#: C/create-account.page:88(p)
+#: C/create-account.page:91(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 ""
-"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche "
-"Telefone anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu "
-"bezahlenden Dienst registrieren müssen."
+"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche Telefone "
+"anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu bezahlenden "
+"Dienst registrieren müssen."
-#: C/create-account.page:93(title) C/audio-video.page:156(p)
+#: C/create-account.page:96(title) C/audio-video.page:165(p)
msgid "IRC"
msgstr "IRC"
-#: C/create-account.page:95(p)
+#: C/create-account.page:98(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 "
+"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 ""
-"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie "
-"beim Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen "
-"angeben, wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau "
-"festgelegt. Falls aber ein anderer Benutzer diesen Spitznamen verwendet, "
-"müssen Sie einen neuen wählen."
+"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie beim "
+"Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen angeben, "
+"wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau festgelegt. "
+"Falls aber ein anderer Benutzer diesen Spitznamen verwendet, müssen Sie einen "
+"neuen wählen."
-#: C/create-account.page:100(p)
+#: C/create-account.page:103(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
"thier nicknames. See <link xref=\"irc-nick-password\"/> for more information."
@@ -2328,7 +2473,7 @@ msgstr ""
"Spitznamen zu schützen. Weitere Informationen finden Sie in <link xref=\"irc-"
"nick-password\"/>."
-#: C/create-account.page:103(p)
+#: C/create-account.page:106(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."
@@ -2337,11 +2482,11 @@ msgstr ""
"eine Verbindung zu diesen Servern herzustellen. Im Allgemeinen sind dies "
"private IRC-Netzwerke."
-#: C/create-account.page:108(title)
+#: C/create-account.page:111(title)
msgid "Proprietary Services"
msgstr "Proprietäre Dienste"
-#: C/create-account.page:110(p)
+#: C/create-account.page:113(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2356,19 +2501,19 @@ msgstr ""
"anzulegen, besuchen Sie bitte die Webseite des jeweiligen Anbieters. "
"Bestätigen Sie dort die Nutzungsbedingungen."
-#: C/create-account.page:119(link) C/audio-video.page:131(p)
+#: C/create-account.page:122(link) C/audio-video.page:135(p)
msgid "AIM"
msgstr "AIM"
-#: C/create-account.page:124(link) C/audio-video.page:151(p)
+#: C/create-account.page:127(link) C/audio-video.page:160(p)
msgid "ICQ"
msgstr "ICQ"
-#: C/create-account.page:129(link) C/audio-video.page:166(p)
+#: C/create-account.page:132(link) C/audio-video.page:175(p)
msgid "MSN"
msgstr "MSN"
-#: C/create-account.page:134(link) C/audio-video.page:201(p)
+#: C/create-account.page:137(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
@@ -2377,11 +2522,11 @@ msgid "Change your status to advertise your availability to your contacts."
msgstr ""
"Ändern des Status, um Ihre Kontakte über Ihre Verfügbarkeit zu informieren."
-#: C/change-status.page:31(title)
+#: C/change-status.page:34(title)
msgid "Change your status"
msgstr "Ändern Ihres Status"
-#: C/change-status.page:33(p)
+#: 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."
@@ -2390,40 +2535,40 @@ msgstr ""
"anzuzeigen. <app>Empathy</app> ermöglicht Ihnen, aus einer Liste "
"vordefinierter Status zu wählen."
-#: C/change-status.page:38(p)
+#: C/change-status.page:41(p)
msgid ""
"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
msgstr ""
"Klicken Sie auf die Auswahlliste oben im <gui>Kontaktlisten</gui>-Fenster."
-#: C/change-status.page:43(p)
+#: C/change-status.page:46(p)
msgid "Select a status from the list."
msgstr "Wählen Sie einen Status in der Liste aus."
-#: C/change-status.page:49(p)
+#: 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."
+"status messages</link> to provide more information about your availability to "
+"your contacts."
msgstr ""
"In <link xref=\"status-icons\"/> finden Sie eine Liste mitgelieferter Status "
"sowie deren Bedeutung. Sie können auch <link xref=\"set-custom-message"
-"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre "
-"Kontakte weitere Informationen über Ihren Status bereitzustellen."
+"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre Kontakte "
+"weitere Informationen über Ihren Status bereitzustellen."
-#: C/change-status.page:55(p)
+#: 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."
+"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 ""
"Falls Sie Ihren Rechner für eine gewisse Zeit nicht bedienen oder der "
-"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf "
-"abwesend gesetzt."
+"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf abwesend "
+"gesetzt."
#. 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:54(None) C/audio-call.page:43(None)
+#: C/audio-video.page:58(None) C/audio-call.page:47(None)
msgid ""
"@@image: 'figures/audio-input-microphone.png'; "
"md5=8d89026b66a263a3bc5b1f0665948567"
@@ -2435,14 +2580,14 @@ msgid ""
msgstr ""
"Informationen über die Möglichkeiten für Audio- und Video-Unterhaltungen."
-#: C/audio-video.page:28(title)
-msgid "Audio and Video Support"
+#: C/audio-video.page:32(title)
+msgid "Audio and video support"
msgstr "Audio- und Video-Unterstützung"
-#: C/audio-video.page:30(p)
+#: 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 "
+"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 ""
@@ -2451,39 +2596,39 @@ msgstr ""
"Wenn Ihre Kontakte Audio- oder Video-Unterhaltungen unterstützen, werden "
"neben deren Namen in der Kontaktliste folgende Symbole angezeigt:"
-#: C/audio-video.page:39(p)
+#: C/audio-video.page:43(p)
msgid "Icon"
msgstr "Symbol"
-#: C/audio-video.page:44(p)
+#: C/audio-video.page:48(p)
msgid "Description"
msgstr "Beschreibung"
-#: C/audio-video.page:54(media)
+#: C/audio-video.page:58(media)
msgid "Icon for audio conversation"
msgstr "Symbol für Audio-Unterhaltung"
-#: C/audio-video.page:60(p)
+#: C/audio-video.page:64(p)
msgid "The contact is able to have an audio conversation."
msgstr "Der Kontakt kann eine Audio-Unterhaltung führen."
-#: C/audio-video.page:66(media)
+#: C/audio-video.page:70(media)
msgid "Icon for video conversation"
msgstr "Symbol für Video-Unterhaltung"
-#: C/audio-video.page:72(p)
+#: C/audio-video.page:76(p)
msgid "The contact is able to have a video conversation."
msgstr "Der Kontakt kann eine Video-Unterhaltung führen."
-#: C/audio-video.page:79(p)
+#: 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."
+"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 ""
"Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
"Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
-#: C/audio-video.page:83(p)
+#: 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."
@@ -2491,22 +2636,21 @@ msgstr ""
"Um eine Video-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
"Betriebssystem unterstützte Webcam sowie ein funktionierendes Mikrofon."
-#: C/audio-video.page:91(title)
+#: C/audio-video.page:95(title)
msgid "Supported Account Types"
msgstr "Unterstützte Kontentypen"
-#: C/audio-video.page:93(p)
+#: 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 ""
-"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen "
-"führen, welche die entsprechenden Dienste unterstützen. In der folgenden "
-"Tabelle wird für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt "
-"werden."
+"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen führen, "
+"welche die entsprechenden Dienste unterstützen. In der folgenden Tabelle wird "
+"für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt werden."
-#: C/audio-video.page:98(p)
+#: 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 "
@@ -2514,24 +2658,24 @@ msgid ""
"are listed as unsupported here."
msgstr ""
"Kontentypen werden durch Plugins bereitgestellt. Auf Ihrem System könnten "
-"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen "
-"verfügbaren Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins "
-"könnte es möglich sein, dass hier als nicht unterstützte Typen aufgelistete "
-"Konten dennoch Audio- und Video-Unterhaltungen ermöglichen."
+"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen verfügbaren "
+"Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins könnte es "
+"möglich sein, dass hier als nicht unterstützte Typen aufgelistete Konten "
+"dennoch Audio- und Video-Unterhaltungen ermöglichen."
-#: C/audio-video.page:106(p)
+#: 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 "
+"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 ""
"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 "
+"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."
-#: C/audio-video.page:114(p)
+#: 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 "
@@ -2543,69 +2687,74 @@ msgstr ""
"follow the Gnome release schedule, I can't be sure. If it looks like it's "
"going to ship, let's mark it Yes."
-#: C/audio-video.page:124(p)
+#: C/audio-video.page:128(p)
msgid "Service"
msgstr "Dienst"
-#: C/audio-video.page:125(p)
+#: C/audio-video.page:129(p)
msgid "Audio"
msgstr "Audio"
-#: C/audio-video.page:126(p)
+#: C/audio-video.page:130(p)
msgid "Video"
msgstr "Video"
-#: C/audio-video.page:132(p) C/audio-video.page:133(p)
-#: C/audio-video.page:137(p) C/audio-video.page:138(p)
-#: C/audio-video.page:147(p) C/audio-video.page:148(p)
-#: C/audio-video.page:152(p) C/audio-video.page:153(p)
-#: C/audio-video.page:157(p) C/audio-video.page:158(p)
-#: C/audio-video.page:172(p) C/audio-video.page:173(p)
-#: C/audio-video.page:177(p) C/audio-video.page:178(p)
-#: C/audio-video.page:182(p) C/audio-video.page:183(p)
-#: C/audio-video.page:187(p) C/audio-video.page:188(p)
-#: C/audio-video.page:192(p) C/audio-video.page:193(p)
-#: C/audio-video.page:202(p) C/audio-video.page:203(p)
-#: C/audio-video.page:207(p) C/audio-video.page:208(p)
+#: 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 "Nein"
-#: C/audio-video.page:136(p)
+#: C/audio-video.page:140(p)
+msgid "Facebook Chat"
+msgstr "Facebook-Unterhaltung"
+
+#: C/audio-video.page:145(p)
msgid "gadugadu"
msgstr "gadugadu"
-#: C/audio-video.page:141(p)
+#: C/audio-video.page:150(p)
msgid "Google Talk"
msgstr "Google Talk"
-#: C/audio-video.page:142(p) C/audio-video.page:143(p)
-#: C/audio-video.page:162(p) C/audio-video.page:163(p)
-#: C/audio-video.page:167(p) C/audio-video.page:168(p)
-#: C/audio-video.page:197(p) C/audio-video.page:198(p)
+#: 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 "Ja"
-#: C/audio-video.page:146(p)
+#: C/audio-video.page:155(p)
msgid "Groupwise"
msgstr "Groupwise"
-#: C/audio-video.page:171(p)
+#: C/audio-video.page:180(p)
msgid "myspace"
msgstr "myspace"
-#: C/audio-video.page:176(p)
+#: C/audio-video.page:185(p)
msgid "qq"
msgstr "qq"
-#: C/audio-video.page:186(p)
+#: C/audio-video.page:195(p)
msgid "sametime"
msgstr "gleichzeitig"
-#: C/audio-video.page:191(p)
+#: C/audio-video.page:200(p)
msgid "silc"
msgstr "silc"
-#: C/audio-video.page:206(p)
+#: C/audio-video.page:215(p)
msgid "zephyr"
msgstr "zephyr"
@@ -2613,76 +2762,74 @@ msgstr "zephyr"
msgid "Call your contacts over the Internet."
msgstr "Ihre Kontakte über das Internet anrufen."
-#: C/audio-call.page:29(title)
+#: C/audio-call.page:33(title)
msgid "Start an audio conversation"
msgstr "Eine Audio-Unterhaltung starten"
-#: C/audio-call.page:31(p)
+#: C/audio-call.page:35(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."
+"features only works with certain types of accounts, and it requires the other "
+"person to have an application that supports audio calls."
msgstr ""
"Sie können Ihre Kontakte anrufen und eine Audio-Unterhaltung mit ihnen "
"führen. Dieses Funktionsmerkmal unterstützt verschiedene Kontentypen. "
"Weiterhin ist es erforderlich, dass die anzurufende Person über eine "
"Anwendung verfügt, die Audio-Anrufe unterstützt."
-#: C/audio-call.page:37(p)
-msgid "Link to A/V support matrix"
-msgstr "Link to A/V support matrix"
-
-#: C/audio-call.page:42(p)
+#: C/audio-call.page:46(p)
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. Alternatively, "
-"right click the contact and choose <gui>Audio Call</gui>."
+"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 ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\">Audioanruf</"
-"media>-Symbol neben dem Namen des Kontakts, den Sie anrufen wollen. "
-"Alternativ klicken Sie mit der rechten Maustaste auf den Kontakt und wählen "
-"Sie <gui>Audioanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">Audioanruf</"
+"media>-Symbol neben dem Namen des Kontakts, den Sie anrufen wollen und wählen "
+"Sie <gui style=\"menuitem\">Audioanruf</gui>. Alternativ klicken Sie mit der "
+"rechten Maustaste auf den Kontakt und wählen Sie <gui style=\"menuitem"
+"\">Audioanruf</gui>."
-#: C/audio-call.page:57(p)
+#: C/audio-call.page:61(p)
msgid ""
-"To turn an audio conversation into a video conversation, choose "
-"<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the <media "
-"type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</"
-"media> toolbar button to select it."
+"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 ""
-"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui>Anruf</gui><gui>Video senden</gui></guiseq> oder klicken "
-"Sie auf den <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">Videoanruf</media>-Knopf in der Werkzeugleiste, um dies "
-"auszuwählen."
+"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video ein</"
+"gui></guiseq> oder klicken Sie auf den <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/camera-web.png\">Videoanruf</media>-Knopf in der "
+"Werkzeugleiste, um dies auszuwählen."
#: C/add-contact.page:9(desc)
msgid "Add someone to the contact list."
msgstr "Jemanden zur Kontaktliste hinzufügen."
-#: C/add-contact.page:30(title)
+#: C/add-contact.page:33(title)
msgid "Add someone to your list of contacts"
msgstr "Jemanden zu Ihrer Kontaktliste hinzufügen"
-#: C/add-contact.page:34(p)
+#: C/add-contact.page:37(p)
msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
msgstr ""
"Wählen Sie <guiseq><gui>Unterhaltung</gui><gui>Kontakt hinzufügen</gui></"
"guiseq>."
-#: C/add-contact.page:37(p)
+#: 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 ""
"Wählen Sie in der <gui>Konten</gui>-Auswahlliste das Konto aus, mit dem Sie "
-"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr "
-"Kontakt den gleichen Dienst verwendet, den Sie hier angeben."
+"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr Kontakt "
+"den gleichen Dienst verwendet, den Sie hier angeben."
-#: C/add-contact.page:42(p)
+#: 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."
@@ -2691,24 +2838,24 @@ msgstr ""
"Benutzernamen, den angezeigten Namen oder andere entsprechende "
"Identifizierungsmerkmale für den Diensttyp Ihre Kontakts ein."
-#: C/add-contact.page:46(p)
+#: 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 ""
-"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie "
-"er in der Kontaktliste erscheinen soll."
+"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie er "
+"in der Kontaktliste erscheinen soll."
-#: C/add-contact.page:50(p)
+#: C/add-contact.page:53(p)
msgid "Click <gui>Add</gui> to add the person to your list of contacts."
msgstr ""
"Klicken Sie auf <gui>Hinzufügen</gui>, um die Person zu Ihrer Kontaktliste "
"hinzuzufügen."
-#: C/add-contact.page:58(p)
+#: 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."
+"To add a new person to your list of contacts, you need to be connected to the "
+"Internet and to your account."
msgstr ""
"Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
"Internet und mit Ihrem Konto verbunden sein."
@@ -2717,16 +2864,16 @@ msgstr ""
msgid "Add a new account to <app>Empathy</app>."
msgstr "Einen neuen Kontakt zu <app>Empathy</app> hinzufügen."
-#: C/add-account.page:34(title)
+#: C/add-account.page:38(title)
msgid "Add a new account"
msgstr "Hinzufügen eines neuen Kontos"
-#: C/add-account.page:36(p)
+#: C/add-account.page:40(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\"/>."
+"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 ""
"Sie können Sofortnachrichten-Konten für jeden unterstützten Dienst anlegen, "
"um mit allen Ihren Kontakten in <app>Empathy</app> zu kommunizieren. Für "
@@ -2734,74 +2881,48 @@ msgstr ""
"eines neuen Kontos. Weitere Details hierzu finden Sie in <link xref=\"create-"
"account\"/>."
-#: C/add-account.page:47(p)
-msgid "Click the <gui style=\"button\">Add</gui> button."
-msgstr "Klicken Sie auf den <gui style=\"button\">Hinzufügen</gui>-Knopf."
+#: C/add-account.page:51(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Hinzufügen</gui>."
-#: C/add-account.page:50(p)
+#: C/add-account.page:56(p)
msgid ""
-"From the <gui>Add new</gui> drop-down list, select the type of account you "
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
"wish to add."
msgstr ""
-"Aus der <gui>Neu hinzufügen</gui>-Aufklappliste wählen Sie den Kontentyp, "
-"welchen Sie hinzufügen wollen."
+"Aus der <gui>Protokoll</gui>-Aufklappliste wählen Sie den Kontentyp, welchen "
+"Sie hinzufügen wollen."
-#: C/add-account.page:54(p)
+#: C/add-account.page:60(p)
msgid ""
"If you do not already have a registered account, select <gui>Create a new "
-"account</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."
+"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 ""
"Falls Sie noch kein Konto registriert haben, wählen Sie <gui>Ein neues Konto "
-"anlegen</gui>. Dieses Funktionsmerkmal ist nicht für alle Kontentypen "
-"verfügbar und funktioniert möglicherweise nicht mit allen Dienstanbietern. "
-"Weitere Informationen hierzu finden Sie in <link xref=\"create-account\"/>."
-
-#: C/add-account.page:59(p)
-msgid "Click <gui>Create</gui>."
-msgstr "Klicken Sie auf <gui>Anlegen</gui>."
+"auf dem Server anlegen</gui>. Dieses Funktionsmerkmal ist nicht für alle "
+"Kontentypen verfügbar und funktioniert möglicherweise nicht mit allen "
+"Dienstanbietern. Weitere Informationen hierzu finden Sie in <link xref="
+"\"create-account\"/>."
-#: C/add-account.page:62(p)
+#: C/add-account.page:65(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."
+"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 ""
"Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die "
"Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten "
"könnten zusätzliche Angaben erfordern. Weitere Informationen hierzu finden "
"Sie in <link xref=\"accounts-window#details\"/>."
-#: C/add-account.page:67(p)
-msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
-msgstr ""
-"Klicken Sie auf <gui style=\"button\">Verbinden</gui>, um das neue Konto zu "
-"aktivieren."
-
-#: C/add-account.page:73(p)
-msgid ""
-"If you close the <gui>Accounts</gui> window without clicking <gui>Connect</"
-"gui>, the entire account will be lost, and you will need to create it again."
-msgstr ""
-"Falls Sie das <gui>Konten</gui>-Fenster schließen, ohne auf <gui>Verbinden</"
-"gui> zu klicken, geht das gesamte Konto verloren, und Sie werden es erneut "
-"anlegen müssen."
-
-#: C/add-account.page:76(p)
-msgid ""
-"If you select another account without clicking <gui>Connect</gui>, any "
-"information you have entered will be lost."
-msgstr ""
-"Falls Sie ein anderes Konto auswählen, ohne auf <gui>Verbinden</gui> zu "
-"klicken, gehen jegliche von Ihnen eingegebene Informationen verloren."
-
-#: C/add-account.page:83(p)
+#: C/add-account.page:77(p)
msgid ""
-"To change the name the identifies the account in the <gui>Accounts</gui> "
+"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."
+"name or press the space bar. Edit the account name and press <key>Enter</key> "
+"when you’re finished."
msgstr ""
"Um den Namen zu ändern, der das Konto im <gui>Konten</gui>-Fenster "
"identifiziert, wählen Sie das Konto aus der linken Liste aus und klicken Sie "
@@ -2813,23 +2934,22 @@ msgstr ""
msgid "Add, modify, and delete accounts."
msgstr "Hinzufügen, Bearbeiten und Entfernen von Konten."
-#: C/accounts-window.page:30(title)
+#: C/accounts-window.page:33(title)
msgid "Accounts Window"
msgstr "Konten-Fenster"
-#: C/accounts-window.page:32(p)
+#: C/accounts-window.page:35(p)
msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
msgstr ""
"Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
"Entfernen von Kontakten."
-#: C/accounts-window.page:40(title)
+#: C/accounts-window.page:43(title)
msgid "Account Details"
msgstr "Kontendetails"
-#: C/accounts-window.page:41(p)
+#: 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 "
@@ -2839,34 +2959,30 @@ msgstr ""
"Passwort eingeben. Bestimmte Konten oder Kontentypen könnten allerdings "
"weitere Informationen erfordern."
-#. <copyright>
-#. <year>2009</year>
-#. <name>GNOME Documentation Project</name>
-#. </copyright>
-#: C/account-jabber.page:22(desc)
+#: C/account-jabber.page:7(desc)
msgid "Advanced options for Jabber and Google Talk accounts."
msgstr "Fortgeschrittene Optionen für Konten bei Jabber und Google Talk."
-#: C/account-jabber.page:26(title)
+#: C/account-jabber.page:29(title)
msgid "Jabber Account Details"
msgstr "Jabber-Kontendetails"
-#: C/account-jabber.page:28(p)
+#: 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 "
+"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 ""
"Die meisten Jabber-Konten erfordern nur eine Anmeldekennung und ein Passwort "
-"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können "
-"Sie zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> "
-"eingeben. Normalerweise werden Sie die unten angegebenen zusätzlichen "
-"Optionen nicht benötigen. Allgemeine Informationen über das Hinzufügen eines "
-"Kontos finden Sie in <link xref=\"add-account\"/>."
+"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können Sie "
+"zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> eingeben. "
+"Normalerweise werden Sie die unten angegebenen zusätzlichen Optionen nicht "
+"benötigen. Allgemeine Informationen über das Hinzufügen eines Kontos finden "
+"Sie in <link xref=\"add-account\"/>."
-#: C/account-jabber.page:36(p)
+#: C/account-jabber.page:39(p)
msgid ""
"Google Talk is a type of Jabber account. These instructions hold for Google "
"Talk accounts as well."
@@ -2874,30 +2990,30 @@ msgstr ""
"Google Talk ist eine Art Jabber-Konto. Diese Anweisungen gelten daher auch "
"für Google Talk."
-#: C/account-jabber.page:42(gui)
+#: C/account-jabber.page:45(gui)
msgid "Encryption required (TLS/SSL)"
msgstr "Verschlüsselung erforderlich (TLS/SSL)"
-#: C/account-jabber.page:43(gui)
+#: C/account-jabber.page:46(gui)
msgid "Ignore SSL certificate errors"
msgstr "SSL-Zertifikat-Fehler ignorieren"
-#: C/account-jabber.page:44(p)
+#: 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 "
+"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 ""
-"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</"
-"app> und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation "
-"nicht möglich ist, können Nachrichten unverschlüsselt gesendet werden. "
-"Wählen Sie <gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation "
-"von <app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn "
-"Verschlüsselung nicht möglich ist."
+"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</app> "
+"und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation nicht "
+"möglich ist, können Nachrichten unverschlüsselt gesendet werden. Wählen Sie "
+"<gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation von "
+"<app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn Verschlüsselung "
+"nicht möglich ist."
-#: C/account-jabber.page:49(p)
+#: 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 "
@@ -2910,15 +3026,15 @@ msgstr ""
"Zertifikat-Fehler ignorieren</gui>, um verschlüsselte Kommunikation mit "
"ungültigen Zertifikaten allgemein zuzulassen."
-#: C/account-jabber.page:56(gui)
+#: C/account-jabber.page:59(gui)
msgid "Resource"
msgstr "Ressource"
-#: C/account-jabber.page:57(gui)
+#: C/account-jabber.page:60(gui)
msgid "Priority"
msgstr "Priorität"
-#: C/account-jabber.page:58(p)
+#: 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 "
@@ -2927,72 +3043,62 @@ msgid ""
msgstr ""
"Falls Sie über mehrere Anwendungen gleichzeitig mit Ihrem Konto verbunden "
"sind, beispielsweise von verschiedenen Rechnern aus, können Sie eine "
-"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen "
-"festlegen. Als Vorgabe verwendet <app>Empathy</gui> als Ressource "
-"<input>Telepathy</input>."
+"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen festlegen. "
+"Als Vorgabe verwendet <app>Empathy</gui> als Ressource <input>Telepathy</"
+"input>."
-#: C/account-jabber.page:62(p)
+#: 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."
+"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 ""
"Sie können die Priorität festlegen, um anzugeben, welche Anwendung die "
"eingehenden Nachrichten von Ihren Kontakten annehmen soll. Neue Nachrichten "
"werden dabei zu der Anwendung mit der höchsten Priorität gesendet."
-#: C/account-jabber.page:67(gui)
+#: C/account-jabber.page:70(gui)
msgid "Override server settings"
msgstr "Server-Einstellungen überschreiben"
-#: C/account-jabber.page:68(p)
+#: 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."
+"custom server settings manually. These settings should be provided for you by "
+"your Jabber provider."
msgstr ""
-"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum "
-"Jabber-Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server "
-"müssen Sie benutzerdefinierte Einstellungen manuell eingeben. Diese "
-"Einstellungen sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
-
-#. 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:101(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "a"
+"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum Jabber-"
+"Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server müssen "
+"Sie benutzerdefinierte Einstellungen manuell eingeben. Diese Einstellungen "
+"sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
#. 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:104(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
msgstr "a"
#. 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:107(None)
+#: C/account-irc.page:110(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr "a"
-#. <copyright>
-#. <year>2009</year>
-#. <name>GNOME Documentation Project</name>
-#. </copyright>
-#: C/account-irc.page:22(desc)
+#: C/account-irc.page:7(desc)
msgid "Additional information necessary for connecting to IRC networks."
msgstr ""
"Zusätzlich erforderliche Informationen für Verbindungen zu IRC-Netzwerken."
-#: C/account-irc.page:26(title)
+#: C/account-irc.page:29(title)
msgid "IRC Account Details"
msgstr "IRC-Kontendetails"
-#: C/account-irc.page:28(p)
+#: C/account-irc.page:31(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 "
+"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-Konten erfordern andere Informationen als die meisten anderen "
@@ -3000,73 +3106,72 @@ msgstr ""
"Netzwerk und einen Spitznamen angeben. Diese Seite erläutert die "
"Informationen, die Sie für ein IRC-Konto angeben können."
-#: C/account-irc.page:34(p)
+#: C/account-irc.page:37(p)
msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed in order to "
-"use IRC in <app>Empathy</app>."
+"You must have the <sys>telepathy-idle</sys> package installed in order to use "
+"IRC in <app>Empathy</app>."
msgstr ""
"Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
"in <app>Empathy</app> nutzen zu können."
-#: C/account-irc.page:40(gui) C/account-irc.page:115(gui)
+#: C/account-irc.page:43(gui) C/account-irc.page:118(gui)
msgid "Network"
msgstr "Netzwerk"
-#: C/account-irc.page:41(p)
+#: C/account-irc.page:44(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."
+"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 ist ein offenes System, welches Personen erlaubt, separate IRC-Netzwerke "
"zu betreiben. Jedes Netzwerk ist in sich abgeschlossen und hat seine eigenen "
"Benutzer und Unterhaltungsräume. <app>Empathy</app> listet die populärsten "
-"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können "
-"zusätzliche Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> "
-"nachfolgend."
+"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können zusätzliche "
+"Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> nachfolgend."
-#: C/account-irc.page:48(gui)
+#: C/account-irc.page:51(gui)
msgid "Nickname"
msgstr "Spitzname"
-#: C/account-irc.page:49(p)
+#: C/account-irc.page:52(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."
+"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 ""
"Ihr Spitzname ist Ihr eindeutiger Name im IRC-Netzwerk. Nur eine einzige "
-"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls "
-"Sie die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
+"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls Sie "
+"die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
"erhalten, müssen Sie Ihren Spitznamen ändern."
-#: C/account-irc.page:55(gui)
+#: C/account-irc.page:58(gui)
msgid "Password"
msgstr "Passwort"
-#: C/account-irc.page:56(p)
+#: C/account-irc.page:59(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."
+"connect. If you are authorized to use the network, the network administrators "
+"should provide you with a password."
msgstr ""
"Einige Server, insbesondere diejenigen in privaten Netzwerken, erfordern ein "
"Passwort für die Verbindung. Falls Sie legitimiert sind, das Netzwerk zu "
"benutzen, sollte Sie Ihnen dessen Verwalter ein Passwort zur Verfügung "
"gestellt haben."
-#: C/account-irc.page:60(title)
+#: C/account-irc.page:63(title)
msgid "NickServ Passwords"
msgstr "NickServ-Passwörter"
-#: C/account-irc.page:61(p)
+#: C/account-irc.page:64(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 "
+"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 ""
@@ -3077,24 +3182,24 @@ msgstr ""
"ermöglicht, sich mit diesem Feld bei NickServ zu identifizieren. Weitere "
"Details hierzu finden Sie in <link xref=\"irc-nick-password\"/>"
-#: C/account-irc.page:71(gui)
+#: C/account-irc.page:74(gui)
msgid "Real name"
msgstr "Realname"
-#: C/account-irc.page:72(p)
+#: C/account-irc.page:75(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."
+"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 ""
"Zusätzlich zu Ihrem Spitznamen können Sie auch Ihren echten Namen angeben. "
"Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
"Informationen betrachten."
-#: C/account-irc.page:76(gui)
+#: C/account-irc.page:79(gui)
msgid "Quit message"
msgstr "Verlassen-Nachricht"
-#: C/account-irc.page:77(p)
+#: C/account-irc.page:80(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 "
@@ -3105,61 +3210,61 @@ msgstr ""
"Benutzer, mit denen Sie eine private Unterhaltung führen. Verwenden Sie "
"dieses Feld, um eine benutzerdefinierte Nachricht bereitzustellen."
-#: C/account-irc.page:89(title)
+#: C/account-irc.page:92(title)
msgid "IRC Networks"
msgstr "IRC-Netzwerke"
-#: C/account-irc.page:92(title)
+#: C/account-irc.page:95(title)
msgid "Networks"
msgstr "Netzwerke"
-#: C/account-irc.page:94(p)
+#: C/account-irc.page:97(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."
+"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> enthält eine Liste populärer IRC-Netzwerke. Falls Sie ein "
-"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie "
-"können auch Netzwerke bearbeiten oder aus der Liste entfernen."
+"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie können "
+"auch Netzwerke bearbeiten oder aus der Liste entfernen."
-#: C/account-irc.page:99(p)
+#: C/account-irc.page:102(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 ""
-"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
+"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
"\">Hinzufügen</media>."
-#: C/account-irc.page:102(p)
+#: C/account-irc.page:105(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>."
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height="
+"\"16\">Edit</media>."
msgstr ""
-"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
-"width=\"16\" height=\"16\">Bearbeiten</media>."
+"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
+"\"16\" height=\"16\">Bearbeiten</media>."
-#: C/account-irc.page:105(p)
+#: C/account-irc.page:108(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 ""
-"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
-"width=\"16\" height=\"16\">Entfernen</media>."
+"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width="
+"\"16\" height=\"16\">Entfernen</media>."
-#: C/account-irc.page:110(p)
+#: C/account-irc.page:113(p)
msgid ""
"When adding or modifying a network, you can enter the following information:"
msgstr ""
"Beim Hinzufügen oder Ändern eines Netzwerks können Sie die folgenden "
"Informationen eingeben:"
-#: C/account-irc.page:116(p)
+#: C/account-irc.page:119(p)
msgid ""
"This is the name of the network as you want it to appear in the list of "
"networks."
@@ -3167,27 +3272,26 @@ msgstr ""
"Dies ist der Name des Netzwerks, so wie der in der Liste der Netzwerke "
"erscheinen soll."
-#: C/account-irc.page:120(gui)
+#: C/account-irc.page:123(gui)
msgid "Charset"
msgstr "Zeichensatz"
-#: C/account-irc.page:121(p)
+#: C/account-irc.page:124(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."
+"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 ""
"Dies legt die Zeichenkodierung fest, die typischerweise in diesem Netzwerk "
"verwendet wird. Eine Zeichenkodierung ist eine spezifische Art der internen "
"Aufzeichnung von Zeichen in einem Rechner. Es gibt zahlreiche "
-"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen "
-"Benutzer verwenden, damit deren Nachrichten korrekt angezeigt werden können."
+"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen Benutzer "
+"verwenden, damit deren Nachrichten korrekt angezeigt werden können."
#. Translators: Recommend character encodings that are common
-#. for your language.
-#: C/account-irc.page:130(p)
+#. for your language.
+#: C/account-irc.page:133(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 "
@@ -3198,11 +3302,11 @@ msgstr ""
"kann. Eine weitere häufig benutzte Kodierung für Englisch und andere "
"westliche Sprachen ist ISO-8859-1."
-#: C/account-irc.page:136(gui)
+#: C/account-irc.page:139(gui)
msgid "Servers"
msgstr "Server"
-#: C/account-irc.page:137(p)
+#: C/account-irc.page:140(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 "
@@ -3216,37 +3320,105 @@ msgstr ""
"<gui>Hinzufügen</gui> und <gui>Entfernen</gui> Server dieses Netzwerks "
"hinzufügen und entfernen."
-#: C/account-irc.page:142(p)
+#: C/account-irc.page:145(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 ""
-"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter "
-"<gui>Server</gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ "
-"verwenden Sie die linke und rechte Pfeiltaste, um das Feld zu fokussieren. "
-"Mit der Leertaste beginnen Sie mit der Bearbeitung."
+"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter <gui>Server</"
+"gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ verwenden Sie "
+"die linke und rechte Pfeiltaste, um das Feld zu fokussieren. Mit der "
+"Leertaste beginnen Sie mit der Bearbeitung."
-#: C/account-irc.page:146(p)
+#: C/account-irc.page:149(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 ""
"Aktivieren Sie das Ankreuzfeld in der <gui>SSL</gui>-Spalte, um jegliche "
-"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies "
-"andere Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was "
-"Sie in öffentlichen Unterhaltungsräumen schreiben."
+"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies andere "
+"Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was Sie in "
+"öffentlichen Unterhaltungsräumen schreiben."
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
msgstr ""
-"Mario Blättermann <mariobl@gnome.org>, 2008, 2009\n"
+"Mario Blättermann <mariobl@gnome.org>, 2008, 2009, 2010\n"
"Philipp Kerling <k.philipp@gmail.com>, 2008"
-#~ msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-#~ msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
+#~ msgid ""
+#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
+#~ "rooms."
+#~ msgstr ""
+#~ "Derzeit ist es nicht möglich, mit <app>Empathy</app> einen "
+#~ "passwortgeschützten Raum im IRC zu betreten."
+
+#~ msgid ""
+#~ "It is not currently possible to join a password-protected IRC chat room."
+#~ msgstr ""
+#~ "Derzeit ist es nicht möglich, einen passwortgeschützten Raum zu betreten."
+
+#~ msgid "See all of your contacts, even those that are not online."
+#~ msgstr "Sehen Sie alle Ihre Kontakte, auch wenn diese abgemeldet sind."
+
+#~ msgid ""
+#~ "As a special exception, the copyright holders give you permission to copy, "
+#~ "modify, and distribute the example code contained in this document under "
+#~ "the terms of your choosing, without restriction."
+#~ msgstr ""
+#~ "Als besondere Ausnahme geben Ihnen die Urheberrechtsinhaber die "
+#~ "Genehmigung, den in diesem Dokument enthaltenen Beispielcode ohne "
+#~ "Einschränkung unter den Bedingungen Ihrer Wahl zu verbreiten."
+
+#~ msgid "Hidden"
+#~ msgstr "Verborgen"
+
+#~ msgid "Click on the <gui>Edit Account</gui> button in the error message."
+#~ msgstr ""
+#~ "Klicken Sie auf den <gui>Konto bearbeiten</gui>-Knopf in der Fehlermeldung."
+
+#~ msgid ""
+#~ "In the case of an IRC account, type your nickname in the <gui>Nickname</"
+#~ "gui> text box."
+#~ msgstr ""
+#~ "Wenn es sich um ein IRC-Konto handelt, geben Sie Ihren Spitznamen in das "
+#~ "Textfeld <gui>Spitzname</gui> ein."
+
+#~ msgid "Click <gui>Apply</gui>."
+#~ msgstr "Klicken Sie auf <gui>Anwenden</gui>."
+
+#~ msgid "Link to A/V support matrix"
+#~ msgstr "Link to A/V support matrix"
+
+#~ msgid "Click the <gui style=\"button\">Add</gui> button."
+#~ msgstr "Klicken Sie auf den <gui style=\"button\">Hinzufügen</gui>-Knopf."
+
+#~ msgid "Click <gui>Create</gui>."
+#~ msgstr "Klicken Sie auf <gui>Anlegen</gui>."
+
+#~ msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
+#~ msgstr ""
+#~ "Klicken Sie auf <gui style=\"button\">Verbinden</gui>, um das neue Konto "
+#~ "zu aktivieren."
+
+#~ msgid ""
+#~ "If you close the <gui>Accounts</gui> window without clicking <gui>Connect</"
+#~ "gui>, the entire account will be lost, and you will need to create it "
+#~ "again."
+#~ msgstr ""
+#~ "Falls Sie das <gui>Konten</gui>-Fenster schließen, ohne auf "
+#~ "<gui>Verbinden</gui> zu klicken, geht das gesamte Konto verloren, und Sie "
+#~ "werden es erneut anlegen müssen."
+
+#~ msgid ""
+#~ "If you select another account without clicking <gui>Connect</gui>, any "
+#~ "information you have entered will be lost."
+#~ msgstr ""
+#~ "Falls Sie ein anderes Konto auswählen, ohne auf <gui>Verbinden</gui> zu "
+#~ "klicken, gehen jegliche von Ihnen eingegebene Informationen verloren."
#~ msgid "This work is licensed under a <placeholder-1/>."
#~ msgstr "Dieses Werk ist lizensiert unter einer <placeholder-1/>."
@@ -3624,8 +3796,8 @@ msgstr ""
#~ msgstr "Kontakt-ID:"
#~ msgid ""
-#~ "To start a text conversation, click on <placeholder-1/>; to start an "
-#~ "audio conversation, click on <placeholder-2/>."
+#~ "To start a text conversation, click on <placeholder-1/>; to start an audio "
+#~ "conversation, click on <placeholder-2/>."
#~ msgstr ""
#~ "Um eine Textunterhaltung zu beginnen, klicken Sie auf <placeholder-1/>, "
#~ "für eine Sprachunterhaltung klicken Sie auf <placeholder-2/>."
@@ -3660,16 +3832,16 @@ msgstr ""
#~ msgstr "Verwenden Sie dieses Symbol, wenn Sie nicht gestört werden wollen."
#~ msgid ""
-#~ "Use this icon when you are going away from the computer. This icon is "
-#~ "used also when you leave the computer and the screensaver turns on."
+#~ "Use this icon when you are going away from the computer. This icon is used "
+#~ "also when you leave the computer and the screensaver turns on."
#~ msgstr ""
-#~ "Verwenden Sie dieses Symbol, wenn Sie den Rechner verlassen. Dieses "
-#~ "Symbol wird ebenfalls verwendet, wenn Sie den Rechner verlassen und der "
+#~ "Verwenden Sie dieses Symbol, wenn Sie den Rechner verlassen. Dieses Symbol "
+#~ "wird ebenfalls verwendet, wenn Sie den Rechner verlassen und der "
#~ "Bildschirmschoner gestartet wird."
#~ msgid ""
-#~ "After removing an account you will not be able to recover it or to "
-#~ "recover the conversations you had."
+#~ "After removing an account you will not be able to recover it or to recover "
+#~ "the conversations you had."
#~ msgstr ""
#~ "Nach dem Entfernen eines Kontos sind Sie nicht mehr in der Lage, dieses "
#~ "Konto oder die geführten Unterhaltungen wiederherzustellen."
@@ -3718,9 +3890,9 @@ msgstr ""
#~ "channels may be configured to accept only registered nickname."
#~ msgstr ""
#~ "Das Registrieren eines Spitznamens ist nützlich, um Ihre Identität im IRC "
-#~ "zu bewahren, indem Sie immer den gleichen Spitznamen verwenden. In "
-#~ "einigen Fällen können IRC-Channels so eingerichtet sein, dass nur "
-#~ "registrierte Spitznamen anerkannt werden."
+#~ "zu bewahren, indem Sie immer den gleichen Spitznamen verwenden. In einigen "
+#~ "Fällen können IRC-Channels so eingerichtet sein, dass nur registrierte "
+#~ "Spitznamen anerkannt werden."
#~ msgid "Enable"
#~ msgstr "Aktivieren"
diff --git a/help/es/es.po b/help/es/es.po
index 6b22c5e50..b77d83565 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -4,8 +4,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-help.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 17:39+0000\n"
-"PO-Revision-Date: 2010-02-17 20:56+0100\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-14 23:17+0100\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -32,12 +32,12 @@ msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
#: C/remove-account.page:17(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/offline-contacts.page:17(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:18(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:16(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:18(name)
-#: C/import-account.page:23(name) C/group-conversations.page:19(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:18(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)
@@ -53,12 +53,12 @@ msgstr "Milo Casagrande"
#: C/remove-account.page:18(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/offline-contacts.page:18(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:19(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:17(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:19(email)
-#: C/import-account.page:24(email) C/group-conversations.page:20(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:19(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/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
@@ -75,11 +75,11 @@ msgstr "milo@ubuntu.com"
#: 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/offline-contacts.page:21(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:22(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:20(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:22(p) C/import-account.page:31(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:22(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)
@@ -787,9 +787,6 @@ 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."
msgid ""
"An error message which says “<gui>Network error</gui>” appears in the main "
"window."
@@ -798,7 +795,6 @@ msgstr ""
"principal."
#: C/prob-conn-neterror.page:33(title)
-#| msgid "I get a message that says \"Network error\""
msgid "I get a message that says “Network error”"
msgstr "Obtengo un mensaje que muestra «Error de red»"
@@ -838,9 +834,6 @@ msgstr "Asegúrese de que está conectado a Internet o a una red de área local.
#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
#: C/prob-conn-auth.page:57(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>."
msgid ""
"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
"\">edit</media> icon in the error message."
@@ -859,9 +852,6 @@ msgstr ""
"servicio de mensajería."
#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(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."
msgid ""
"Deselect the <gui>Enabled</gui>, and then select it again to try to "
"reconnect to the service."
@@ -930,9 +920,6 @@ msgstr ""
"servicio."
#: C/prob-conn-auth.page:8(desc)
-#| msgid ""
-#| "An error message which says \"<gui>Authentication failed</gui>\" appears "
-#| "in the main window."
msgid ""
"An error message which says “<gui>Authentication failed</gui>” appears in "
"the main window."
@@ -941,7 +928,6 @@ msgstr ""
"la autenticación</gui>»."
#: C/prob-conn-auth.page:36(title)
-#| msgid "I get a message that says \"Authentication failed\""
msgid "I get a message that says “Authentication failed”"
msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
@@ -1004,10 +990,6 @@ msgstr ""
"cuenta que no está funcionando."
#: C/prob-conn-acctdisabled.page:65(p)
-#| msgid ""
-#| "Check that the <gui>Enabled</gui> check-box next to the name of your "
-#| "account is selected. If it is not, select the check-box to enalbe the "
-#| "account."
msgid ""
"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
"If it is not, select the check-box to enalbe the account."
@@ -1175,40 +1157,6 @@ msgstr ""
"anteriores</gui>. Se abrirá la ventana <gui>Ver conversaciones previas</gui> "
"con el contacto seleccionado."
-#: C/offline-contacts.page:8(desc)
-msgid "See all of your contacts, even those that are not online."
-msgstr "Vea todos sus contactos, incluso aquellos que no están conectados."
-
-#: C/offline-contacts.page:32(title)
-msgid "Show offline contacts"
-msgstr "Mostrar contactos desconectados"
-
-#: C/offline-contacts.page:34(p)
-msgid ""
-"Normally, <app>Empathy</app> only shows your contacts that are currently "
-"online. You can show all of your contacts instead, including those that are "
-"offline."
-msgstr ""
-"Generalmente <app>Empathy</app> sólo muestra sus contactos que están "
-"conectados. En su lugar, puede mostrar todos sus contactos, incluyendo "
-"aquellos que estén desconectados."
-
-#: C/offline-contacts.page:40(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 ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
-"gui><gui>Contactos desconectados</gui></guiseq> o pulse <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
-
-#: C/offline-contacts.page:45(p)
-msgid "To hide the offline contacts again, repeat the same procedure above."
-msgstr ""
-"Para ocultar los contactos desconectados de nuevo, repita el mismo "
-"procedimiento anterior."
-
#: C/license.page:8(desc)
msgid "Legal information."
msgstr "Información legal."
@@ -1402,8 +1350,9 @@ msgstr ""
"usar para registrar su apodo."
#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui>Apply</gui>."
-msgstr "Pulse el botón <gui>Aplicar</gui>."
+#: C/add-account.page:70(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
#: C/irc-nick-password.page:69(p)
msgid ""
@@ -1496,22 +1445,37 @@ msgstr ""
"sala."
#: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Actualmente <app>Empathy</app> no soporta salas de chat de IRC protegidas "
-"por contraseña."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Introduzca la contraseña para salas de chat IRC protegidas."
-#: C/irc-join-pwd.page:31(title)
+#: C/irc-join-pwd.page:25(title)
msgid "Join a protected IRC chat room"
msgstr "Unirse a una sala de chat protegida en el IRC"
-#: C/irc-join-pwd.page:33(p)
+#: C/irc-join-pwd.page:27(p)
msgid ""
-"It is not currently possible to join a password-protected IRC chat room."
+"On some IRC networks, private IRC rooms may be protected with a password."
msgstr ""
-"Actualmente no es posible unirse a salas protegidas por contraseña en el IRC."
+"En algunas redes IRC las salas privadas de IRC pueden estar protegidas por "
+"contraseña."
+
+#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
+msgstr "Para unirse a una sala así, si sabe la contraseña:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link>."
+
+#: C/irc-join-pwd.page:40(p)
+msgid ""
+"In the <gui>This room is protected by a password</gui> text box, type the "
+"IRC room password, and click on <gui style=\"button\">Join</gui>."
+msgstr ""
+"Escriba la contraseña para la sala de chat IRC en la caja de texto <gui>Esta "
+"sala está protegida por contraseña</gui> y pulse <gui style=\"button"
+"\">Unirse</gui>."
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
@@ -1692,6 +1656,44 @@ msgstr ""
"Actualmente no es posible importar cuentas después de haber completado el "
"asistente de primera ejecución."
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Ocultar los contactos desconectados de su <gui>Lista de contactos</gui>."
+
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Ocultar contactos desconectados"
+
+#: 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 ""
+"Generalmente <app>Empathy</app> muestra todos contactos: los que están "
+"conectados, con los que puede establecer una conversación, y también los que "
+"están desconectados."
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Para ocultar los contactos desconectados:"
+
+#: 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 ""
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
+"gui><gui>Contactos desconectados</gui></guiseq> o pulse <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."
+msgstr ""
+"Para mostrar los contactos desconectados de nuevo, repita el mismo "
+"procedimiento anterior."
+
#: C/group-conversations.page:8(desc)
msgid "Start or join a group conversation with your contacts."
msgstr "Iniciar o unirse a un grupo de conversación con sus contactos."
@@ -2546,7 +2548,6 @@ msgstr ""
"sonido."
#: C/audio-video.page:32(title)
-#| msgid "Audio and Video Support"
msgid "Audio and video support"
msgstr "Soporte de sonido y vídeo"
@@ -2878,11 +2879,6 @@ msgstr ""
"pueden requerir información adicional. Para obtener más información consulte "
"la <link xref=\"accounts-window#details\"/>."
-#: C/add-account.page:70(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
-
#: C/add-account.page:77(p)
msgid ""
"To change the name that identifies the account in the <gui>Accounts</gui> "
@@ -3303,6 +3299,25 @@ msgstr ""
msgid "translator-credits"
msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
+#~ msgid ""
+#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
+#~ "rooms."
+#~ msgstr ""
+#~ "Actualmente <app>Empathy</app> no soporta salas de chat de IRC protegidas "
+#~ "por contraseña."
+
+#~ msgid ""
+#~ "It is not currently possible to join a password-protected IRC chat room."
+#~ msgstr ""
+#~ "Actualmente no es posible unirse a salas protegidas por contraseña en el "
+#~ "IRC."
+
+#~ msgid "See all of your contacts, even those that are not online."
+#~ msgstr "Vea todos sus contactos, incluso aquellos que no están conectados."
+
+#~ msgid "Click <gui>Apply</gui>."
+#~ msgstr "Pulse el botón <gui>Aplicar</gui>."
+
#~ msgid "Click on the <gui>Edit Account</gui> button in the error message."
#~ msgstr "Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error."
diff --git a/help/it/it.po b/help/it/it.po
index 7975a0a60..3f2af4351 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -1,14 +1,14 @@
-# Italian translation of empathy documentation.
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Italian translation of empathy help.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
# This package is distributed under the same license as the empathy package.
#
# Milo Casagrande <milo@ubuntu.com>, 2008, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: empathy manual\n"
+"Project-Id-Version: empathy help\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-17 21:06+0000\n"
-"PO-Revision-Date: 2010-02-17 21:51+0100\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-14 20:56+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -32,12 +32,12 @@ msgstr "Avviare una conversazione video con i propri contatti."
#: C/remove-account.page:17(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/offline-contacts.page:17(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:18(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:16(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:18(name)
-#: C/import-account.page:23(name) C/group-conversations.page:19(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:18(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)
@@ -53,12 +53,12 @@ msgstr "Milo Casagrande"
#: C/remove-account.page:18(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/offline-contacts.page:18(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:19(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:17(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:19(email)
-#: C/import-account.page:24(email) C/group-conversations.page:20(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:19(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/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
@@ -75,11 +75,11 @@ msgstr "milo@ubuntu.com"
#: 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/offline-contacts.page:21(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:22(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:20(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:22(p) C/import-account.page:31(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:22(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)
@@ -1168,40 +1168,6 @@ msgstr ""
"precedenti</gui>. La finestra <gui>Conversazioni precedenti</gui> viene "
"aperta con quel contatto già selezionato."
-#: C/offline-contacts.page:8(desc)
-msgid "See all of your contacts, even those that are not online."
-msgstr "Visualizzare tutti i propri contatti, anche quelli non in rete"
-
-#: C/offline-contacts.page:32(title)
-msgid "Show offline contacts"
-msgstr "Mostrare i contatti fuori rete"
-
-#: C/offline-contacts.page:34(p)
-msgid ""
-"Normally, <app>Empathy</app> only shows your contacts that are currently "
-"online. You can show all of your contacts instead, including those that are "
-"offline."
-msgstr ""
-"Normalmente <app>Empathy</app> mostra solo i contatti che sono collegati in "
-"rete. È comunque possibile visualizzare tutti i contatti, anche quelli fuori "
-"rete."
-
-#: C/offline-contacts.page:40(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 ""
-"Dalla finestra <gui>Elenco contatti</gui>, scegliere "
-"<guiseq><gui>Visualizza</gui><gui>Contatti fuori rete</gui></guiseq> o "
-"premere <keyseq><key>Ctrl</key><key>H</key></keyseq>."
-
-#: C/offline-contacts.page:45(p)
-msgid "To hide the offline contacts again, repeat the same procedure above."
-msgstr ""
-"Per nascondere nuovamente i contatti fuori rete, ripetere la procedura "
-"precedente."
-
#: C/license.page:8(desc)
msgid "Legal information."
msgstr "Informazioni legali."
@@ -1493,23 +1459,37 @@ msgstr ""
"passi precedenti per ciascuna stanza."
#: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Attualmente <app>Empathy</app> non supporta stanze di conversazione protette "
-"da password."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Entrare in stanze di conversazione IRC protette da password."
-#: C/irc-join-pwd.page:31(title)
+#: C/irc-join-pwd.page:25(title)
msgid "Join a protected IRC chat room"
msgstr "Entrare in una stanza di conversazione IRC protetta"
-#: C/irc-join-pwd.page:33(p)
+#: C/irc-join-pwd.page:27(p)
msgid ""
-"It is not currently possible to join a password-protected IRC chat room."
+"On some IRC networks, private IRC rooms may be protected with a password."
msgstr ""
-"Al momento non è possibile entrare in una stanza di conversazione IRC "
-"protetta da password."
+"In alcune reti IRC, le stanze IRC private possono essere protette tramite "
+"una password."
+
+#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
+msgstr "Per entrare in tali stanze, se si conosce la password:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Entrare nella stanza</link>."
+
+#: C/irc-join-pwd.page:40(p)
+msgid ""
+"In the <gui>This room is protected by a password</gui> text box, type the "
+"IRC room password, and click on <gui style=\"button\">Join</gui>."
+msgstr ""
+"Nella casella di testo <gui>Questa stanza è protetta da una password</gui>, "
+"digitare la password della stanza e fare clic su <gui style=\"button"
+"\">Entra</gui>."
#: C/irc-commands.page:7(desc)
msgid "The supported IRC commands."
@@ -1686,6 +1666,50 @@ msgstr ""
"Al momento non è possibile importare gli account una volta completati i "
"passi dell'assistente dopo il primo avvio dell'applicazione."
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Nascondere i contatti fuori rete dal proprio <gui>Elenco contatti</gui>."
+
+#: C/hide-contacts.page:19(title)
+#| msgid "Show offline contacts"
+msgid "Hide offline contacts"
+msgstr "Nascondere i contatti fuori rete"
+
+#: C/hide-contacts.page:21(p)
+#| msgid ""
+#| "Normally, <app>Empathy</app> only shows your contacts that are currently "
+#| "online. You can show all of your contacts instead, including those that "
+#| "are offline."
+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 tutti i contatti: quelli che sono "
+"collegati in rete, con cui è possibile avere conversazioni, e anche quelli "
+"che risultano fuori rete"
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Per nascondere i contatti fuori rete:"
+
+#: 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 ""
+"Dalla finestra <gui>Elenco contatti</gui>, scegliere "
+"<guiseq><gui>Visualizza</gui><gui>Contatti fuori rete</gui></guiseq> o "
+"premere <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(p)
+#| msgid "To hide the offline contacts again, repeat the same procedure above."
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr ""
+"Per mostrare nuovamente i contatti fuori rete, ripetere la procedura "
+"precedente."
+
#: C/group-conversations.page:8(desc)
msgid "Start or join a group conversation with your contacts."
msgstr ""
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 2a74c1da5..21e3b3810 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -82,6 +82,7 @@ struct _EmpathyConfClass {
#define EMPATHY_PREFS_USE_CONN EMPATHY_PREFS_PATH "/use_conn"
#define EMPATHY_PREFS_AUTOCONNECT EMPATHY_PREFS_PATH "/autoconnect"
#define EMPATHY_PREFS_IMPORT_ASKED EMPATHY_PREFS_PATH "/import_asked"
+#define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED EMPATHY_PREFS_PATH "/butterfly_logs_migrated"
#define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder"
#define EMPATHY_PREFS_LOCATION_PUBLISH EMPATHY_PREFS_PATH "/location/publish"
#define EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK EMPATHY_PREFS_PATH "/location/resource_network"
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 52e43e163..fed8d04cb 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -261,7 +261,8 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact,
/* Contact info widget */
contact_widget = empathy_contact_widget_new (contact,
EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
- EMPATHY_CONTACT_WIDGET_EDIT_GROUPS);
+ EMPATHY_CONTACT_WIDGET_EDIT_GROUPS |
+ EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE);
gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
contact_widget,
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 53a0934b3..9feb4461f 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <telepathy-glib/util.h>
@@ -105,6 +106,10 @@ static void contact_list_store_members_changed_cb (EmpathyCon
gchar *message,
gboolean is_member,
EmpathyContactListStore *store);
+static void contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
+ EmpathyContact *contact,
+ gboolean is_favourite,
+ EmpathyContactListStore *store);
static void contact_list_store_member_renamed_cb (EmpathyContactList *list_iface,
EmpathyContact *old_contact,
EmpathyContact *new_contact,
@@ -142,7 +147,8 @@ static void contact_list_store_get_group (EmpathyCon
const gchar *name,
GtkTreeIter *iter_group_to_set,
GtkTreeIter *iter_separator_to_set,
- gboolean *created);
+ gboolean *created,
+ gboolean is_fake_group);
static gint contact_list_store_state_sort_func (GtkTreeModel *model,
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
@@ -192,6 +198,10 @@ contact_list_store_iface_setup (gpointer user_data)
G_CALLBACK (contact_list_store_members_changed_cb),
store);
g_signal_connect (priv->list,
+ "favourites-changed",
+ G_CALLBACK (contact_list_store_favourites_changed_cb),
+ store);
+ g_signal_connect (priv->list,
"groups-changed",
G_CALLBACK (contact_list_store_groups_changed_cb),
store);
@@ -338,6 +348,9 @@ contact_list_store_dispose (GObject *object)
G_CALLBACK (contact_list_store_members_changed_cb),
object);
g_signal_handlers_disconnect_by_func (priv->list,
+ G_CALLBACK (contact_list_store_favourites_changed_cb),
+ object);
+ g_signal_handlers_disconnect_by_func (priv->list,
G_CALLBACK (contact_list_store_groups_changed_cb),
object);
g_object_unref (priv->list);
@@ -715,11 +728,13 @@ empathy_contact_list_store_row_separator_func (GtkTreeModel *model,
gchar *
empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
GtkTreePath *path,
- gboolean *path_is_group)
+ gboolean *path_is_group,
+ gboolean *is_fake_group)
{
GtkTreeIter parent_iter, iter;
gchar *name = NULL;
gboolean is_group;
+ gboolean fake;
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
@@ -749,6 +764,7 @@ empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
gtk_tree_model_get (model, &iter,
EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake,
-1);
if (!is_group) {
g_free (name);
@@ -760,6 +776,9 @@ empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
*path_is_group = TRUE;
}
+ if (is_fake_group != NULL)
+ *is_fake_group = fake;
+
return name;
}
@@ -824,6 +843,7 @@ contact_list_store_setup (EmpathyContactListStore *store)
G_TYPE_BOOLEAN, /* Can make audio calls */
G_TYPE_BOOLEAN, /* Can make video calls */
EMPATHY_TYPE_CONTACT_LIST_FLAGS, /* Flags */
+ G_TYPE_BOOLEAN, /* Is a fake group */
};
priv = GET_PRIV (store);
@@ -917,6 +937,25 @@ contact_list_store_members_changed_cb (EmpathyContactList *list_iface,
}
static void
+contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
+ EmpathyContact *contact,
+ gboolean is_favourite,
+ EmpathyContactListStore *store)
+{
+ EmpathyContactListStorePriv *priv;
+
+ priv = GET_PRIV (store);
+
+ DEBUG ("Contact %s (%d) is %s a favourite",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact),
+ is_favourite ? "now" : "no longer");
+
+ contact_list_store_remove_contact (store, contact);
+ contact_list_store_add_contact (store, contact);
+}
+
+static void
contact_list_store_member_renamed_cb (EmpathyContactList *list_iface,
EmpathyContact *old_contact,
EmpathyContact *new_contact,
@@ -969,6 +1008,27 @@ contact_list_store_groups_changed_cb (EmpathyContactList *list_iface,
}
static void
+add_contact_to_store (GtkTreeStore *store,
+ GtkTreeIter *iter,
+ EmpathyContact *contact,
+ EmpathyContactListFlags flags)
+{
+ gtk_tree_store_set (store, iter,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
+ empathy_contact_get_capabilities (contact) &
+ EMPATHY_CAPABILITIES_AUDIO,
+ EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
+ empathy_contact_get_capabilities (contact) &
+ EMPATHY_CAPABILITIES_VIDEO,
+ EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
+ -1);
+}
+
+static void
contact_list_store_add_contact (EmpathyContactListStore *store,
EmpathyContact *contact)
{
@@ -994,8 +1054,18 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
flags = empathy_contact_manager_get_flags_for_connection (
EMPATHY_CONTACT_MANAGER (priv->list), connection);
}
- /* If no groups just add it at the top level. */
if (!groups) {
+#if HAVE_FAVOURITE_CONTACTS
+ GtkTreeIter iter_group;
+
+ contact_list_store_get_group (store, EMPATHY_CONTACT_LIST_STORE_UNGROUPED,
+ &iter_group, NULL, NULL, TRUE);
+
+ gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
+ &iter_group, NULL);
+#else
+ /* FIXME: remove this in 2.31.x */
+ /* If no groups just add it at the top level. */
GtkTreeModel *model = GTK_TREE_MODEL (store);
if (gtk_tree_model_get_iter_first (model, &iter)) do {
@@ -1014,48 +1084,41 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
} while (gtk_tree_model_iter_next (model, &iter));
gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
- gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
- EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
- EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
- EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
- empathy_contact_get_capabilities (contact) &
- EMPATHY_CAPABILITIES_AUDIO,
- EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
- empathy_contact_get_capabilities (contact) &
- EMPATHY_CAPABILITIES_VIDEO,
- EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
- -1);
+#endif
+
+ add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
}
/* Else add to each group. */
for (l = groups; l; l = l->next) {
GtkTreeIter iter_group;
- contact_list_store_get_group (store, l->data, &iter_group, NULL, NULL);
+ contact_list_store_get_group (store, l->data, &iter_group, NULL, NULL, FALSE);
gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
&iter_group, NULL);
- gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
- EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
- EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
- EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
- empathy_contact_get_capabilities (contact) &
- EMPATHY_CAPABILITIES_AUDIO,
- EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
- empathy_contact_get_capabilities (contact) &
- EMPATHY_CAPABILITIES_VIDEO,
- EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
- -1);
+
+ add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
g_free (l->data);
}
g_list_free (groups);
- contact_list_store_contact_update (store, contact);
+#ifdef HAVE_FAVOURITE_CONTACTS
+ if (empathy_contact_list_is_favourite (priv->list, contact)) {
+ /* Add contact to the fake 'Favorites' group */
+ GtkTreeIter iter_group;
+
+ contact_list_store_get_group (store, EMPATHY_CONTACT_LIST_STORE_FAVORITE,
+ &iter_group, NULL, NULL, TRUE);
+
+ gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
+ &iter_group, NULL);
+ add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
+ }
+#endif
+
+ contact_list_store_contact_update (store, contact);
}
static void
@@ -1389,7 +1452,8 @@ contact_list_store_get_group (EmpathyContactListStore *store,
const gchar *name,
GtkTreeIter *iter_group_to_set,
GtkTreeIter *iter_separator_to_set,
- gboolean *created)
+ gboolean *created,
+ gboolean is_fake_group)
{
EmpathyContactListStorePriv *priv;
GtkTreeModel *model;
@@ -1420,6 +1484,7 @@ contact_list_store_get_group (EmpathyContactListStore *store,
EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, TRUE,
EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, FALSE,
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, is_fake_group,
-1);
if (iter_group_to_set) {
@@ -1462,44 +1527,77 @@ contact_list_store_get_group (EmpathyContactListStore *store,
}
static gint
+compare_separator_and_groups (gboolean is_separator_a,
+ gboolean is_separator_b,
+ const gchar *name_a,
+ const gchar *name_b,
+ EmpathyContact *contact_a,
+ EmpathyContact *contact_b,
+ gboolean fake_group_a,
+ gboolean fake_group_b)
+{
+ if (is_separator_a || is_separator_b) {
+ /* We have at least one separator */
+ if (is_separator_a) {
+ return -1;
+ } else if (is_separator_b) {
+ return 1;
+ }
+ }
+
+ /* One group and one contact */
+ if (!contact_a && contact_b) {
+ return 1;
+ } else if (contact_a && !contact_b) {
+ return -1;
+ } else if (!contact_a && !contact_b) {
+ /* Two groups. The 'Ungrouped' fake group is display at the bottom of the
+ * contact list and the 'Favorites' at the top. */
+ if (fake_group_a && !tp_strdiff (name_a, EMPATHY_CONTACT_LIST_STORE_UNGROUPED))
+ return 1;
+ else if (fake_group_b && !tp_strdiff (name_b, EMPATHY_CONTACT_LIST_STORE_UNGROUPED))
+ return -1;
+ else if (fake_group_a && !tp_strdiff (name_a, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
+ return -1;
+ else if (fake_group_b && !tp_strdiff (name_b, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
+ return 1;
+ else
+ return g_utf8_collate (name_a, name_b);
+ }
+
+ /* Two contacts, ordering depends of the sorting policy */
+ return 0;
+}
+
+static gint
contact_list_store_state_sort_func (GtkTreeModel *model,
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data)
{
- gint ret_val = 0;
+ gint ret_val;
gchar *name_a, *name_b;
gboolean is_separator_a, is_separator_b;
EmpathyContact *contact_a, *contact_b;
+ gboolean fake_group_a, fake_group_b;
gtk_tree_model_get (model, iter_a,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
-1);
gtk_tree_model_get (model, iter_b,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
-1);
- /* Separator or group? */
- if (is_separator_a || is_separator_b) {
- if (is_separator_a) {
- ret_val = -1;
- } else if (is_separator_b) {
- ret_val = 1;
- }
- } else if (!contact_a && contact_b) {
- ret_val = 1;
- } else if (contact_a && !contact_b) {
- ret_val = -1;
- } else if (!contact_a && !contact_b) {
- /* Handle groups */
- ret_val = g_utf8_collate (name_a, name_b);
- }
+ ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
+ name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
- if (ret_val) {
+ if (ret_val != 0) {
goto free_and_out;
}
@@ -1538,38 +1636,28 @@ contact_list_store_name_sort_func (GtkTreeModel *model,
{
gchar *name_a, *name_b;
EmpathyContact *contact_a, *contact_b;
- gboolean is_separator_a, is_separator_b;
+ gboolean is_separator_a = FALSE, is_separator_b = FALSE;
gint ret_val;
+ gboolean fake_group_a, fake_group_b;
gtk_tree_model_get (model, iter_a,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
-1);
gtk_tree_model_get (model, iter_b,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
-1);
- /* If contact is NULL it means it's a group. */
+ ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
+ name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
- if (is_separator_a || is_separator_b) {
- if (is_separator_a) {
- ret_val = -1;
- } else if (is_separator_b) {
- ret_val = 1;
- }
- } else if (!contact_a && contact_b) {
- ret_val = 1;
- } else if (contact_a && !contact_b) {
- ret_val = -1;
- } else {
+ if (ret_val == 0)
ret_val = g_utf8_collate (name_a, name_b);
- }
-
- g_free (name_a);
- g_free (name_b);
if (contact_a) {
g_object_unref (contact_a);
diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index afefd28cf..1b36ea651 100644
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -63,9 +63,13 @@ typedef enum {
EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
EMPATHY_CONTACT_LIST_STORE_COL_FLAGS,
- EMPATHY_CONTACT_LIST_STORE_COL_COUNT
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP,
+ EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
} EmpathyContactListStoreCol;
+#define EMPATHY_CONTACT_LIST_STORE_UNGROUPED _("Ungrouped")
+#define EMPATHY_CONTACT_LIST_STORE_FAVORITE _("Favorite People")
+
struct _EmpathyContactListStore {
GtkTreeStore parent;
gpointer priv;
@@ -101,7 +105,8 @@ gboolean empathy_contact_list_store_row_separator_func (GtkTre
gpointer data);
gchar * empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
GtkTreePath *path,
- gboolean *path_is_group);
+ gboolean *path_is_group,
+ gboolean *is_fake_group);
gboolean empathy_contact_list_store_search_equal_func (GtkTreeModel *model,
gint column,
const gchar *key,
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index e8fddf0ac..8e8342275 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -157,6 +157,11 @@ contact_list_view_query_tooltip_cb (EmpathyContactListView *view,
}
running++;
+ /* Don't show the tooltip if there's already a popup menu */
+ if (gtk_menu_get_for_attach_widget (GTK_WIDGET (view)) != NULL) {
+ goto OUT;
+ }
+
if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (view), &x, &y,
keyboard_mode,
&model, &path, &iter)) {
@@ -235,6 +240,21 @@ contact_list_view_drag_got_contact (EmpathyTpContactFactory *factory,
data->old_group, data->new_group);
list = empathy_contact_list_store_get_list_iface (priv->store);
+
+ if (!tp_strdiff (data->new_group, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) {
+ /* Mark contact as favourite */
+ empathy_contact_list_add_to_favourites (list, contact);
+ return;
+ }
+
+ if (!tp_strdiff (data->old_group, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) {
+ /* Remove contact as favourite */
+ empathy_contact_list_remove_from_favourites (list, contact);
+ /* Don't try to remove it */
+ g_free (data->old_group);
+ data->old_group = NULL;
+ }
+
if (data->new_group) {
empathy_contact_list_add_to_group (list, contact, data->new_group);
}
@@ -244,6 +264,27 @@ contact_list_view_drag_got_contact (EmpathyTpContactFactory *factory,
}
static gboolean
+group_can_be_modified (const gchar *name,
+ gboolean is_fake_group,
+ gboolean adding)
+{
+ /* Real groups can always be modified */
+ if (!is_fake_group)
+ return TRUE;
+
+ /* The favorite fake group can be modified so users can
+ * add/remove favorites using DnD */
+ if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
+ return TRUE;
+
+ /* We can remove contacts from the 'ungrouped' fake group */
+ if (!adding && !tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_UNGROUPED))
+ return TRUE;
+
+ return FALSE;
+}
+
+static gboolean
contact_list_view_contact_drag_received (GtkWidget *view,
GdkDragContext *context,
GtkTreeModel *model,
@@ -263,23 +304,30 @@ contact_list_view_contact_drag_received (GtkWidget *view,
gchar *new_group = NULL;
gchar *old_group = NULL;
gboolean success = TRUE;
+ gboolean new_group_is_fake, old_group_is_fake = TRUE;
priv = GET_PRIV (view);
sel_data = (const gchar *) gtk_selection_data_get_data (selection);
new_group = empathy_contact_list_store_get_parent_group (model,
- path, NULL);
+ path, NULL, &new_group_is_fake);
+
+ if (!group_can_be_modified (new_group, new_group_is_fake, TRUE))
+ return FALSE;
/* Get source group information. */
if (priv->drag_row) {
source_path = gtk_tree_row_reference_get_path (priv->drag_row);
if (source_path) {
old_group = empathy_contact_list_store_get_parent_group (
- model, source_path, NULL);
+ model, source_path, NULL, &old_group_is_fake);
gtk_tree_path_free (source_path);
}
}
+ if (!group_can_be_modified (old_group, old_group_is_fake, FALSE))
+ return FALSE;
+
if (!tp_strdiff (old_group, new_group)) {
g_free (new_group);
g_free (old_group);
@@ -681,6 +729,10 @@ contact_list_view_popup_menu_idle_cb (gpointer user_data)
}
if (menu) {
+ g_signal_connect (menu, "deactivate",
+ G_CALLBACK (gtk_menu_detach), NULL);
+ gtk_menu_attach_to_widget (GTK_MENU (menu),
+ GTK_WIDGET (data->view), NULL);
gtk_widget_show (menu);
gtk_menu_popup (GTK_MENU (menu),
NULL, NULL, NULL, NULL,
@@ -796,6 +848,10 @@ contact_list_view_call_activated_cb (
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
+ g_signal_connect (menu, "deactivate",
+ G_CALLBACK (gtk_menu_detach), NULL);
+ gtk_menu_attach_to_widget (GTK_MENU (menu),
+ GTK_WIDGET (view), NULL);
gtk_widget_show (menu);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
@@ -868,6 +924,43 @@ contact_list_view_pixbuf_cell_data_func (GtkTreeViewColumn *tree_column,
}
static void
+contact_list_view_group_icon_cell_data_func (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ EmpathyContactListView *view)
+{
+ GdkPixbuf *pixbuf = NULL;
+ gboolean is_group;
+ gchar *name;
+
+ gtk_tree_model_get (model, iter,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+ -1);
+
+ if (!is_group)
+ goto out;
+
+ if (tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE))
+ goto out;
+
+ pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
+ GTK_ICON_SIZE_MENU);
+
+out:
+ g_object_set (cell,
+ "visible", pixbuf != NULL,
+ "pixbuf", pixbuf,
+ NULL);
+
+ if (pixbuf != NULL)
+ g_object_unref (pixbuf);
+
+ g_free (name);
+}
+
+static void
contact_list_view_audio_call_cell_data_func (
GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell,
@@ -1104,6 +1197,22 @@ contact_list_view_setup (EmpathyContactListView *view)
"visible", FALSE,
NULL);
+ /* Group icon */
+ cell = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (col, cell, FALSE);
+ gtk_tree_view_column_set_cell_data_func (
+ col, cell,
+ (GtkTreeCellDataFunc) contact_list_view_group_icon_cell_data_func,
+ view, NULL);
+
+ g_object_set (cell,
+ "xpad", 0,
+ "ypad", 0,
+ "visible", FALSE,
+ "width", 16,
+ "height", 16,
+ NULL);
+
/* Name */
cell = empathy_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (col, cell, TRUE);
@@ -1446,7 +1555,8 @@ empathy_contact_list_view_get_flags (EmpathyContactListView *view)
}
gchar *
-empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
+empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
+ gboolean *is_fake_group)
{
EmpathyContactListViewPriv *priv;
GtkTreeSelection *selection;
@@ -1454,6 +1564,7 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
GtkTreeModel *model;
gboolean is_group;
gchar *name;
+ gboolean fake;
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
@@ -1467,6 +1578,7 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
gtk_tree_model_get (model, &iter,
EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake,
-1);
if (!is_group) {
@@ -1474,6 +1586,9 @@ empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
return NULL;
}
+ if (is_fake_group != NULL)
+ *is_fake_group = fake;
+
return name;
}
@@ -1510,7 +1625,7 @@ contact_list_view_group_remove_activate_cb (GtkMenuItem *menuitem,
EmpathyContactListViewPriv *priv = GET_PRIV (view);
gchar *group;
- group = empathy_contact_list_view_get_selected_group (view);
+ group = empathy_contact_list_view_get_selected_group (view, NULL);
if (group) {
gchar *text;
GtkWindow *parent;
@@ -1538,6 +1653,7 @@ empathy_contact_list_view_get_group_menu (EmpathyContactListView *view)
GtkWidget *menu;
GtkWidget *item;
GtkWidget *image;
+ gboolean is_fake_group;
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
@@ -1546,8 +1662,9 @@ empathy_contact_list_view_get_group_menu (EmpathyContactListView *view)
return NULL;
}
- group = empathy_contact_list_view_get_selected_group (view);
- if (!group) {
+ group = empathy_contact_list_view_get_selected_group (view, &is_fake_group);
+ if (!group || is_fake_group) {
+ /* We can't alter fake groups */
return NULL;
}
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 17de5239b..41b968dbf 100644
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -73,7 +73,8 @@ EmpathyContactListView * empathy_contact_list_view_new (Empathy
EmpathyContactFeatureFlags contact_features);
EmpathyContact * empathy_contact_list_view_dup_selected (EmpathyContactListView *view);
EmpathyContactListFlags empathy_contact_list_view_get_flags (EmpathyContactListView *view);
-gchar * empathy_contact_list_view_get_selected_group (EmpathyContactListView *view);
+gchar * empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
+ gboolean *is_fake_group);
GtkWidget * empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view);
GtkWidget * empathy_contact_list_view_get_group_menu (EmpathyContactListView *view);
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 54bb4b286..23522d40e 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -134,6 +134,13 @@ empathy_contact_menu_new (EmpathyContact *contact,
gtk_widget_show (item);
}
+#if HAVE_FAVOURITE_CONTACTS
+ /* Favorite checkbox */
+ item = empathy_contact_favourite_menu_item_new (contact);
+ gtk_menu_shell_append (shell, item);
+ gtk_widget_show (item);
+#endif
+
return menu;
}
@@ -396,6 +403,48 @@ empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact)
return item;
}
+#if HAVE_FAVOURITE_CONTACTS
+static void
+favourite_menu_item_toggled_cb (GtkCheckMenuItem *item,
+ EmpathyContact *contact)
+{
+ EmpathyContactManager *manager;
+ EmpathyContactList *list;
+
+ manager = empathy_contact_manager_dup_singleton ();
+ list = EMPATHY_CONTACT_LIST (manager);
+
+ if (gtk_check_menu_item_get_active (item)) {
+ empathy_contact_list_add_to_favourites (list, contact);
+ } else {
+ empathy_contact_list_remove_from_favourites (list, contact);
+ }
+
+ g_object_unref (manager);
+}
+
+GtkWidget *
+empathy_contact_favourite_menu_item_new (EmpathyContact *contact)
+{
+ GtkWidget *item;
+ EmpathyContactManager *manager;
+
+ item = gtk_check_menu_item_new_with_label (_("Favorite"));
+
+ manager = empathy_contact_manager_dup_singleton ();
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+ empathy_contact_list_is_favourite (EMPATHY_CONTACT_LIST (manager),
+ contact));
+
+ g_signal_connect (item, "toggled",
+ G_CALLBACK (favourite_menu_item_toggled_cb),
+ contact);
+
+ g_object_unref (manager);
+ return item;
+}
+#endif
+
static void
contact_info_menu_item_activate_cb (EmpathyContact *contact)
{
diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 2c623e6ba..25f18e03f 100644
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -50,6 +50,7 @@ GtkWidget * empathy_contact_edit_menu_item_new (EmpathyContact *cont
GtkWidget * empathy_contact_invite_menu_item_new (EmpathyContact *contact);
GtkWidget * empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact);
GtkWidget * empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact);
+GtkWidget * empathy_contact_favourite_menu_item_new (EmpathyContact *contact);
G_END_DECLS
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index 3c59061ae..c09b25cef 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -55,6 +55,7 @@ struct _EmpathyContactSelectorDialogPriv {
GtkWidget *account_chooser;
GtkWidget *entry_id;
EmpathyContactManager *contact_manager;
+ TpAccount *filter_account;
gboolean show_account_chooser;
};
@@ -65,7 +66,8 @@ struct _EmpathyContactSelectorDialogPriv {
enum {
PROP_0,
- PROP_SHOW_ACCOUNT_CHOOSER
+ PROP_SHOW_ACCOUNT_CHOOSER,
+ PROP_FILTER_ACCOUNT
};
enum {
@@ -103,8 +105,25 @@ contact_selector_dialog_account_changed_cb (GtkWidget *widget,
}
else
{
- members = empathy_contact_list_get_members (
- EMPATHY_CONTACT_LIST (priv->contact_manager));
+ if (priv->filter_account != NULL)
+ {
+ EmpathyTpContactList *contact_list;
+
+ connection = tp_account_get_connection (priv->filter_account);
+ if (connection == NULL)
+ return;
+
+ contact_list = empathy_contact_manager_get_list (
+ priv->contact_manager, connection);
+
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (contact_list));
+ }
+ else
+ {
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (priv->contact_manager));
+ }
}
/* Add members to the completion */
@@ -361,6 +380,11 @@ empathy_contact_selector_dialog_get_property (GObject *self,
empathy_contact_selector_dialog_get_show_account_chooser (dialog));
break;
+ case PROP_FILTER_ACCOUNT:
+ g_value_set_object (value,
+ empathy_contact_selector_dialog_get_filter_account (dialog));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
break;
@@ -382,6 +406,11 @@ empathy_contact_selector_dialog_set_property (GObject *self,
g_value_get_boolean (value));
break;
+ case PROP_FILTER_ACCOUNT:
+ empathy_contact_selector_dialog_set_filter_account (dialog,
+ g_value_get_object (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
break;
@@ -419,6 +448,11 @@ empathy_contact_selector_dialog_dispose (GObject *object)
priv->contact_manager = NULL;
}
+ if (priv->filter_account != NULL) {
+ g_object_unref (priv->filter_account);
+ priv->filter_account = NULL;
+ }
+
if (G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose)
G_OBJECT_CLASS (empathy_contact_selector_dialog_parent_class)->dispose (
object);
@@ -445,6 +479,14 @@ empathy_contact_selector_dialog_class_init (
"Whether or not this dialog should show an account chooser",
TRUE,
G_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class, PROP_FILTER_ACCOUNT,
+ g_param_spec_object ("filter-account",
+ "Account to filter contacts",
+ "if 'show-account-chooser' is unset, only the contacts from this "
+ "account are displayed",
+ TP_TYPE_ACCOUNT,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
const gchar *
@@ -502,3 +544,31 @@ empathy_contact_selector_dialog_get_show_account_chooser (
priv = GET_PRIV (self);
return priv->show_account_chooser;
}
+
+void
+empathy_contact_selector_dialog_set_filter_account (
+ EmpathyContactSelectorDialog *self,
+ TpAccount *account)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self));
+
+ priv = GET_PRIV (self);
+ priv->filter_account = g_object_ref (account);
+
+ g_object_notify (G_OBJECT (self), "filter-account");
+}
+
+TpAccount *
+empathy_contact_selector_dialog_get_filter_account (
+ EmpathyContactSelectorDialog *self)
+{
+ EmpathyContactSelectorDialogPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR_DIALOG (self), NULL);
+
+ priv = GET_PRIV (self);
+ return priv->filter_account;
+
+}
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.h b/libempathy-gtk/empathy-contact-selector-dialog.h
index 87b2812f4..318a9bcac 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.h
+++ b/libempathy-gtk/empathy-contact-selector-dialog.h
@@ -62,6 +62,13 @@ void empathy_contact_selector_dialog_set_show_account_chooser (
gboolean empathy_contact_selector_dialog_get_show_account_chooser (
EmpathyContactSelectorDialog *self);
+void empathy_contact_selector_dialog_set_filter_account (
+ EmpathyContactSelectorDialog *self,
+ TpAccount *account);
+
+TpAccount * empathy_contact_selector_dialog_get_filter_account (
+ EmpathyContactSelectorDialog *self);
+
/* TYPE MACROS */
#define EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG \
(empathy_contact_selector_dialog_get_type ())
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 696a8cda4..82a5ac703 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -82,6 +82,7 @@ typedef struct
EmpathyContact *contact;
EmpathyContactWidgetFlags flags;
guint widget_id_timeout;
+ gulong fav_sig_id;
GtkWidget *vbox_contact_widget;
@@ -100,6 +101,7 @@ typedef struct
GtkWidget *label_status;
GtkWidget *table_contact;
GtkWidget *vbox_avatar;
+ GtkWidget *favourite_checkbox;
/* Location */
GtkWidget *vbox_location;
@@ -448,7 +450,6 @@ contact_widget_groups_setup (EmpathyContactWidget *information)
{
if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_GROUPS)
{
- information->manager = empathy_contact_manager_dup_singleton ();
contact_widget_model_setup (information);
}
}
@@ -964,6 +965,21 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *information)
gtk_widget_show (information->image_state);
}
+#if HAVE_FAVOURITE_CONTACTS
+static void
+contact_widget_favourites_changed_cb (EmpathyContactManager *manager,
+ EmpathyContact *contact,
+ gboolean is_favourite,
+ EmpathyContactWidget *information)
+{
+ if (contact != information->contact)
+ return;
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (
+ information->favourite_checkbox), is_favourite);
+}
+#endif
+
static void
contact_widget_remove_contact (EmpathyContactWidget *information)
{
@@ -1052,6 +1068,20 @@ contact_widget_contact_update (EmpathyContactWidget *information)
contact_widget_presence_notify_cb (information);
contact_widget_avatar_notify_cb (information);
+#if HAVE_FAVOURITE_CONTACTS
+ if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE)
+ {
+ gboolean is_favourite;
+
+ is_favourite = empathy_contact_list_is_favourite (
+ EMPATHY_CONTACT_LIST (information->manager),
+ information->contact);
+
+ contact_widget_favourites_changed_cb (information->manager,
+ information->contact, is_favourite, information);
+ }
+#endif
+
gtk_widget_show (information->label_alias);
gtk_widget_show (information->widget_alias);
gtk_widget_show (information->hbox_presence);
@@ -1181,6 +1211,28 @@ contact_widget_id_focus_out_cb (GtkWidget *widget,
return FALSE;
}
+#if HAVE_FAVOURITE_CONTACTS
+static void
+favourite_toggled_cb (GtkToggleButton *button,
+ EmpathyContactWidget *information)
+{
+ gboolean active;
+
+ active = gtk_toggle_button_get_active (button);
+
+ if (active)
+ {
+ empathy_contact_list_add_to_favourites (
+ EMPATHY_CONTACT_LIST (information->manager), information->contact);
+ }
+ else
+ {
+ empathy_contact_list_remove_from_favourites (
+ EMPATHY_CONTACT_LIST (information->manager), information->contact);
+ }
+}
+#endif
+
static void
contact_widget_contact_setup (EmpathyContactWidget *information)
{
@@ -1318,6 +1370,27 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
gtk_label_set_selectable (GTK_LABEL (information->label_status), FALSE);
}
gtk_widget_show (information->widget_alias);
+
+#if HAVE_FAVOURITE_CONTACTS
+ /* Favorite */
+ if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE)
+ {
+ information->favourite_checkbox = gtk_check_button_new_with_label (
+ _("Favorite"));
+
+ g_signal_connect (information->favourite_checkbox, "toggled",
+ G_CALLBACK (favourite_toggled_cb), information);
+
+ gtk_table_attach_defaults (GTK_TABLE (information->table_contact),
+ information->favourite_checkbox, 0, 2, 3, 4);
+
+ information->fav_sig_id = g_signal_connect (information->manager,
+ "favourites-changed",
+ G_CALLBACK (contact_widget_favourites_changed_cb), information);
+
+ gtk_widget_show (information->favourite_checkbox);
+ }
+#endif
}
static void
@@ -1330,10 +1403,11 @@ contact_widget_destroy_cb (GtkWidget *widget,
{
g_source_remove (information->widget_id_timeout);
}
- if (information->manager)
- {
- g_object_unref (information->manager);
- }
+
+ if (information->fav_sig_id != 0)
+ g_signal_handler_disconnect (information->manager, information->fav_sig_id);
+
+ g_object_unref (information->manager);
g_slice_free (EmpathyContactWidget, information);
}
@@ -1401,6 +1475,8 @@ empathy_contact_widget_new (EmpathyContact *contact,
"EmpathyContactWidget",
information);
+ information->manager = empathy_contact_manager_dup_singleton ();
+
/* Create widgets */
contact_widget_contact_setup (information);
contact_widget_groups_setup (information);
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 04b567f4d..af669477e 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -61,6 +61,7 @@ typedef enum
EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP = 1 << 5,
EMPATHY_CONTACT_WIDGET_SHOW_LOCATION = 1 << 6,
EMPATHY_CONTACT_WIDGET_NO_SET_ALIAS = 1 << 7,
+ EMPATHY_CONTACT_WIDGET_EDIT_FAVOURITE = 1 << 8,
} EmpathyContactWidgetFlags;
GtkWidget * empathy_contact_widget_new (EmpathyContact *contact,
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index 5c3fb1972..a661cd477 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -203,6 +203,14 @@ empathy_add_link_markup (const gchar *text)
g_return_val_if_fail (text != NULL, NULL);
+ /* GtkLabel with links could make infinite loop because of
+ * GNOME bug #612066. It is fixed in GTK >= 2.18.8 and GTK >= 2.19.7.
+ * FIXME: Remove this check once we have an hard dep on GTK 2.20 */
+ if (gtk_check_version (2, 18, 8) != NULL ||
+ (gtk_minor_version == 19 && gtk_micro_version < 7)) {
+ return g_markup_escape_text (text, -1);
+ }
+
string = g_string_sized_new (strlen (text));
empathy_string_parser_substr (text, -1, parsers, string);
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 807b6afaf..4503a39cc 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1385,10 +1385,10 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
/* Takes care of moving the window to the current workspace. */
void
-empathy_window_present (GtkWindow *window,
- gboolean steal_focus)
+empathy_window_present (GtkWindow *window)
{
GdkWindow *gdk_window;
+ guint32 timestamp;
g_return_if_fail (GTK_IS_WINDOW (window));
@@ -1410,7 +1410,12 @@ empathy_window_present (GtkWindow *window,
gtk_widget_hide (GTK_WIDGET (window));
}
- gtk_window_present_with_time (window, G_MAXINT32);
+ timestamp = gtk_get_current_event_time ();
+ if (timestamp == 0)
+ /* No event, fallback to _NET_WM_USER_TIME */
+ timestamp = gdk_x11_display_get_user_time (gdk_display_get_default ());
+
+ gtk_window_present_with_time (window, timestamp);
gtk_window_set_skip_taskbar_hint (window, FALSE);
gtk_window_deiconify (window);
}
@@ -1631,6 +1636,9 @@ empathy_send_file_with_file_chooser (EmpathyContact *contact)
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), FALSE);
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget),
+ g_get_home_dir ());
+
g_signal_connect (widget, "response",
G_CALLBACK (file_manager_send_file_response_cb),
contact);
@@ -1669,6 +1677,7 @@ void
empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
{
GtkWidget *widget;
+ const gchar *dir;
widget = gtk_file_chooser_dialog_new (_("Select a destination"),
NULL,
@@ -1683,6 +1692,13 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
gtk_file_chooser_set_do_overwrite_confirmation
(GTK_FILE_CHOOSER (widget), TRUE);
+ dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
+ if (dir == NULL)
+ /* Fallback to $HOME if $XDG_DOWNLOAD_DIR is not set */
+ dir = g_get_home_dir ();
+
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), dir);
+
g_signal_connect (widget, "response",
G_CALLBACK (file_manager_receive_file_response_cb), handler);
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 38732c7f9..8834cb4c9 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -104,8 +104,7 @@ gboolean empathy_text_iter_backward_search (const GtkTextIter*iter,
const GtkTextIter*limit);
/* Windows */
gboolean empathy_window_get_is_visible (GtkWindow *window);
-void empathy_window_present (GtkWindow *window,
- gboolean steal_focus);
+void empathy_window_present (GtkWindow *window);
void empathy_window_iconify (GtkWindow *window,
GtkStatusIcon *status_icon);
GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index bfb85f53f..d5513caf1 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -112,7 +112,7 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager)
xmlNewTextChild (node, NULL, (const xmlChar *) "name",
(const xmlChar *) empathy_chatroom_get_name (chatroom));
xmlNewTextChild (node, NULL, (const xmlChar *) "room",
- (const xmlChar *) empathy_chatroom_get_name (chatroom));
+ (const xmlChar *) empathy_chatroom_get_room (chatroom));
xmlNewTextChild (node, NULL, (const xmlChar *) "account",
(const xmlChar *) account_id);
xmlNewTextChild (node, NULL, (const xmlChar *) "auto_connect",
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index d4859210a..0a3d361d4 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -73,6 +73,15 @@ contact_list_base_init (gpointer klass)
5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ g_signal_new ("favourites-changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ _empathy_marshal_VOID__OBJECT_BOOLEAN,
+ G_TYPE_NONE,
+ 2, EMPATHY_TYPE_CONTACT, G_TYPE_BOOLEAN);
+
g_signal_new ("pendings-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -249,3 +258,41 @@ empathy_contact_list_get_flags (EmpathyContactList *list)
return 0;
}
}
+
+gboolean
+empathy_contact_list_is_favourite (EmpathyContactList *list,
+ EmpathyContact *contact)
+{
+#if HAVE_FAVOURITE_CONTACTS
+ if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite) {
+ return EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite (
+ list, contact);
+ }
+#endif /* HAVE_FAVOURITE_CONTACTS */
+
+ return FALSE;
+}
+
+void
+empathy_contact_list_add_to_favourites (EmpathyContactList *list,
+ EmpathyContact *contact)
+{
+#if HAVE_FAVOURITE_CONTACTS
+ if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite) {
+ EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite (list,
+ contact);
+ }
+#endif /* HAVE_FAVOURITE_CONTACTS */
+}
+
+void
+empathy_contact_list_remove_from_favourites (EmpathyContactList *list,
+ EmpathyContact *contact)
+{
+#if HAVE_FAVOURITE_CONTACTS
+ if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite) {
+ EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite (list,
+ contact);
+ }
+#endif /* HAVE_FAVOURITE_CONTACTS */
+}
diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
index 28238e44a..8d2f445e1 100644
--- a/libempathy/empathy-contact-list.h
+++ b/libempathy/empathy-contact-list.h
@@ -73,6 +73,12 @@ struct _EmpathyContactListIface {
(*get_monitor) (EmpathyContactList *list);
EmpathyContactListFlags
(*get_flags) (EmpathyContactList *list);
+ gboolean (*is_favourite) (EmpathyContactList *list,
+ EmpathyContact *contact);
+ void (*add_favourite) (EmpathyContactList *list,
+ EmpathyContact *contact);
+ void (*remove_favourite) (EmpathyContactList *list,
+ EmpathyContact *contact);
};
GType empathy_contact_list_get_type (void) G_GNUC_CONST;
@@ -104,6 +110,17 @@ EmpathyContactMonitor *
EmpathyContactListFlags
empathy_contact_list_get_flags (EmpathyContactList *list);
+gboolean empathy_contact_list_is_favourite (EmpathyContactList *list,
+ EmpathyContact *contact);
+
+void empathy_contact_list_add_to_favourites (EmpathyContactList *list,
+ EmpathyContact *contact);
+
+void empathy_contact_list_remove_from_favourites
+ (EmpathyContactList *list,
+ EmpathyContact *contact);
+
+
G_END_DECLS
#endif /* __EMPATHY_CONTACT_LIST_H__ */
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index ee3b70516..fd7b08b14 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -25,6 +25,10 @@
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/enums.h>
+#include <telepathy-glib/proxy-subclass.h>
+#include <telepathy-glib/util.h>
+
+#include <extensions/extensions.h>
#include "empathy-contact-manager.h"
#include "empathy-contact-monitor.h"
@@ -39,6 +43,11 @@ typedef struct {
GHashTable *lists;
TpAccountManager *account_manager;
EmpathyContactMonitor *contact_monitor;
+ TpProxy *logger;
+ /* account object path (gchar *) => GHashTable containing favorite contacts
+ * (contact ID (gchar *) => TRUE) */
+ GHashTable *favourites;
+ TpProxySignalConnection *favourite_contacts_changed_signal;
} EmpathyContactManagerPriv;
static void contact_manager_iface_init (EmpathyContactListIface *iface);
@@ -188,15 +197,192 @@ contact_manager_validity_changed_cb (TpAccountManager *account_manager,
}
}
+static gboolean
+contact_manager_is_favourite (EmpathyContactList *manager,
+ EmpathyContact *contact)
+{
+ EmpathyContactManagerPriv *priv;
+ TpAccount *account;
+ const gchar *account_name;
+ GHashTable *contact_hash;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE);
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), FALSE);
+
+ priv = GET_PRIV (manager);
+
+ account = empathy_contact_get_account (contact);
+ account_name = tp_proxy_get_object_path (TP_PROXY (account));
+ contact_hash = g_hash_table_lookup (priv->favourites, account_name);
+
+ if (contact_hash != NULL) {
+ const gchar *contact_id = empathy_contact_get_id (contact);
+
+ if (g_hash_table_lookup (contact_hash, contact_id) != NULL)
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+add_favourite_contact_cb (TpProxy *proxy,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ if (error != NULL)
+ DEBUG ("AddFavouriteContact failed: %s", error->message);
+}
+
+static void
+contact_manager_add_favourite (EmpathyContactList *manager,
+ EmpathyContact *contact)
+{
+ EmpathyContactManagerPriv *priv;
+ TpAccount *account;
+ const gchar *account_name;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
+ g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
+ priv = GET_PRIV (manager);
+
+ account = empathy_contact_get_account (contact);
+ account_name = tp_proxy_get_object_path (TP_PROXY (account));
+
+ emp_cli_logger_call_add_favourite_contact (priv->logger, -1,
+ account_name,
+ empathy_contact_get_id (contact),
+ add_favourite_contact_cb, NULL, NULL, G_OBJECT (manager));
+}
+
+static void
+remove_favourite_contact_cb (TpProxy *proxy,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ if (error != NULL)
+ DEBUG ("RemoveFavouriteContact failed: %s", error->message);
+}
+
+static void
+contact_manager_remove_favourite (EmpathyContactList *manager,
+ EmpathyContact *contact)
+{
+ EmpathyContactManagerPriv *priv;
+ TpAccount *account;
+ const gchar *account_name;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
+ g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
+ priv = GET_PRIV (manager);
+
+ account = empathy_contact_get_account (contact);
+ account_name = tp_proxy_get_object_path (TP_PROXY (account));
+
+ emp_cli_logger_call_remove_favourite_contact (priv->logger, -1,
+ account_name,
+ empathy_contact_get_id (contact),
+ remove_favourite_contact_cb, NULL, NULL, G_OBJECT (manager));
+}
+
+static void
+add_contacts_to_favourites (EmpathyContactManager *self,
+ const gchar *account,
+ const gchar **contacts)
+{
+ EmpathyContactManagerPriv *priv = GET_PRIV (self);
+ guint j;
+ GHashTable *contact_hash;
+
+ contact_hash = g_hash_table_lookup (priv->favourites, account);
+ if (contact_hash == NULL) {
+ contact_hash = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free, NULL);
+
+ g_hash_table_insert (priv->favourites,
+ g_strdup (account),
+ contact_hash);
+ }
+
+ for (j = 0; contacts && contacts[j] != NULL; j++) {
+ g_hash_table_insert (contact_hash,
+ g_strdup (contacts[j]),
+ GINT_TO_POINTER (1));
+ }
+}
+
+static void
+logger_favourite_contacts_add_from_value_array (GValueArray *va,
+ EmpathyContactManager *manager)
+{
+ guint i;
+
+ for (i = 0; i < va->n_values; i++) {
+ GValue *account_value;
+ const gchar *account;
+ GValue *contacts_value;
+ const gchar **contacts;
+
+ account_value = g_value_array_get_nth (va, 0);
+ contacts_value = g_value_array_get_nth (va, 1);
+
+ account = g_value_get_boxed (account_value);
+ contacts = g_value_get_boxed (contacts_value);
+
+ add_contacts_to_favourites (manager, account, contacts);
+ }
+}
+
+static void
+logger_favourite_contacts_get_cb (TpProxy *proxy,
+ const GPtrArray *result,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyContactManager *manager = EMPATHY_CONTACT_MANAGER (user_data);
+
+ if (error == NULL) {
+ g_ptr_array_foreach ((GPtrArray *) result,
+ (GFunc)
+ logger_favourite_contacts_add_from_value_array,
+ manager);
+ } else {
+ DEBUG ("Failed to get the FavouriteContacts property: %s",
+ error->message);
+ }
+}
+
+static void
+logger_favourite_contacts_setup (EmpathyContactManager *manager)
+{
+ EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+
+ emp_cli_logger_call_get_favourite_contacts (priv->logger, -1,
+ logger_favourite_contacts_get_cb, manager, NULL,
+ G_OBJECT (manager));
+}
+
static void
contact_manager_finalize (GObject *object)
{
EmpathyContactManagerPriv *priv = GET_PRIV (object);
+ tp_proxy_signal_connection_disconnect (priv->favourite_contacts_changed_signal);
+
+ if (priv->logger != NULL)
+ g_object_unref (priv->logger);
+
g_hash_table_foreach (priv->lists,
contact_manager_disconnect_foreach,
object);
g_hash_table_destroy (priv->lists);
+ g_hash_table_destroy (priv->favourites);
g_object_unref (priv->account_manager);
@@ -291,22 +477,150 @@ account_manager_prepared_cb (GObject *source_object,
G_OBJECT (manager));
}
+static EmpathyContact *
+contact_manager_lookup_contact (EmpathyContactManager *manager,
+ const gchar *account_name,
+ const gchar *contact_id)
+{
+ EmpathyContact *retval = NULL;
+ GList *members, *l;
+
+ /* XXX: any more efficient way to do this (other than having to build
+ * and maintain a hash)? */
+ members = empathy_contact_list_get_members (
+ EMPATHY_CONTACT_LIST (manager));
+ for (l = members; l; l = l->next) {
+ EmpathyContact *contact = l->data;
+ TpAccount *account = empathy_contact_get_account (contact);
+ const gchar *id_cur;
+ const gchar *name_cur;
+
+ id_cur = empathy_contact_get_id (contact);
+ name_cur = tp_proxy_get_object_path (TP_PROXY (account));
+
+ if (!tp_strdiff (contact_id, id_cur) &&
+ !tp_strdiff (account_name, name_cur)) {
+ retval = contact;
+ }
+
+ g_object_unref (contact);
+ }
+
+ g_list_free (members);
+
+ return retval;
+}
+
+static void
+logger_favourite_contacts_changed_cb (TpProxy *proxy,
+ const gchar *account_name,
+ const gchar **added,
+ const gchar **removed,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyContactManagerPriv *priv;
+ EmpathyContactManager *manager = EMPATHY_CONTACT_MANAGER (weak_object);
+ GHashTable *contact_hash;
+ EmpathyContact *contact;
+ gint i;
+
+ priv = GET_PRIV (manager);
+
+ contact_hash = g_hash_table_lookup (priv->favourites, account_name);
+
+ /* XXX: note that, at the time of this comment, there will always be
+ * exactly one contact amongst added and removed, so the linear lookup
+ * of each contact isn't as painful as it appears */
+
+ add_contacts_to_favourites (manager, account_name, added);
+
+ for (i = 0; added && added[i]; i++) {
+ contact = contact_manager_lookup_contact (manager, account_name,
+ added[i]);
+ if (contact != NULL)
+ g_signal_emit_by_name (manager, "favourites-changed",
+ contact, TRUE);
+ else
+ DEBUG ("failed to find contact for account %s, contact "
+ "id %s", account_name, added[i]);
+ }
+
+ for (i = 0; removed && removed[i]; i++) {
+ contact_hash = g_hash_table_lookup (priv->favourites,
+ account_name);
+
+ if (contact_hash != NULL) {
+ g_hash_table_remove (contact_hash, removed[i]);
+
+ if (g_hash_table_size (contact_hash) < 1) {
+ g_hash_table_remove (priv->favourites,
+ account_name);
+ }
+ }
+
+ contact = contact_manager_lookup_contact (manager, account_name,
+ removed[i]);
+ if (contact != NULL)
+ g_signal_emit_by_name (manager, "favourites-changed",
+ contact, FALSE);
+ else
+ DEBUG ("failed to find contact for account %s, contact "
+ "id %s", account_name, removed[i]);
+ }
+}
+
static void
empathy_contact_manager_init (EmpathyContactManager *manager)
{
EmpathyContactManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerPriv);
+ TpDBusDaemon *bus;
+ GError *error = NULL;
manager->priv = priv;
priv->lists = g_hash_table_new_full (empathy_proxy_hash,
empathy_proxy_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_object_unref);
+
+ priv->favourites = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify)
+ g_hash_table_unref);
+
priv->account_manager = tp_account_manager_dup ();
priv->contact_monitor = NULL;
tp_account_manager_prepare_async (priv->account_manager, NULL,
account_manager_prepared_cb, manager);
+
+ bus = tp_dbus_daemon_dup (&error);
+
+ if (error == NULL) {
+ priv->logger = g_object_new (TP_TYPE_PROXY,
+ "bus-name", "org.freedesktop.Telepathy.Logger",
+ "object-path",
+ "/org/freedesktop/Telepathy/Logger",
+ "dbus-daemon", bus,
+ NULL);
+ g_object_unref (bus);
+
+ tp_proxy_add_interface_by_id (priv->logger,
+ EMP_IFACE_QUARK_LOGGER);
+
+ logger_favourite_contacts_setup (manager);
+
+ priv->favourite_contacts_changed_signal =
+ emp_cli_logger_connect_to_favourite_contacts_changed (
+ priv->logger,
+ logger_favourite_contacts_changed_cb, NULL,
+ NULL, G_OBJECT (manager), NULL);
+ } else {
+ DEBUG ("Failed to get telepathy-logger proxy: %s",
+ error->message);
+ g_clear_error (&error);
+ }
}
EmpathyContactManager *
@@ -590,6 +904,9 @@ contact_manager_iface_init (EmpathyContactListIface *iface)
iface->remove_from_group = contact_manager_remove_from_group;
iface->rename_group = contact_manager_rename_group;
iface->remove_group = contact_manager_remove_group;
+ iface->is_favourite = contact_manager_is_favourite;
+ iface->remove_favourite = contact_manager_remove_favourite;
+ iface->add_favourite = contact_manager_add_favourite;
}
EmpathyContactListFlags
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index caf697cb6..1edefe9bf 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1808,7 +1808,7 @@ channel_class_matches (GValueArray *class,
h_type = tp_asv_get_uint32 (fprops,
TP_IFACE_CHANNEL ".TargetHandleType", &valid);
- if (!valid || handle_type != h_type)
+ if (!valid || (handle_type != h_type && handle_type != TP_UNKNOWN_HANDLE_TYPE))
return FALSE;
if (fixed_properties != NULL)
@@ -1978,7 +1978,8 @@ setup_varargs (va_list var_args,
* @dispatcher: an #EmpathyDispatcher
* @connection: a #TpConnection
* @channel_type: a string identifying the type of the channel to lookup
- * @handle_type: the handle type for the channel
+ * @handle_type: the handle type for the channel, or %TP_UNKNOWN_HANDLE_TYPE
+ * if you don't care about the channel's target handle type
* @first_property_name: %NULL, or the name of the first fixed property,
* followed optionally by more names, followed by %NULL.
*
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index e9bb1a4ac..3ee3f39a3 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -226,31 +226,20 @@ idle_session_status_changed_cb (DBusGProxy *gs_proxy,
priv->away_saved_state, new_state);
empathy_idle_set_state (idle, new_state);
} else if (!is_idle && priv->is_idle) {
- const gchar *new_status;
/* We are no more idle, restore state */
idle_ext_away_stop (idle);
- if (priv->away_saved_state == TP_CONNECTION_PRESENCE_TYPE_AWAY ||
- priv->away_saved_state == TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY) {
- priv->away_saved_state = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
- new_status = NULL;
- } else {
- new_status = priv->status;
- }
-
/* Only try and set the presence if the away saved state is not
* unset. This is an odd case because it means that the session
* didn't notify us of the state change to idle, and as a
* result, we couldn't save the current state at that time.
*/
if (priv->away_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
- DEBUG ("Restoring state to %d, reset status to %s",
- priv->away_saved_state, new_status);
+ DEBUG ("Restoring state to %d",
+ priv->away_saved_state);
- empathy_idle_set_presence (idle,
- priv->away_saved_state,
- new_status);
+ empathy_idle_set_state (idle,priv->away_saved_state);
} else {
DEBUG ("Away saved state is unset. This means that we "
"weren't told when the session went idle. "
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 2088fca03..06eb935ca 100644
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -815,3 +815,10 @@ log_store_iface_init (gpointer g_iface,
iface->ack_message = NULL;
iface->get_filtered_messages = log_store_empathy_get_filtered_messages;
}
+
+gchar *
+empathy_log_store_empathy_get_dir (EmpathyLogStoreEmpathy *store,
+ TpAccount *account)
+{
+ return log_store_empathy_get_dir (EMPATHY_LOG_STORE (store), account, NULL, FALSE);
+}
diff --git a/libempathy/empathy-log-store-empathy.h b/libempathy/empathy-log-store-empathy.h
index 3b26d2ccf..5fa6c2286 100644
--- a/libempathy/empathy-log-store-empathy.h
+++ b/libempathy/empathy-log-store-empathy.h
@@ -30,6 +30,8 @@
#include <glib.h>
+#include <telepathy-glib/account.h>
+
G_BEGIN_DECLS
#define EMPATHY_TYPE_LOG_STORE_EMPATHY \
@@ -64,6 +66,9 @@ struct _EmpathyLogStoreEmpathyClass
GType empathy_log_store_empathy_get_type (void);
+gchar * empathy_log_store_empathy_get_dir (EmpathyLogStoreEmpathy *store,
+ TpAccount *account);
+
G_END_DECLS
#endif /* ENABLE_TPL */
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index cba102add..7877acb22 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -885,6 +885,14 @@ tp_chat_update_remote_contact (EmpathyTpChat *chat)
return;
}
+ /* This is an MSN chat, but it's the new style where 1-1 chats don't
+ * have the group interface. If it has the conference interface, then
+ * it is indeed a MUC. */
+ if (tp_proxy_has_interface_by_id (priv->channel,
+ EMP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
+ return;
+ }
+
/* This is an MSN-like chat where anyone can join the chat at anytime.
* If there is only one non-self contact member, we are in a private
* chat and we set the "remote-contact" property to that contact. If
@@ -1280,7 +1288,7 @@ tp_chat_constructor (GType type,
list = empathy_dispatcher_find_requestable_channel_classes (
dispatcher, connection,
tp_channel_get_channel_type (priv->channel),
- TP_HANDLE_TYPE_ROOM, NULL);
+ TP_UNKNOWN_HANDLE_TYPE, NULL);
for (ptr = list; ptr; ptr = ptr->next) {
GValueArray *array = ptr->data;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65bb2b932..7b231f35a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -93,3 +93,4 @@ src/empathy-invite-participant-dialog.c
src/cc-empathy-accounts-page.c
src/cc-empathy-accounts-panel.c
src/empathy-accounts.c
+src/empathy-debugger.c
diff --git a/po/br.po b/po/br.po
index 851e6d696..c029d6963 100644
--- a/po/br.po
+++ b/po/br.po
@@ -2,437 +2,579 @@
# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
# This file is distributed under the same license as the empathy package.
# Denis <denisarnuad@yahoo.fr>, 2009.
-#
+# Jérémy AR FLOC'H <jeremy.lefloch@gmail.com>, 2010.
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: 2009-08-06 04:15+0000\n"
-"PO-Revision-Date: 2009-08-20 10:59+0100\n"
-"Last-Translator: denis <denisarnuad@yahoo.fr>\n"
-"Language-Team: Brenux <brenux@free.fr>\n"
+"POT-Creation-Date: 2010-03-11 17:41+0000\n"
+"PO-Revision-Date: 2010-03-11 20:00+0100\n"
+"Last-Translator: Jérémy AR FLOC'H <jeremy.lefloch@gmail.com>\n"
+"Language-Team: Breton <jeremy.lefloch@gmail.com>\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-Launchpad-Export-Date: 2010-03-11 18:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
+msgstr "Postelerezh prim Empathy"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
msgstr "Arval postelerezh prim Empathy"
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Kas ha resev posteloù prim"
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Send and receive messages"
+msgstr "Kas ha reseviñ kemennadoù"
#: ../data/empathy.schemas.in.h:1
msgid "Always open a separate chat window for new chats."
-msgstr ""
+msgstr "Digeriñ ur prenestr flapañ dispartiet evit ar c'haozeadegoù nevez."
#: ../data/empathy.schemas.in.h:2
msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr ""
+msgstr "Arouezenn da ouzhpennañ goude al lesanv pa vez implijet emglokadur al lesanv (tab) en ur strollad eskemm."
#: ../data/empathy.schemas.in.h:3
msgid "Chat window theme"
-msgstr "Neuz ar prenestr flapañ"
+msgstr "Dodenn ar prenestr flapañ"
#: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr ""
+#, fuzzy
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Roll ar yezhoù d'implijout evit an difazierien reizhskrivadur, rannet gant virgulennoù (da skouer : en, fr, nl)."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
-msgstr "Roll an darempredoù"
+msgstr "Roll fetis an darempredoù"
#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
-msgstr ""
+msgid "Connection managers should be used"
+msgstr "Merour kevreadennoù a rankfe bezañ implijet"
#: ../data/empathy.schemas.in.h:7
-msgid "Default directory to select an avatar image from"
-msgstr ""
+#, fuzzy
+msgid "Contact list sort criterion"
+msgstr "Dezverk rummañ evit roll an darempredoù"
#: ../data/empathy.schemas.in.h:8
-msgid "Disable popup notifications when away"
-msgstr ""
+msgid "Default directory to select an avatar image from"
+msgstr "Kavlec'h dre ziouer e-lec'h dibab ur skeudennig"
#: ../data/empathy.schemas.in.h:9
-msgid "Disable sounds when away"
-msgstr ""
+msgid "Disable popup notifications when away"
+msgstr "Diweredekaat al lagadennoù-kemenn e mod esvezant"
#: ../data/empathy.schemas.in.h:10
-msgid "Empathy can publish the user's location"
-msgstr ""
+msgid "Disable sounds when away"
+msgstr "Diweredekaat sonioù e mod esvezant"
#: ../data/empathy.schemas.in.h:11
-msgid "Empathy can use the GPS to guess the location"
-msgstr ""
+msgid "Empathy can publish the user's location"
+msgstr "Empathy a c'hall embann lec'hiadur an arveriad"
#: ../data/empathy.schemas.in.h:12
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy a c'hall implijout ar GPS evit dizoleiñ al lec'hiadur"
#: ../data/empathy.schemas.in.h:13
-msgid "Empathy can use the network to guess the location"
-msgstr ""
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy a c'hall implijout ar rouedad pellgomz hezoug evit dizoleiñ al lec'hiadur"
#: ../data/empathy.schemas.in.h:14
-msgid "Empathy default download folder"
-msgstr ""
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy a c'hall implijout ar rouedad evit dizoleiñ al lec'hiadur"
#: ../data/empathy.schemas.in.h:15
-msgid "Empathy has asked about importing accounts"
-msgstr ""
+msgid "Empathy default download folder"
+msgstr "Teuliad pellgargañ Empathy dre ziouer"
#: ../data/empathy.schemas.in.h:16
-msgid "Empathy should auto-connect on startup"
-msgstr ""
+msgid "Empathy has asked about importing accounts"
+msgstr "Empathy en deus goulennet d'enporzhiañ kontoù"
#: ../data/empathy.schemas.in.h:17
-msgid "Empathy should reduce the location's accuracy"
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy a rank kevreañ emgefre d'al loc'hañ"
#: ../data/empathy.schemas.in.h:18
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy a rank disteraat resisted al lec'hiadur"
#: ../data/empathy.schemas.in.h:19
-msgid "Enable WebKit Developer Tools"
-msgstr "Gweredekaat binvioù Webkit an diorrenour"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy a rank implijout skeudennig an darempred evel arlun ar prenestr flapañ"
#: ../data/empathy.schemas.in.h:20
-msgid "Enable popup notifications for new messages"
-msgstr "Gweredekaat rebuzadurioù dre ziflugelloù evit ar c'hemennadennoù nevez"
+msgid "Enable WebKit Developer Tools"
+msgstr "Gweredekaat binvioù diorren WebKit"
#: ../data/empathy.schemas.in.h:21
-msgid "Enable spell checker"
-msgstr "Gweredekaat an difazier"
+msgid "Enable popup notifications for new messages"
+msgstr "Gweredekaat lagadennoù-kemenn evit ar c'hemennadoù nevez"
#: ../data/empathy.schemas.in.h:22
+msgid "Enable spell checker"
+msgstr "Gweredekaat an difazier reizhskrivadur"
+
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "Kuzhat ar prenestr pennañ"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "Kuzhat ar prenestr pennañ."
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr ""
-
#: ../data/empathy.schemas.in.h:25
-msgid "Nick completed character"
-msgstr ""
+msgid "MC 4 accounts have been imported"
+msgstr "Kontoù MC 4 zo bet enporzhiet"
#: ../data/empathy.schemas.in.h:26
-msgid "Open new chats in separate windows"
-msgstr ""
+msgid "MC 4 accounts have been imported."
+msgstr "Kontoù MC 4 zo bet enporzhiet."
#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use"
-msgstr ""
+msgid "Nick completed character"
+msgstr "Arouezenn emglokadur al lesanv"
#: ../data/empathy.schemas.in.h:28
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr ""
+msgid "Open new chats in separate windows"
+msgstr "Digeriñ kaozeadennoù nevez e prenistri dispartiet"
#: ../data/empathy.schemas.in.h:29
-msgid "Play a sound for incoming messages"
-msgstr ""
+#, fuzzy
+msgid "Path of the Adium theme to use"
+msgstr "Hent an dodenn Adium d'implijout"
#: ../data/empathy.schemas.in.h:30
-msgid "Play a sound for new conversations"
-msgstr "Seniñ ur son evit ur gaozadenn nevez"
+#, fuzzy
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Hent an dodenn Adium d'implijout ma vez un dodenn Adium dibabet evit ar c'haozeadegoù."
#: ../data/empathy.schemas.in.h:31
-msgid "Play a sound for outgoing messages"
-msgstr ""
+msgid "Play a sound for incoming messages"
+msgstr "Seniñ ur son pa vez resevet kemennadoù"
#: ../data/empathy.schemas.in.h:32
-msgid "Play a sound when a contact logs in"
-msgstr ""
+msgid "Play a sound for new conversations"
+msgstr "Seniñ ur son evit kaozeadennoù nevez"
#: ../data/empathy.schemas.in.h:33
-msgid "Play a sound when a contact logs out"
-msgstr ""
+msgid "Play a sound for outgoing messages"
+msgstr "Seniñ ur son pa vez kaset kemennadoù"
#: ../data/empathy.schemas.in.h:34
-msgid "Play a sound when we log in"
-msgstr ""
+msgid "Play a sound when a contact logs in"
+msgstr "Seniñ ur son pa vez luget un darempred"
#: ../data/empathy.schemas.in.h:35
-msgid "Play a sound when we log out"
-msgstr ""
+msgid "Play a sound when a contact logs out"
+msgstr "Seniñ ur son pa vez diluget un darempred"
#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications if the chat isn't focused"
-msgstr ""
+msgid "Play a sound when we log in"
+msgstr "Seniñ ur son evit al lugañ"
#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign in"
-msgstr ""
+msgid "Play a sound when we log out"
+msgstr "Seniñ ur son evit an dilugañ"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications when a contact sign out"
-msgstr ""
+#, fuzzy
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Lagadennoù-kemenn ma n'eus ket fokus war ar gaozeadenn"
#: ../data/empathy.schemas.in.h:39
-msgid "Salut account is created"
-msgstr "Krouet eo ar gont Salut"
+#, fuzzy
+msgid "Pop up notifications when a contact logs in"
+msgstr "Lagadennoù-kemenn pa vez luget un darempred"
#: ../data/empathy.schemas.in.h:40
-msgid "Show avatars"
-msgstr "Diskouez an avataroù"
+#, fuzzy
+msgid "Pop up notifications when a contact logs out"
+msgstr "Lagadennoù-kemenn pa vez diluget un darempred"
#: ../data/empathy.schemas.in.h:41
+msgid "Show avatars"
+msgstr "Diskouez ar skeudennoùigoù"
+
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Diskouez roll ar darempredoù er salioù"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
-msgstr ""
+msgstr "Diskouez un tun a-fed serriñ ar prenestr pennañ"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Diskouez an darempredoù ezlinenn"
-#: ../data/empathy.schemas.in.h:44
-msgid "Spell checking languages"
-msgstr "Yezhoù an difazier"
-
#: ../data/empathy.schemas.in.h:45
-msgid "The default folder to save file transfers in."
-msgstr ""
+#, fuzzy
+msgid "Show protocols"
+msgstr "Komenad"
#: ../data/empathy.schemas.in.h:46
-msgid "The last directory that an avatar image was chosen from."
-msgstr ""
+msgid "Spell checking languages"
+msgstr "Yezhoù an difazier reizhskrivadur"
#: ../data/empathy.schemas.in.h:47
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
+msgid "The default folder to save file transfers in."
+msgstr "Teuliad dre ziouer evit enrollañ an treuzkasadoù restr."
#: ../data/empathy.schemas.in.h:48
-msgid "Use graphical smileys"
-msgstr ""
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Kavlec'h diwezhañ e-lec'h ez eus bet dibabet ur skeudennig."
#: ../data/empathy.schemas.in.h:49
-msgid "Use notification sounds"
-msgstr "Arverañ sonioù rebuziñ"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "An dodenn implijet evit an diskwel e prenistri flapañ."
#: ../data/empathy.schemas.in.h:50
-msgid "Use theme for chat rooms"
-msgstr "Arverañ an neuz evit ar sal flapañ"
+msgid "Use graphical smileys"
+msgstr "Implijout fromlunioù grafek"
#: ../data/empathy.schemas.in.h:51
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgid "Use notification sounds"
+msgstr "Implijout sonioù kemenn"
#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
+msgid "Use theme for chat rooms"
+msgstr "Implijout dodennoù evit ar salioù flapañ"
#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Merkañ hag-eñ e c'hall Empathy embann lec'hiadur an arveriad d'e zarempredoù."
#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Merkañ hag-eñ e c'hall Empathy implijout ar GPS evit dizoleiñ al lec'hiadur."
#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Merkañ hag-eñ e c'hall Empathy implijout ar rouedad pellgomz hezoug evit dizoleiñ al lec'hiadur."
#: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy has asked about importing accounts from other programs."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Merkañ hag-eñ e c'hall Empathy implijout ar rouedad evit dizoleiñ al lec'hiadur."
#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy should automatically log in to your accounts on startup."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Merkañ hag-eñ en deus goulennet Empathy enporzhiañ kontoù a zeu eus meziantoù all."
#: ../data/empathy.schemas.in.h:58
-msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Merkañ hag-eñ e rank Empathy en em gevreañ emgefre ouzh ho kontoù d'al loc'hañ."
#: ../data/empathy.schemas.in.h:59
-msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Merkañ hag-eñ e rank Empathy disteraat resisted al lec'hiadur evit abegoù prevez."
#: ../data/empathy.schemas.in.h:60
-msgid "Whether or not the Salut account has been created on the first Empathy run."
-msgstr ""
+#, fuzzy
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Merkañ hag-eñ e rank Empathy implijout skeudennig an darempredoù evel arlun ar prenestr flapañ."
#: ../data/empathy.schemas.in.h:61
-msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
-msgstr ""
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Merkañ hag-eñ ar binvioù diorren WebKit, evel Web Inspector, a rank bezañ gweredekaet."
#: ../data/empathy.schemas.in.h:62
-msgid "Whether or not to check words typed against the languages you want to check with."
-msgstr ""
+#, fuzzy
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Merkañ hag-eñ e rank implijout ar merourien kennaskañ evit digennaskañ pe gennaskañ emgefre."
#: ../data/empathy.schemas.in.h:63
-msgid "Whether or not to convert smileys into graphical images in conversations."
-msgstr ""
+#, fuzzy
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Merkañ hag-eñ e tle bezañ gwiriekaet reizhskrivadur ar gerioù bizskrivet hervez ar yezhoù dibabet."
#: ../data/empathy.schemas.in.h:64
-msgid "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr ""
+#, fuzzy
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Merkañ hag-eñ e rank kemmañ ar fromlunioù e skeudennoù grafek e kaozeadennoù."
#: ../data/empathy.schemas.in.h:65
-msgid "Whether or not to play a sound to notify for contacts logging off the network."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kelaouiñ pa vez darempredoù o kevreañ ouzh ar rouedad."
#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for events."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kelaouiñ pa vez darempredoù o tigennaskañ diouzh ar rouedad."
#: ../data/empathy.schemas.in.h:67
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of events."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kemenn darvoudoù."
#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kelaouiñ kemennadoù nevez."
#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kelaouiñ kaozeadennoù nevez."
#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound when logging in a network."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Merkañ hag-eñ e rank seniñ ur son evit kelaouiñ ez eus ur gemenadenn kaset."
#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound when logging off a network."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound when logging into a network."
+msgstr "Merkañ hag-eñ e rank seniñ ur son e-pad kevreadur ouzh ur rouedad."
#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr ""
+#, fuzzy
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Merkañ hag-eñ e rank seniñ ur son e-pad digevreadur diouzh ur rouedad."
#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to show a popup notification when a contact goes offline."
-msgstr ""
+#, fuzzy
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Merkañ hag-eñ e rank seniñ ur son pa vez esvezant pe ac'hubet."
#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr ""
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Merkañ hag-eñ e rank diskouez kemennoù pa vez un darempred o tigevreañ."
#: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr ""
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Merkañ hag-eñ e rank diskouez kemennoù pa vez un darempred o kevreañ."
#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when receiving a new message."
-msgstr ""
+#, fuzzy
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Merkañ hag-eñ e rank diskouez ul lagadenn-kemenn pa vez resevet ur gemennadenn, memes pa'z eo digoret ar gaozeadenn, met hep ar fokus."
#: ../data/empathy.schemas.in.h:77
-msgid "Whether or not to show avatars for contacts in the contact list and chat windows."
-msgstr ""
+#, fuzzy
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Merkañ hag-eñ e rank diskouez ul lagadenn-kemenn pa vez resevet ur gemennadenn."
#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr ""
+#, fuzzy
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Merkañ hag-eñ e rank diskwel skeudennoùigoù an darempredoù er roll an darempredoù hag e prenistri flapañ."
#: ../data/empathy.schemas.in.h:79
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr ""
+#, fuzzy
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Merkañ hag-eñ e rank diskwel an darempredoù ezlinenn er roll an darempredoù."
#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr ""
+#, fuzzy
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Merkañ hag-eñ e rank diskwel kemennoù pa vez ezvezant pe ac'hubet."
#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr ""
+#, fuzzy
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Merkañ hag-eñ e rank diskwel skeudennoùigoù an darempredoù er roll an darempredoù hag e prenistri flapañ."
#: ../data/empathy.schemas.in.h:82
-msgid "Whether to show the contact list in compact mode or not."
-msgstr ""
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Merkañ hag-eñ e rank diskwel roll an darempredoù e salioù flapañ."
#: ../data/empathy.schemas.in.h:83
-msgid "Whether to use the theme for chat rooms or not."
-msgstr ""
+#, fuzzy
+msgid "Whether to show the contact list in compact mode."
+msgstr "Merkañ hag-eñ e rank diskouez ar roll darempredoù e mod fetis."
#: ../data/empathy.schemas.in.h:84
-msgid "Which criterium to use when sorting the contact list. Default is to use sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
+#, fuzzy
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Merkañ hag-eñ e rank diskwel ar voest kendiviz a-fed serriñ ar prenestr pennañ gant ar bouton 'x' e varrenn ditl."
+
+#: ../data/empathy.schemas.in.h:85
+#, fuzzy
+msgid "Whether to use the theme for chat rooms."
+msgstr "Merkañ hag-eñ e rank implijout dodennoù evit ar salioù flapañ."
+
+#: ../data/empathy.schemas.in.h:86
+#, fuzzy
+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 "Pe dezverk implijout evit rummañ roll an darempredoù. Emzalc'h dre ziouer zo rummañ hervez anv an darempred (talvoud : \"anv\"). Un talvoud \"stad\" a rummo roll an darempredoù hervez o stad."
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:838
-msgid "The hash of the received file and the sent one do not match"
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2066
+#: ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
+msgid "Messaging and VoIP Accounts"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:842
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Sammad kontroll ar restr resevet ne glot ket ouzh hini ar restr kaset"
+
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
-msgstr ""
+msgstr "Diembreget eo an treuzkas restroù gant an darempred a-bell"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
-msgstr ""
+msgstr "N'eo ket reizh ar restr diuzet"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Goullo eo ar restr diuzet"
-#: ../libempathy/empathy-tp-contact-list.c:843
-#: ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Tud e-kichen"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
-msgstr ""
+msgstr "Diembreget eo seurt al lugell rouedad (socket)"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
-msgstr ""
+msgstr "Abeg ebet termenet"
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
-msgstr ""
+msgstr "Kemmañ stad zo bet goulennet"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
-msgstr ""
+msgstr "Nullet ho peus an treuzkas restr"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "Ar c'hengomzer all en deus nullet an treuzkas restr"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
-msgstr ""
+msgstr "Fazi en ur glask treuzkas ar restr"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
-msgstr ""
+msgstr "Ar c'hengomzer all n'hall ket treuzkas ar restr"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Abeg dianav"
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Hegerz"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Ac'hubet"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
-msgstr "Aet kuit"
+msgstr "Ezvezant"
-#: ../libempathy/empathy-utils.c:272
-msgid "Hidden"
-msgstr "Kuzh"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr ""
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Ezlinenn"
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Abeg ebet termenet"
+
+#: ../libempathy/empathy-utils.c:288
+#, fuzzy
+msgid "Status is set to offline"
+msgstr "Ezlinenn eo %s bremañ."
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Fazi rouedad"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "C'hwitet eo an dilesadur"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Fazi en ur enrinegañ"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Anv implijet"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Testeni dibourchaset"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "N'eo ket un testeni a-fiziañs"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Testeni diamzeret"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Testeni diweredekaet"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Ne glot ket anv an testeni"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Louc'h an testeni ne glot ket"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Testeni emsinet"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Fazi testeni"
+
+#: ../libempathy/empathy-utils.c:429
+#: ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "Tud e-kichen"
+
+#: ../libempathy/empathy-utils.c:434
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japon"
+
+#: ../libempathy/empathy-utils.c:435
+msgid "Facebook Chat"
+msgstr "Flapañ Facebook"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -444,117 +586,245 @@ msgstr[1] "%d eilenn zo"
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
-msgstr[0] "%d a vunutenn zo"
-msgstr[1] "%d a vunutenn zo"
+msgstr[0] "%d munutenn zo"
+msgstr[1] "%d munutenn zo"
#: ../libempathy/empathy-time.c:147
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d eur zo"
+msgstr[1] "%d eur zo"
#: ../libempathy/empathy-time.c:152
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
-msgstr[0] "%d a zeizioù zo"
-msgstr[1] "%d a zeizioù zo"
+msgstr[0] "%d deiz zo"
+msgstr[1] "%d deiz zo"
#: ../libempathy/empathy-time.c:157
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d sizhun zo"
+msgstr[1] "%d sizhun zo"
#: ../libempathy/empathy-time.c:162
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d miz zo"
+msgstr[1] "%d miz zo"
#: ../libempathy/empathy-time.c:167
msgid "in the future"
-msgstr ""
+msgstr "en dazont"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "An holl"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s :"
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Anv an arveriad :"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Kennaskañ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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 "Kont :"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1553
+msgid "Enabled"
+msgstr "Gweredekaet"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+#, fuzzy
+msgid "This account already exists on the server"
+msgstr "Se ne zilamo ket ho kont diwar an dafariad."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+#, fuzzy
+msgid "Create a new account on the server"
+msgstr "_Krouiñ ur gont nevez"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s war %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:2039
+#, c-format
+msgid "%s Account"
+msgstr "Kont %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Kont nevez"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Advanced"
-msgstr "Kempleshoc'h"
+#, fuzzy
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<span size=\"small\"><b>Skouer :</b> MaAnvSkramm</span>"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-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-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "Araokaet"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Ger-tremen :"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "A_nv ar skramm :"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "Petra eo ho ker-tremen AIM ?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "Petra eo ho anv skramm AIM ?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "_Porzh :"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../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:24
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Dafariad :"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#, fuzzy
+msgid "<b>Example:</b> username"
+msgstr "<span size=\"small\"><b>Skouer :</b> anvarveriad</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
-msgstr "Henna_der (ID) :"
+msgstr "Hennader (ID) :"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "Petra eo ho hennader arveriad GroupWise (ID) ?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "Petra eo ho ker-tremen GroupWise ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#, fuzzy
+msgid "<b>Example:</b> 123456789"
+msgstr "<span size=\"small\"><b>Skouer :</b> 123456789</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
-msgstr "Hennader (ID) _ICQ :"
+msgstr "Hennader _ICQ (ID) :"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "_Charset:"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "Petra eo ho UIN ICQ ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "Petra eo ho ker-tremen ICQ ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#, fuzzy
+msgid "_Character set:"
msgstr "Spletad a_rouezennoù :"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Rouedad nevez"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#, fuzzy
+msgid "Auto"
+msgstr "Diw_ar-benn"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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:222
+#, fuzzy
+msgid "Register"
+msgstr "Kornôg"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Dibarzhioù"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#, fuzzy
+msgid "None"
+msgstr "ket"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
msgstr "Spletad arouezennoù :"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -567,7 +837,7 @@ msgstr "Rouedad :"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Nickname:"
-msgstr "Lezanv :"
+msgstr "Lesanv :"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Password:"
@@ -583,501 +853,760 @@ msgstr "Anv wir :"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Servers"
-msgstr "Dafariadoù"
+msgstr "Dafariaded"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#, fuzzy
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<span size=\"small\"><b>Skouer :</b> arveriad@gmail.com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#, fuzzy
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<span size=\"small\"><b>Skouer :</b> arveriad@jabber.org</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
msgstr "Tremen a ra dreist arventennoù an dafariad"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Pri_ority:"
msgstr "K_entañ-wellañ :"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Reso_urce:"
msgstr "L_oaz :"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Arverañ ar SS_L kozh"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#, fuzzy
+msgid "What is your Facebook password?"
+msgstr "Petra eo ho ker-tremen Yahoo! ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#, fuzzy
+msgid "What is your Facebook username?"
+msgstr "Petra eo ho anv-arveriad Windows Live ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "What is your Google ID?"
+msgstr "Petra eo ho hennader Google (ID) ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "What is your Google password?"
+msgstr "Petra eo ho ker-tremen Google ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "What is your Jabber ID?"
+msgstr "Petra eo ho hennader Jabber (ID) ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Jabber password?"
+msgstr "Petra eo ho ker-tremen Jabber ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your desired Jabber ID?"
+msgstr "Peseurt hennader (ID) Jabber a fell deoc'h ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your desired Jabber password?"
+msgstr "Peseurt ger-tremen Jabber a fell deoc'h ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "_Enrinegañ rekis (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "Leuskel a-gostez fazioù an testenioù SSL"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
-msgid "_Email:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#, fuzzy
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<span size=\"small\"><b>Skouer :</b> arveriad@hotmail.com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#, fuzzy
+msgid "What is your Windows Live ID?"
+msgstr "petra eo ho ker-tremen Windows Live ?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live password?"
+msgstr "petra eo ho ker-tremen Windows Live ?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+#, fuzzy
+msgid "_E-mail address:"
msgstr "Post_el :"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "Anv-b_ihan :"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
-msgstr "Hennader(ID) Jabber :"
+msgstr "Hennader Jabber (ID) :"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "Anv-fami_lh :"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "Leza_nv :"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "Anv em_bannet :"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#, fuzzy
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<span size=\"small\"><b>Skouer :</b> arveriad@ma.dafariad.sip</span>"
+
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Discover STUN"
-msgstr ""
+#, fuzzy
+msgid "Authentication username:"
+msgstr "C'hwitet eo an dilesadur"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#, fuzzy
+msgid "Discover Binding"
+msgstr "Dizoleiñ STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Hostname of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Interval (seconds)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Look up the DNS SRV record at the service's domain for the host name of a STUN server."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Porzh :"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Dibarzhioù ar proksi"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "Dafariad STUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Dafariad :"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#, fuzzy
+msgid "Transport:"
msgstr "Porzh STUN :"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "Update the registration binding if the external address for the client is discovered to be different from the local binding."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Use the loose routing behavior and the Route header as recommended in RFC 3261."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "What is your SIP account password?"
+msgstr "Petra eo ho ker-tremen kont SIP ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+msgid "What is your SIP login ID?"
+msgstr "Petra eo ho hennader (ID) kennaskañ SIP ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "Anv an ar_veriad :"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Use _Yahoo Japan"
-msgstr "Arverañ _Yahoo Japon"
-
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Yahoo I_D:"
-msgstr "Henna_der (ID) Yahoo :"
+#, fuzzy
+msgid "Use _Yahoo! Japan"
+msgstr "Implijout _Yahoo Japon"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "Petra eo ho hennader (ID) Yahoo! ?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Ignore conference and chatroom invitations"
-msgstr ""
+msgid "What is your Yahoo! password?"
+msgstr "Petra eo ho ker-tremen Yahoo! ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#, fuzzy
+msgid "Yahoo! I_D:"
+msgstr "Henna_der (ID) Yahoo :"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#, fuzzy
+msgid "_Ignore conference and chat room invitations"
+msgstr "_Dic'houzout pedadennoù d'emvodoù pe da salioù flapañ"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
-msgstr ""
+msgstr "Bonegañ (yezh) roll ar _salioù :"
#: ../libempathy-gtk/empathy-avatar-chooser.c:449
#: ../libempathy-gtk/empathy-avatar-chooser.c:525
msgid "Couldn't convert image"
-msgstr ""
+msgstr "N'haller ket amdreiñ ar skeudenn"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr ""
+#, fuzzy
+msgid "None of the accepted image formats are supported on your system"
+msgstr "Mentrezh skeudenn aotrenet ebet n'eo embreget gant ho reizhiad"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
-msgstr "Diuzañ ho skeudenn avatar"
+msgstr "Diuzañ ho skeudennig avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Skeudenn ebet"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Skeudennoù"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "An holl restroù"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Klikit evit brasaat"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
-msgstr "N'haller ket adkennaskañ ar flap-mañ"
+msgstr "N'haller ket adkennaskañ ouzh ar flap-mañ"
-#: ../libempathy-gtk/empathy-chat.c:404
-msgid "Unsupported command"
-msgstr "Arc'had anskoret"
+#: ../libempathy-gtk/empathy-chat.c:655
+#, fuzzy
+msgid "Failed to join chat room"
+msgstr "_Pediñ d'ur sal flapañ"
+
+#: ../libempathy-gtk/empathy-chat.c:673
+#, fuzzy
+msgid "Failed to open private chat"
+msgstr "N'haller ket adkennaskañ ouzh ar flap-mañ"
+
+#: ../libempathy-gtk/empathy-chat.c:712
+msgid "Topic not supported on this conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:718
+msgid "You are not allowed to change the topic"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:847
+msgid "/clear: clear all messages from the current conversation"
+msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:850
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:853
+msgid "/join <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:856
+msgid "/j <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:859
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:862
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:865
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:868
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:871
+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 ""
+
+#: ../libempathy-gtk/empathy-chat.c:876
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:886
+#, c-format
+msgid "Usage: %s"
+msgstr "Arver : %s"
+
+#: ../libempathy-gtk/empathy-chat.c:915
+#, fuzzy
+msgid "Unknown command"
+msgstr "Abeg dianav"
+
+#: ../libempathy-gtk/empathy-chat.c:1036
+msgid "Unknown command; see /help for the available commands"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "ezlinnen"
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
-msgstr "didalvoudek eo an darempred"
+msgstr "direizh eo an darempred"
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "aotre nac'het"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "Re hir eo ar gemennadenn"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
-msgstr "ket kefloueret"
+msgstr "n'eo ket kefloueret"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "dianav"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
-msgstr "Fazi en ur gas ar gemennadenn '%s' : %s "
+msgstr "Fazi en ur gas ar gemennadenn '%s' : %s"
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
-msgstr "Danvez arventennet da : %s"
+msgstr "Danvez termenet da : %s"
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
-msgstr "N'eo ket erspizet an danvez"
+msgstr "N'eus danvez ebet termenet"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Kinnig ebet)"
-#: ../libempathy-gtk/empathy-chat.c:1014
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
-msgstr "Enlakaat ur _smiley"
+msgstr "Enlakaat ur fromlun"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "Ka_s"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Kinnigoù an di_fazier"
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "Digennasket eo %s"
-#: ../libempathy-gtk/empathy-chat.c:1185
-#, fuzzy, c-format
-msgid "%s was kicked by %s"
-msgstr "%s oa bet darc'havet gant %s"
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1967
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$szo bet lakaet er-maez gant %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1188
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1970
+#, c-format
msgid "%s was kicked"
-msgstr "%s oa bet darc'havet"
+msgstr "%s zo bet lakaet er-maez"
-#: ../libempathy-gtk/empathy-chat.c:1193
-#, fussy, c-format
-msgid "%s was banned by %s"
-msgstr "%s oa bet argaset gant %s"
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1978
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s zo bet forbannet gant %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1196
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1981
+#, c-format
msgid "%s was banned"
-msgstr "%s oa bet argaset"
+msgstr "%s zo bet forbannet"
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
-msgstr ""
+msgstr "%s en deus kuitaet ar sal"
#. Note to translators: this string is appended to
#. * notifications like "foo has left the room", with the message
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
-msgstr ""
+msgstr "%s en deus kejet ouzh ar sal"
+
+#: ../libempathy-gtk/empathy-chat.c:2044
+#, fuzzy, c-format
+msgid "%s is now known as %s"
+msgstr "Enlinenn eo %s bremañ."
-#: ../libempathy-gtk/empathy-chat.c:1365
-#: ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Digennasket"
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "Wrong password; please try again:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Retry"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2707
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2708
+#, fuzzy
+msgid "Join"
+msgstr "_Kejal"
+
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Kennasket"
-#: ../libempathy-gtk/empathy-chat.c:1850
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
-msgstr "Kaozadenn"
+msgstr "Kaozeadenn"
#: ../libempathy-gtk/empathy-chat.ui.h:1
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Danvez :"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Eilañ chomlec'h an ere"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Digeriñ an ere"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Kemmañ titouroù an darempred"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Titouroù personel"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Darempred nevez"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
-msgstr "Dibab diw_ezatoc'h"
+msgstr "Divizout diw_ezatoc'h"
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
msgid "Subscription Request"
-msgstr ""
+msgstr "Goulenn koumanantiñ"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
-msgstr ""
+msgstr "Ha sur oc'h e fell deoc'h dilemel ar strollad '%s' ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "O tilemel ar strollad"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Dilemel"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr ""
+msgstr "Ha sur oc'h e fell deoc'h dilemel an darempred '%s' ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "O tilemel an darempred"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+#, fuzzy
+msgid "_Add Contact…"
msgstr "Ouzhpennañ un darempred..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Flapañ"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "G_alv aodio"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "Gal_v video"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "G_welout kaozadennoù kent"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Kaozeadennoù _kent"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Kas ar restr"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Rannañ ma burev"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Tit_ouroù"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "K_emmañ"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr ""
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+#, fuzzy
+msgid "Inviting you to this room"
+msgstr "Pediñ d'ar sal-mañ"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr ""
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#, fuzzy
+msgid "_Invite to chat room"
+msgstr "_Pediñ d'ur sal flapañ"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
-msgstr "Diuzañ ur darempred"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Enrollañ an avatar"
+msgstr "Diuzañ un darempred"
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Diuzañ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Strollad"
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Kod ISO ar vro :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Bro :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Stad :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Kêr :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
-msgstr "Maez :"
+msgstr "Rannvro :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
-msgstr "Kod ar post :"
+msgstr "Kod post :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Straed :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Saverezh :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Estaj :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Sal :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Testenn :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Deskrivadur :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
-msgstr ""
+msgstr "Live resisted :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Fazi :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "Fazi a-sonn (metroù) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
-msgstr ""
+msgstr "Fazi a-blaen (metroù) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Tizh :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
-msgstr "Emzalc'h :"
+msgstr "Azimut :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
-msgstr ""
+msgstr "Tizh pignat :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
-msgstr ""
+msgstr "Hizivadenn diwezhañ d'ar :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Hedred :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Ledred :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Uhelez :"
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
-msgid "<b>Location</b>"
-msgstr "<b>Lec'hiadur</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Lec'hiadur"
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
-msgstr "<b>Lec'hiadur</b>"
+msgstr "<b>Lec'hiadur</b> "
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y da %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+msgid "Save Avatar"
+msgstr "Enrollañ ar skeudennig"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+msgid "Unable to save avatar"
+msgstr "N'haller ket enrollañ ar skeudennig"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Lec'hiadur</b> d'an (deiziad)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Kont :"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Alias :"
@@ -1095,87 +1624,85 @@ msgid "Client:"
msgstr "Arval :"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
-msgid "Contact"
-msgstr "Darempred"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Munudoù an darempred"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Postel :"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#, fuzzy
+msgid "Full name:"
msgstr "Anv a-bezh :"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Strolladoù"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
-msgstr "Hennader :"
+msgstr "Hennader (ID) :"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#, fuzzy
+msgid "Information requested&#x2026;"
msgstr "Titouroù goulennet..."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "Reizhiad korvoiñ :"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups."
-msgstr ""
+msgstr "Diuzit ar strolladoù e-lec'h ho peus c'hoant da welet an darempred-mañ ; gallout a rit diuzañ meur a strollad pe hini ebet."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Handelv :"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#, fuzzy
+msgid "Website:"
msgstr "Lec'hienn :"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "Ouzhpenn_añ ur strollad"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "dafariad nevez"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Dafariad"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porzh"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Kont"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Deiziad"
#: ../libempathy-gtk/empathy-log-window.ui.h:1
msgid "Conversations"
-msgstr "Kaozadennoù"
+msgstr "Kaozeadennoù"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Previous Conversations"
-msgstr "Kaozadennoù kent"
+msgstr "Kaozeadennoù kent"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
msgid "Search"
@@ -1185,21 +1712,37 @@ msgstr "Klask"
msgid "_For:"
msgstr "_Evit :"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "G_ervel"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "Hennader (ID) an darempred :"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "F_lapañ"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "Hennader (ID) an darempred :"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
-msgstr "Kaozadenn nevez"
+msgstr "Kaozeadenn nevez"
+
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#, fuzzy
+msgid "Send _Video"
+msgstr "Kas ar Video"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Gervel"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#, fuzzy
+msgid "New Call"
+msgstr "Gervel"
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
@@ -1207,49 +1750,63 @@ msgstr "Kaozadenn nevez"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
-msgid "Custom Message..."
-msgstr "Personalaat ar gemennadenn..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#, fuzzy
+msgid "Custom Message…"
+msgstr "Personalaat ar gemennadenn"
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "Kemmañ ar gemennadenn personalaet..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#, fuzzy
+msgid "Edit Custom Messages…"
+msgstr "Kemmañ ar gemennadenn personalaet"
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
-msgstr ""
+msgstr "Klikit evit dilemel ar stad-mañ diouzh ar re wellañ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
-msgstr ""
+msgstr "Klikit evit ouzhpennañ ar stad-mañ d'ar re wellañ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
-msgstr "Arventenniñ ar stad"
+msgstr "Termeniñ ar stad"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
-msgstr ""
+msgstr "Termeniñ ho stad bezañs a-vremañ"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
-msgstr "Personalaat ar c'hemennadennoù..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#, fuzzy
+msgid "Custom messages…"
+msgstr "Personalaat ar gemennadenn"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Klask :"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr ""
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
-msgstr "resevet eo an postel prim"
+msgstr "Resevet eo ur postel prim"
#: ../libempathy-gtk/empathy-sound.c:53
msgid "Sent an instant message"
msgstr "Kaset eo ar postel prim"
#: ../libempathy-gtk/empathy-sound.c:55
-#, fuzzy
msgid "Incoming chat request"
-msgstr "Goulenn flap"
+msgstr "Goulenn flapañ resevet"
#: ../libempathy-gtk/empathy-sound.c:57
msgid "Contact connected"
@@ -1265,45 +1822,35 @@ msgstr "Kennasket ouzh an dafariad"
#: ../libempathy-gtk/empathy-sound.c:63
msgid "Disconnected from server"
-msgstr "Digennasket ouzh an dafariad"
+msgstr "Digennasket diouzh an dafariad"
#: ../libempathy-gtk/empathy-sound.c:65
-#, fuzzy
msgid "Incoming voice call"
-msgstr "Galv mouezh"
+msgstr "Galvadenn mont tre"
#: ../libempathy-gtk/empathy-sound.c:67
-#, fuzzy
msgid "Outgoing voice call"
-msgstr "Galv mouezh"
+msgstr "Galvadenn mont er-maez"
#: ../libempathy-gtk/empathy-sound.c:69
msgid "Voice call ended"
-msgstr ""
+msgstr "Galvadenn-vouezh echu"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Roit ur gemennadenn personalaet"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Kemmañ ar gemennadenn personalaet"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
msgid "Add _New Preset"
-msgstr ""
+msgstr "Ouzhpennañ kemennadenn _nevez raktermenet"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
msgid "Saved Presets"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-ouzpennañ"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-dilemel"
+msgstr "Kemennadoù raktermenet enrollet"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -1322,22 +1869,21 @@ msgstr "Naet"
msgid "Blue"
msgstr "Glas"
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
-msgstr ""
+msgstr "N'haller ket digeriñ an URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Diuzañ ur restr"
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
-msgstr ""
+msgstr "Diuzañ ul lec'h"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-#, fuzzy
msgid "Current Locale"
-msgstr "Lokal-red (en implij)"
+msgstr "Yezh a-vremañ"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -1428,9 +1974,8 @@ msgid "Hebrew"
msgstr "Hebraeg"
#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-#, fuzzy
msgid "Hebrew Visual"
-msgstr "Hebraek Visual"
+msgstr "Hebraeg hewel"
#: ../libempathy-gtk/totem-subtitle-encoding.c:260
msgid "Hindi"
@@ -1503,253 +2048,502 @@ msgstr "Kornôg"
msgid "Vietnamese"
msgstr "Vietnameg"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid "The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr ""
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr ""
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
-msgid "Talk!"
-msgstr "Komz !"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "Diw_ar-benn"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Titouroù"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Gwellvezioù"
-
-#: ../megaphone/src/megaphone-applet.c:168
-msgid "Please configure a contact."
-msgstr "Kefluniañ ur darempred marplij."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+#, fuzzy
+msgid "The selected contact cannot receive files."
+msgstr "N'eo ket reizh ar restr diuzet"
-#: ../megaphone/src/megaphone-applet.c:258
-msgid "Select contact..."
-msgstr "Diuzañ an darempred..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+#, fuzzy
+msgid "The selected contact is offline."
+msgstr "Goullo eo ar restr diuzet"
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Bezañs"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#, fuzzy
+msgid "No error message"
+msgstr "Re hir eo ar gemennadenn"
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
-msgid "Set your own presence"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
msgstr ""
-#: ../src/empathy.c:567
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
-msgstr "Na kennaskañ ket e-pad al loc'hañ"
+msgstr "Na gennaskañ ket e-pad al loc'hañ"
-#: ../src/empathy.c:571
-msgid "Don't show the contact list on startup"
-msgstr "Na diskouez ket roll an darempredoù e-pad al loc'hañ"
-
-#: ../src/empathy.c:575
-msgid "Show the accounts dialog"
-msgstr "Diskouez boestad emziviz ar c'hontoù"
+#: ../src/empathy.c:600
+#, fuzzy
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Na ziskouez ket roll an darempredoù e-pad al loc'hañ"
-#: ../src/empathy.c:587
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
-msgstr " - Arval postelerezh prim Empathy"
+msgstr "- Arval postelerezh prim Empathy"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 "Ur meziant digor eo Empathy ; dasparzhet pe/ha daskemmet e vez dindan termenoù al Lañvaz Foran Hollek GNU evel ma'z eo bet embannet gant Diazezadenn ar Meziantoù Digor ; da lâret eo handelv 2 eus al lañvaz pe (evel ma plij deoc'h) ne vern pe handelv nevesoc'h."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "Dasparzhet eo Empathy gant ar spi e vo talvoudus met GANT GWARANT EBET ; hep ar gwarant enpleg a-fet TALVOUDEGEZH KENWERZHEL pe VARREGEZH EVIT UR PAL PERSONEL. Taolit ur sell war Lañvaz Foran Hollek GNU evit gouzout hiroc'h."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "Moarvat hoc'h eus bet un eilad eus al Lañvaz Foran Hollek GNU gant Empathy ; ma n'hoc'h eus ket bet,skrivit da : Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Un arval postelerezh prim evit GNOME"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
-msgstr "Denis <denisarnuad@yahoo.fr>"
+msgstr ""
+"Denis <denisarnuad@yahoo.fr>\n"
+"\n"
+"Launchpad Contributions:\n"
+" Denis https://launchpad.net/~bibar\n"
+" Jérémy Le Floc'h https://launchpad.net/~jeremy-lefloch"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Gweredekaet"
+#: ../src/empathy-account-assistant.c:167
+#, fuzzy
+msgid "There was an error while importing the accounts."
+msgstr "Ur fazi ez eus bet en ur enporzhiañ ar c'hontoù."
-#: ../src/empathy-accounts-dialog.c:402
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Kontoù"
+#: ../src/empathy-account-assistant.c:170
+#, fuzzy
+msgid "There was an error while parsing the account details."
+msgstr "Ur fazi ez eus bet en ur dielfennañ munudoù ar gont."
+
+#: ../src/empathy-account-assistant.c:173
+#, fuzzy
+msgid "There was an error while creating the account."
+msgstr "Ur fazi ez eus bet en ur grouiñ ar gont."
+
+#: ../src/empathy-account-assistant.c:175
+#, fuzzy
+msgid "There was an error."
+msgstr "Ur fazi ez eus bet"
+
+#: ../src/empathy-account-assistant.c:179
+#, fuzzy, c-format
+msgid "The error message was: %s"
+msgstr "Fazi en ur gas ar gemennadenn '%s' : %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 "Gallout a rit distreiñ war-gil ha klask bizskrivañ en-dro munudoù ho kont, pe kuitaat ar skoazeller hag ouzhpennañ ur gont diwezhatoc'h adalek al lañser Embann."
+
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
+msgid "An error occurred"
+msgstr "Ur fazi ez eus bet"
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:413
+#: ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Kont nevez %s"
-#: ../src/empathy-accounts-dialog.c:950
-#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
+#: ../src/empathy-account-assistant.c:508
+msgid "What kind of chat account do you have?"
+msgstr "Peseurt kont flapañ ho peus ?"
-#: ../src/empathy-accounts-dialog.c:956
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still be available."
+#: ../src/empathy-account-assistant.c:514
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Ha c'hoant ho peus d'arventennañ kontoù flapañ all ?"
+
+#: ../src/empathy-account-assistant.c:520
+msgid "Enter your account details"
+msgstr "Bizskrivit munudoù ho kont"
+
+#: ../src/empathy-account-assistant.c:525
+msgid "What kind of chat account do you want to create?"
+msgstr "Peseurt kont flapañ a fell deoc'h krouiñ ?"
+
+#: ../src/empathy-account-assistant.c:531
+msgid "Do you want to create other chat accounts?"
+msgstr "Ha fellout a ra deoc'h krouiñ kontoù flapañ all ?"
+
+#: ../src/empathy-account-assistant.c:538
+msgid "Enter the details for the new account"
+msgstr "Bizskrivit munudoù ho kont nevez"
+
+#: ../src/empathy-account-assistant.c:653
+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 "Gant Empathy e c'hellit flapañ gant tud kennasket e-kichen pe gant mignoned ha keneiled a implij Google Talk, AIM, Windows Live ha kalz goulevioù flapañ all. A-drugarez d'ur mikrofon pe d'ur webkam, e c'hellit ivez komz dezho ha gwelet anezho e video"
+
+#: ../src/empathy-account-assistant.c:670
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "Daoust hag ho peus ur gont ho peus implijet gant ur goulev flapañ all ?"
+
+#: ../src/empathy-account-assistant.c:693
+msgid "Yes, import my account details from "
+msgstr "Ya, enporzhiañ munudoù ma c'hont adalek "
+
+#: ../src/empathy-account-assistant.c:714
+msgid "Yes, I'll enter my account details now"
+msgstr "Ya, fellout a ra din reiñ munudoù ma c'hont bremañ"
+
+#: ../src/empathy-account-assistant.c:736
+msgid "No, I want a new account"
+msgstr "Nann, fellout a ra din ur gont nevez"
+
+#: ../src/empathy-account-assistant.c:746
+msgid "No, I just want to see people online nearby for now"
+msgstr "Nann, fellout a ra din gwelet tud kennasket e-kichen hepken evit poent"
+
+#: ../src/empathy-account-assistant.c:767
+msgid "Select the accounts you want to import:"
+msgstr "Diuzit ar c'hontoù a fell deoc'h enporzhiañ :"
+
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
+msgid "Yes"
+msgstr "Ya"
+
+#: ../src/empathy-account-assistant.c:858
+msgid "No, that's all for now"
+msgstr "Nann, trawalc'h eo evit poent"
+
+#: ../src/empathy-account-assistant.c:1117
+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 ""
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Ouzhpennañ ar gont"
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Kemmañ ar gont"
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Kr_ouiñ"
+#: ../src/empathy-account-assistant.c:1139
+#, fuzzy
+msgid "I don't want to enable this feature for now"
+msgstr "Nann, fellout a ra din gwelet tud kennasket e-kichen hepken evit poent"
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/empathy-account-assistant.c:1175
+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 ""
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "Enporzhiañ kontoù..."
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr ""
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
+#: ../src/empathy-account-assistant.c:1258
+msgid "Welcome to Empathy"
+msgstr "Degemer mat war Empathy"
+
+#: ../src/empathy-account-assistant.c:1267
+msgid "Import your existing accounts"
+msgstr "Enporzhiañ ho kontoù a zo anezho"
+
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
msgstr ""
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Arventennoù"
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:66
+#, fuzzy, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "Kemmoù ha n'int ket enrollet zo en ho kont %s."
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+#. 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:70
+msgid "Your new account has not been saved yet."
msgstr ""
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "Rizh :"
+#: ../src/empathy-accounts-dialog.c:263
+#: ../src/empathy-call-window.c:729
+#, fuzzy
+msgid "Connecting…"
+msgstr "O kennaskañ…"
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "Ouzhpenn_añ..."
+#: ../src/empathy-accounts-dialog.c:290
+#, fuzzy, c-format
+msgid "Disconnected — %s"
+msgstr "Digennasket"
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "_Krouiñ ur kont nevez"
+#: ../src/empathy-accounts-dialog.c:295
+#, fuzzy, c-format
+msgid "Offline — %s"
+msgstr "Ezlinenn"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:316
#, fuzzy
-msgid "_Reuse an existing account"
-msgstr "A_darverañ ur gont existing"
+msgid "Unknown Status"
+msgstr "Abeg dianav"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:768
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Emaoc'h war-nes krouiñ ur gont nevez, ar pezh\n"
+"a nullo ho kemmoù. Ha sur e fell deoc'h kenderc'hel ?"
+
+#: ../src/empathy-accounts-dialog.c:1115
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Ha c'hoant ho peus da zilemel %s diouzh ho urzhiataer ?"
+
+#: ../src/empathy-accounts-dialog.c:1119
+msgid "This will not remove your account on the server."
+msgstr "Se ne zilamo ket ho kont diwar an dafariad."
+
+#: ../src/empathy-accounts-dialog.c:1356
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Emaoc'h war-nes diuzañ ur gont all, ar pezh\n"
+"a nullo ho kemmoù. Ha sur oc'h e fell deoc'h kenderc'hel ?"
+
+#: ../src/empathy-accounts-dialog.c:1933
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Emaoc'h war-nes serriñ ar prenestr, ar pezh\n"
+"a nullo ho kemmoù. Ha sur oc'h e fell deoc'h kenderc'hel ?"
+
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "No protocol installed"
+msgstr "N'eus komenad ebet staliet"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "Komenad :"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Evit ouzhpennañ ur gont nevez, rankout a rit staliañ al lusker a glot ouzh pep komenad a fell deoc'h implijout."
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr ""
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr ""
+
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Dargemm"
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
-msgstr "Lintr"
+msgstr "Sked"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Ampled"
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "O kennaskañ…"
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Barrenn gostez"
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
-msgstr ""
+msgstr "Niverenner"
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Enankad aodio"
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Enankad Video"
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Gervel gant %s"
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Gervel"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Kennasket - %d:%02dm"
-#: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
+#: ../src/empathy-call-window.c:1755
+#, fuzzy
+msgid "Technical Details"
+msgstr "Munudoù an darempred"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr ""
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1804
+#, 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 ""
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1814
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1817
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1827
+#, 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 ""
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:1
+#, fuzzy
+msgid "Call the contact again"
+msgstr "Roll fetis an darempredoù"
+
#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
+msgid "Camera Off"
msgstr ""
#: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "Kas an aodio"
+msgid "Camera On"
+msgstr ""
#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Kas ar Video"
+msgid "Disable camera and stop sending video"
+msgstr ""
#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Alberz Video"
+msgid "Enable camera and send video"
+msgstr ""
#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Gervel"
+msgid "Enable camera but don't send video"
+msgstr ""
#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-main-window.ui.h:26
+msgid "Hang up"
+msgstr "Adkregiñ"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Alberz"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Redial"
+msgstr "Gervel en-dro"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Send Audio"
+msgstr "Kas an aodio"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+msgid "Video Off"
+msgstr "Enankad Video"
+
+#: ../src/empathy-call-window.ui.h:15
+#, fuzzy
+msgid "Video On"
+msgstr "Enankad Video"
+
+#: ../src/empathy-call-window.ui.h:16
+#, fuzzy
+msgid "Video Preview"
+msgstr "Alberz Video"
+
+#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "G_welout"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:436
+#: ../src/empathy-chat-window.c:456
#, c-format
-msgid "Conversations (%d)"
-msgstr "Kaozadennoù (%d)"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:448
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "O skrivañ ur gemennadenn."
@@ -1758,151 +2552,162 @@ msgid "C_lear"
msgstr "S_karzhañ"
#: ../src/empathy-chat-window.ui.h:2
-msgid "Chat"
-msgstr "Flapañ"
+#, fuzzy
+msgid "C_ontact"
+msgstr "Darempred"
#: ../src/empathy-chat-window.ui.h:3
-msgid "Insert _Smiley"
-msgstr "Enlakaat ur _smiley"
+msgid "Chat"
+msgstr "Flapañ"
#: ../src/empathy-chat-window.ui.h:4
-msgid "Move Tab _Left"
-msgstr "Kas a-gleiz an ivinell"
+msgid "Insert _Smiley"
+msgstr "Enlakaat ur _fromlun"
#: ../src/empathy-chat-window.ui.h:5
-msgid "Move Tab _Right"
-msgstr "Kas a-zehou an ivinell"
+msgid "Invite _Participant…"
+msgstr ""
#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Darempred"
+msgid "Move Tab _Left"
+msgstr "Kas an ivinell a-gleiz"
#: ../src/empathy-chat-window.ui.h:7
-#: ../src/empathy-main-window.ui.h:14
+msgid "Move Tab _Right"
+msgstr "Kas an ivinell a-zehou"
+
+#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "Endal_c'hadoù"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
-msgstr "_Kaozadenn"
+msgstr "_Kaozeadenn"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Distagañ an ivinell"
#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
-msgstr "Salflap _gwellañ"
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "K_emmañ"
#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:18
+#, fuzzy
+msgid "_Favorite Chat Room"
+msgstr "Sal flapañ _gwellañ"
+
+#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Skoazell"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "Ivinell da-_heul"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
-msgstr "Ivinell _kent"
+msgstr "Ivinell _gent"
-#: ../src/empathy-chat-window.ui.h:15
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Di_skouez roll an darempredoù"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
-msgstr "Ivinelloù"
+msgstr "_Ivinelloù"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Anv"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Sal"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
-msgstr "Emzinoiñ"
+msgstr "Emgennaskañ"
#: ../src/empathy-chatrooms-window.ui.h:2
msgid "Manage Favorite Rooms"
-msgstr ""
+msgstr "Merañ ar salioù flapañ gwellañ"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:339
#, fuzzy
+msgid "Incoming video call"
+msgstr "Galvadenn mont tre"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
-msgstr "Glav"
+msgstr "Galvadenn mont tre"
-#: ../src/empathy-event-manager.c:324
-#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr ""
+#: ../src/empathy-event-manager.c:343
+#, fuzzy, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s zo o c'hervel ac'hanoc'h, ha fellout a ra deoc'h respont ?"
+
+#: ../src/empathy-event-manager.c:344
+#, fuzzy, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s zo o c'hervel ac'hanoc'h, ha fellout a ra deoc'h respont ?"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
-msgstr ""
+msgstr "_Nac'hañ"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Respont"
-#: ../src/empathy-event-manager.c:452
-#, c-format
-msgid "Incoming call from %s"
-msgstr ""
+#: ../src/empathy-event-manager.c:489
+#, fuzzy, c-format
+msgid "Incoming video call from %s"
+msgstr "Galvadenn mont tre gant %s"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr ""
-
-#: ../src/empathy-event-manager.c:502
-msgid "An external application will be started to handle it."
-msgstr ""
-
-#: ../src/empathy-event-manager.c:507
-msgid "You don't have the needed external application to handle it."
-msgstr ""
+msgid "Incoming call from %s"
+msgstr "Galvadenn mont tre gant %s"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
-msgstr ""
+msgstr "Pedadenn en ur sal flapañ"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
-msgstr ""
+msgstr "%s a bed ac'hanoc'h da gejal ouzh %s"
-#: ../src/empathy-event-manager.c:645
-#, fuzzy
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
-msgstr "_Nac'h"
+msgstr "_Nac'hañ"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
-msgstr "K_enstagañ"
+msgstr "_Kejal"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
-msgstr ""
+msgstr "%s en deus pedet ac'hanoc'h da gejal ouzh %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
-msgstr ""
+msgstr "Treuzkasad restr mont tre gant %s"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
-msgstr ""
+msgstr "Goulenn koumanantiñ gant %s"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -1912,121 +2717,120 @@ msgstr ""
"Kemennadenn : %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "Ezlinenn eo %s bremañ."
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "Enlinenn eo %s bremañ."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Dianav"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s eus %s da %s/s"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s eus %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
-msgstr ""
+msgstr "O reseviñ \"%s\" digant %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "O kas \"%s\" da %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
-msgstr ""
+msgstr "Fazi en ur reseviñ \"%s\" digant %s"
-#: ../src/empathy-ft-manager.c:343
-#, fuzzy
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
-msgstr "Fazi en ur resev ur restr"
+msgstr "Fazi en ur reseviñ ur restr"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
-msgstr "Fazi en ur gas an \"%s\" da %s"
+msgstr "Fazi en ur gas \"%s\" da %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Fazi en ur gas ur restr"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
-msgstr ""
+msgstr "\"%s\" resevet digant %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" kaset da %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
-msgstr ""
+msgstr "Treuzkasad restr echu"
-#: ../src/empathy-ft-manager.c:617
-#: ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616
+#: ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
-msgstr ""
+msgstr "O c'hortoz respont ar c'hengomzer"
-#: ../src/empathy-ft-manager.c:643
-#: ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642
+#: ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
-msgstr ""
+msgstr "O wiriañ anterinded eus \"%s\""
-#: ../src/empathy-ft-manager.c:646
-#: ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645
+#: ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
-msgstr ""
+msgstr "O krouiñ sammad kontroll evit \"%s\""
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Restr"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "O chom"
@@ -2036,92 +2840,56 @@ msgstr "Treuzkasadurioù restroù"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
+msgstr "Dilemel treuzkasadurioù echu, nullet pe c'hwitet diouzh ar roll"
+
+#: ../src/empathy-import-dialog.c:84
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "N'eus kont ebet d'enporzhiañ kavet. Empathy zo gouest d'enporzhiañ kontoù Pidgin hepken evit poent."
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Enporzhiañ kontoù"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Enporzhiañ"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Komenad"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Tarzh"
-#: ../src/empathy-import-dialog.c:392
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr ""
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "Kont %s"
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "Enporzhiañ kontoù"
+#: ../src/empathy-main-window.c:433
+#, fuzzy
+msgid "Reconnect"
+msgstr "Digennasket"
-#: ../src/empathy-main-window.c:402
-msgid "_Edit account"
+#: ../src/empathy-main-window.c:439
+#, fuzzy
+msgid "Edit Account"
msgstr "K_emmañ ar gont"
-#: ../src/empathy-main-window.c:505
-msgid "No error specified"
-msgstr ""
-
-#: ../src/empathy-main-window.c:508
-msgid "Network error"
-msgstr "Fazi rouedad"
-
-#: ../src/empathy-main-window.c:511
-msgid "Authentication failed"
-msgstr "C'hwitadenn war dilesa"
-
-#: ../src/empathy-main-window.c:514
-msgid "Encryption error"
-msgstr "Fazi en ur enrinegañ"
-
-#: ../src/empathy-main-window.c:517
-msgid "Name in use"
-msgstr "Anv arveret"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate not provided"
-msgstr ""
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate untrusted"
-msgstr ""
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate expired"
-msgstr "Testeni diamzeret"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate not activated"
-msgstr ""
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate hostname mismatch"
-msgstr ""
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate fingerprint mismatch"
-msgstr ""
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate self-signed"
-msgstr ""
-
-#: ../src/empathy-main-window.c:541
-msgid "Certificate error"
-msgstr ""
+# adj
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Serriñ"
-#: ../src/empathy-main-window.c:544
-msgid "Unknown error"
-msgstr "Fazi dianav"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Darempred"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
-msgstr "Diskouez hag kemmañ kontoù"
+msgstr "Diskouez ha kemmañ kontoù"
#: ../src/empathy-main-window.ui.h:1
msgid "Contact List"
@@ -2129,7 +2897,7 @@ msgstr "Roll an darempredoù"
#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
-msgstr "Darempredoù war un ga_rtenn"
+msgstr "Darempredoù war ur ga_rtenn"
#: ../src/empathy-main-window.ui.h:3
msgid "Context"
@@ -2137,80 +2905,92 @@ msgstr "Kemperzh"
#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
-msgstr ""
+msgstr "Kejal ouzh ar re _wellañ"
#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
-msgstr ""
+msgstr "Merañ ar re wellañ"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
-msgstr ""
+msgstr "Ment reizh"
#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr ""
+#: ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "_Galv nevez..."
#: ../src/empathy-main-window.ui.h:8
+msgid "Normal Size With _Avatars"
+msgstr "Ment reizh gant _skeudennoùigoù"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "G_wellvezioù"
+
+#: ../src/empathy-main-window.ui.h:10
+#, fuzzy
+msgid "Show P_rotocols"
+msgstr "Komenad"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Rummañ dre a_nv"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Rummañ dre _stad"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Kontoù"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
-msgstr ""
+msgstr "Ment _fetis"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
-msgstr "_Diveugañ"
+msgstr "_Dizreinañ"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "Treuzkasadurioù _restroù"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "K_enstagañ..."
+#: ../src/empathy-main-window.ui.h:22
+#, fuzzy
+msgid "_Join…"
+msgstr "_Kejal"
-#: ../src/empathy-main-window.ui.h:20
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "Kaozadenn _nevez..."
+#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "Kaozeadenn _nevez..."
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "Darempredoù e_zlinenn"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
-msgstr "Tituroù personel"
+msgstr "Titouroù _personel"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "Kaozadennoù _kent"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Sal"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
-msgstr "Salflap"
+msgstr "Sal flapañ"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Izili"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#, c-format
-msgctxt "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
+#, fuzzy, c-format
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2222,35 +3002,30 @@ msgstr ""
"Ger-tremen rekis : %s\n"
"Izili : %s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "Ya"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "ket"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
-msgstr ""
+msgstr "N'haller ket loc'hañ diskwel roll ar salioù"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
-msgstr ""
+msgstr "N'haller ket paouezañ diskwel ar salioù flapañ"
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "Couldn't load room list"
-msgstr ""
+msgstr "N'haller ket kargañ roll ar salioù flapañ"
#: ../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 ""
+msgstr "Bizskrivit anv ar sal da gejal pe glikit war unan pe veur a sal er roll."
#: ../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 ""
+msgstr "Bizskrivit an dafariad a heberc'h ar sal pe laoskit anezhañ goullo ma'z eo ar sal war ar memes dafariad hag ar gont a-vremañ."
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
@@ -2264,282 +3039,430 @@ msgstr "Roll ar salioù"
msgid "_Room:"
msgstr "_Sal :"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
msgid "Message received"
msgstr "Kemennadenn resevet"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
msgid "Message sent"
msgstr "Kemennadenn kaset"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
msgid "New conversation"
-msgstr "Kaozadenn nevez"
+msgstr "Kaozeadenn nevez"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
msgid "Contact goes online"
-msgstr "Un darempred a ya enlinenn"
+msgstr "Un darempred zo enlinenn"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
msgid "Contact goes offline"
-msgstr "Un darempred a ya ezlinenn"
+msgstr "Un darempred zo ezlinenn"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
msgid "Account connected"
msgstr "Kont kennasket"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
msgid "Account disconnected"
msgstr "Kont digennasket"
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
msgid "Language"
msgstr "Yezh"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Aotreañ arver ar GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Neuz"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
-msgstr "Kennaskañ emgefreek e-pad al loc'hañ"
+msgstr "Kennaskañ emgefreek e-pad al loc'hañ "
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Emzalc'h"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
-msgstr "N_euz ar flap :"
+msgstr "Dod_enn ar flap :"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
-msgstr ""
+msgstr "Diweredekaat kemennoù pa vez _ezvezant pe ac'hubet"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
-msgstr ""
+msgstr "Diweredekaat sonioù pa vez _ezvezant pe ac'hubet"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
-msgstr ""
+msgstr "Diskouez kemennoù pa vez un darempred o kevreañ"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
-msgstr ""
+msgstr "Diskouez kemennoù pa vez un darempred o tigevreañ"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgstr "Diskouez kemennoù pa n'eo ket war wel ar gaozeadenn"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Gweredekaat an difazier evit ar yezhoù :"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Hollek"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:13
#, fuzzy
-msgid "Geoclue Settings"
-msgstr "Arventennoù Geoclue"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
+msgid "Location sources:"
msgstr "Lec'hiadur"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
-msgstr "Rebuzadurioù"
+msgstr "Kemennoù"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
-msgstr ""
+msgstr "Seniñ ur son evit darvoudoù"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Gwellvezioù"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Buhez prevez"
-#: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will have a random value added (&#xB1;0.25&#xB0;)."
-msgstr ""
+#: ../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 "Pa vez disteraet resisted al lec'hiadur, titouroù al lec'hiadur embannet zo termenet d'ar vro, ar rannvro ha d'ar gêr. Resisted ar c'henvuzulioù GPS zo termenet d'un niverenn hepken goude ar virgulenn."
-#: ../src/empathy-preferences.ui.h:22
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
-msgstr "Diskouez _smileys evel skeudennoù"
+msgstr "Diskouez ar _fromlunioù evel skeudennoù"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Diskouez roll an darempredoù er salioù"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Sonioù"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Gwiriañ ar reizhskrivadur"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr ""
+msgstr "N'eus nemet ar yezhoù gant ur geriadur staliet er roll ar yezhoù."
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
-msgstr "Neuzioù"
+msgstr "Dodennoù"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+#, fuzzy
+msgid "_Cellphone"
+msgstr "Megafon"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
-msgstr ""
+msgstr "_Gweredekaat al lagadennoù-kemenn"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
+msgstr "_Gweredekaat ar c'hemennoù son"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
msgstr ""
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
-msgstr ""
+msgstr "_Digeriñ kaozeadennoù nevez e prenistri dispartiet"
#: ../src/empathy-preferences.ui.h:31
msgid "_Publish location to my contacts"
-msgstr ""
+msgstr "_Embann ma lec'hiadur evit ma darempredoù"
#: ../src/empathy-preferences.ui.h:32
msgid "_Reduce location accuracy"
-msgstr ""
+msgstr "Disteraat resisted al lec'hiadur"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:176
+msgid "Respond"
+msgstr "Respont"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stad"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "_Kuitaat"
-#: ../src/empathy-tube-dispatch.c:375
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr ""
-
-#: ../src/empathy-tube-dispatch.c:446
-#, c-format
-msgid "An invitation was offered for service %s, but you don't have the needed application to handle it"
-msgstr ""
-
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr ""
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
-msgstr "Gwel kartenn an darempredoù"
+msgstr "Kartenn an darempredoù"
-#: ../src/empathy-debug-dialog.c:111
-#: ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "Fazi"
+#: ../src/empathy-debug-window.c:1066
+msgid "Save"
+msgstr "Enrollañ"
-#: ../src/empathy-debug-dialog.c:114
-#: ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "Eizik"
+#: ../src/empathy-debug-window.c:1219
+msgid "Debug Window"
+msgstr "Dizreinañ ar prenestr"
-#: ../src/empathy-debug-dialog.c:117
-#: ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "Evezh"
+#: ../src/empathy-debug-window.c:1299
+msgid "Pause"
+msgstr "Ehan"
-#: ../src/empathy-debug-dialog.c:120
-#: ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "Kemennadenn"
+#: ../src/empathy-debug-window.c:1311
+msgid "Level "
+msgstr "Live "
-#: ../src/empathy-debug-dialog.c:123
-#: ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:1331
+msgid "Debug"
+msgstr "Dizreinañ"
+
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "Titouroù"
-#: ../src/empathy-debug-dialog.c:126
-#: ../src/empathy-debug-dialog.c:1053
-msgid "Debug"
-msgstr "Diveugañ"
-
-#: ../src/empathy-debug-dialog.c:845
-msgid "Save"
-msgstr "Enrollañ"
+#: ../src/empathy-debug-window.c:1343
+#: ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Kemennadenn"
-#: ../src/empathy-debug-dialog.c:948
-msgid "Debug Window"
-msgstr "diveugañ ar prenestr"
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Evezh"
-#: ../src/empathy-debug-dialog.c:1021
-msgid "Pause"
-msgstr "Ehan"
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Arvarus"
-#: ../src/empathy-debug-dialog.c:1033
-msgid "Level "
-msgstr "Live"
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Fazi"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Eur"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domani"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Rummad"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Live"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1424
msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Diembreget eo an astenn direinañ a-bell gant ar merour kevreadenn diuzet."
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
msgstr ""
-msgid "Show _Offline Contacts"
-msgstr "Diskouez an darempredoù e_zlinenn"
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr ""
-msgid "Status:"
-msgstr "Stad :"
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
-msgid "Message:"
-msgstr "Kemennadenn :"
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
-msgid "Save message"
-msgstr "Enrollañ ar gemennadenn"
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
-msgid "Custom message"
-msgstr "Personalaat ar gemennadenn"
+#: ../src/empathy-accounts.c:223
+#, fuzzy
+msgid "<account-id>"
+msgstr "kont"
-msgid "Empathy Instant Messenger"
-msgstr "Postelerezh prim Empathy"
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Kontoù Empathy"
-msgid "Sort by _name"
-msgstr "Rummañ dre a_nv"
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr "Kontoù"
-msgid "Sort by s_tate"
-msgstr "Rummañ dre _stad"
+#~ msgid "Salut account is created"
+#~ msgstr "Krouet eo ar gont Salut"
+#~ msgid "Use the messaging indicator"
+#~ msgstr "Implijout kemennoù ar c'hemennadoù"
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr ""
+#~ "Merkañ hag-eñ eo bet krouet ar gont Salut e-pad al lañsañ kentañ Empathy."
+#~ msgid ""
+#~ "Whether or not to use the messaging indicator, if false the icon in the "
+#~ "notification area will be displayed."
+#~ msgstr ""
+#~ "Implij ar c'hemennoù kemennadoù, ma tibabit chom hep implijout anezho an "
+#~ "arlun a vo diskwelet en takad kemenn."
+#~ msgid "Can't set an empty display name"
+#~ msgstr "Dibosupl eo termeniñ un anv diskwel goullo"
+#~ msgid "Hidden"
+#~ msgstr "Kuzh"
+#~ msgid "Unsupported command"
+#~ msgstr "Diembreget eo an urzhiad"
+#~ msgid "_View Previous Conversations"
+#~ msgstr "G_welout kaozeadennoù kent"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>Lec'hiadur</b>"
+#~ msgid "Email:"
+#~ msgstr "Postel :"
+#~ msgid "C_all"
+#~ msgstr "G_ervel"
+#~ msgid "Custom Message..."
+#~ msgstr "Personalaat ar gemennadenn..."
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "Kemmañ ar gemennadenn bersonalaet..."
+#~ msgid "Custom messages..."
+#~ msgstr "Personalaat ar c'hemennadoù..."
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr ""
+#~ "An darempred da ziskwel er programmig. Leuskel goullo evit na ziskwel "
+#~ "darempred ebet."
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr ""
+#~ "Jedouer skeudennig an darempred. Chom a ra an talvoud-mañ goullo ma n'en "
+#~ "deus ket an darempred a skeudennig."
+#~ msgid "Talk!"
+#~ msgstr "Komz !"
+#~ msgid "_Information"
+#~ msgstr "_Titouroù"
+#~ msgid "_Preferences"
+#~ msgstr "_Gwellvezioù"
+#~ msgid "Please configure a contact."
+#~ msgstr "Kefluniañ ur darempred marplij."
+#~ msgid "Select contact..."
+#~ msgstr "Diuzañ an darempred..."
+#~ msgid "Presence"
+#~ msgstr "Bezañs"
+#~ msgid "Set your own presence"
+#~ msgstr "Termenit ho pezañs"
+#~ msgid "Show the accounts dialog"
+#~ msgstr "Diskouez boest kendiviz ar c'hontoù"
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "Ar gemennadenn fazi zo : <span style=\"italic\">%s</span>"
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Emaoc'h war-nes dilemel ho kont %s !\n"
+#~ "Ha sur e fell deoc'h kenderc'hel ?"
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "Holl ar salioù kaozeal ha flapañ keñveret ne vint ket dilamet ma tivizit "
+#~ "kenderc'hel.\n"
+#~ "\n"
+#~ "Ma tivizit adkrouiñ ar gont-mañ diwezhatoc'h, hegerz e vint atav."
+#~ msgid "_Next"
+#~ msgstr "_Da-heul"
+#~ msgid "Add new"
+#~ msgstr "Ouzhpennañ unan nevez"
+#~ msgid "Cr_eate"
+#~ msgstr "Kr_ouiñ"
+#~ msgid "_Add..."
+#~ msgstr "Ouzhpenn_añ..."
+#~ msgid "_Reuse an existing account"
+#~ msgstr "_Adimplijout ur gont a zo anezhi"
+#~ msgid "Conversations (%d)"
+#~ msgstr "Kaozeadennoù (%d)"
+#~ msgid "_Contact"
+#~ msgstr "_Darempred"
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s a bed ac'hanoc'h"
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "Un arload diavaez a vo loc'het evit merañ anezhi."
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "N'ho peus ket an arload diavaez rekis."
+#~ msgid "No error specified"
+#~ msgstr "Fazi ebet termenet"
+#~ msgid "Unknown error"
+#~ msgstr "Fazi dianav"
+#~ msgid "_Join..."
+#~ msgstr "_Kejal ouzh..."
+#~ msgid "_New Conversation..."
+#~ msgstr "Kaozeadenn _nevez..."
+#~ msgid "Allow _GPS usage"
+#~ msgstr "Aotreañ implij ar _GPS"
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "Aotreañ implij ar pellgomz _hezoug"
+#~ msgid "Allow _network usage"
+#~ msgstr "Aotreañ implij ar _rouedad"
+#~ msgid "Geoclue Settings"
+#~ msgstr "Arventennoù Geoclue"
+#~ msgid "Use message indicators"
+#~ msgstr "Implijout ar c'hemennoù kemennadoù"
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "Dibosupl eo loc'hañ an arload evit ar servij %s : %s"
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "Resevet ho peus ur bedadenn evit ar servij %s, hogen n'ho peus ket an "
+#~ "arload rekis evit merañ anezhañ."
+#~ msgid "gtk-add"
+#~ msgstr "gtk-ouzpennañ"
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-dilemel"
+#~ msgid "Add Account"
+#~ msgstr "Ouzhpennañ ar gont"
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+#~ msgid "Import Accounts..."
+#~ msgstr "Enporzhiañ kontoù..."
+#~ msgid "Settings"
+#~ msgstr "Arventennoù"
+#~ msgid "Type:"
+#~ msgstr "Rizh :"
+#~ msgid "Show _Offline Contacts"
+#~ msgstr "Diskouez an darempredoù e_zlinenn"
+#~ msgid "Status:"
+#~ msgstr "Stad :"
+#~ msgid "Message:"
+#~ msgstr "Kemennadenn :"
+#~ msgid "Save message"
+#~ msgstr "Enrollañ ar gemennadenn"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Postelerezh prim Empathy"
+#~ msgid "Sort by _name"
+#~ msgstr "Rummañ dre a_nv"
+#~ msgid "Sort by s_tate"
+#~ msgstr "Rummañ dre _stad"
+#~ msgid "Send and receive instant messages"
+#~ msgstr "Kas ha resev posteloù prim"
+#~ msgid "%s was banned by %s"
+#~ msgstr "%s oa bet argaset gant %s"
diff --git a/po/de.po b/po/de.po
index 70e96ca4d..9274a6621 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,15 +8,13 @@
# Michael Kanis <mkanis@gmx.de>, 2009.
# Mario Blättermann <mariobl@gnome.org>, 2008-2010.
# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
-#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-02 11:39+0000\n"
-"PO-Revision-Date: 2010-03-03 22:14+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-06 22:09+0100\n"
+"PO-Revision-Date: 2010-03-06 22:08+0100\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -212,113 +210,111 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt abmeldet"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut-Konto wird erzeugt"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Benutzerbilder anzeigen"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Kontaktliste in Chaträumen anzeigen"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Hinweis über das Schließen des Hauptfensters anzeigen"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Abgemeldete Kontakte anzeigen"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "Protokolle anzeigen"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Rechtschreibprüfungssprachen"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "Der vorgegebene Ordner zum Speichern der Dateiübertragungen"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "Der letzte Ordner, aus welchem ein Benutzerbild gewählt wurde."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"Das Erscheinungsbild, das für das Anzeigen von Unterhaltungen in Chat-"
"Fenstern verwendet wird."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Grafische Emoticons verwenden"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Benachrichtigen mit Klängen"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Erscheinungsbild für Chaträume verwenden"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
-"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln darf."
+"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln "
+"darf."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
+msgstr ""
+"Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Mobilfunknetz nutzen darf, um den Standort zu "
"schätzen."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Netzwerk nutzen darf, um den Standort zu schätzen."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Legt fest, ob Empathy danach gefragt hat, Benutzerkonten aus anderen "
"Programmen zu importieren."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Legt fest, ob Empathy sich automatisch beim Start bei allen Konten anmelden "
"soll."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Legt fest, ob Empathy die Genauigkeit der Positionsangabe aus "
"Datenschutzgründen reduzieren soll."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Legt fest, ob Empathy das Benutzerbild des Kontakts als Symbol des Chat-"
"Fensters verwenden soll."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Legt fest, ob die WebKit-Entwicklerwerkzeuge, wie der Web Inspector, "
"aktiviert werden sollen."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -326,142 +322,137 @@ msgstr ""
"Legt fest, ob Verbindungsverwaltungen für das automatische Verbinden und "
"Trennen verwendet werden sollen."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr ""
-"Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erstellt wurde."
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Legt fest, ob die Rechtschreibung eingegebener Wörter geprüft werden soll."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Legt fest, ob bei Unterhaltungen Emoticons als grafische Bilder dargestellt "
"werden sollen."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Legt fest, ob auf das Anmelden von Kontakten am Netzwerk mit einem Klang "
"hingewiesen werden soll."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Legt fest, ob auf das Abmelden von Kontakten am Netzwerk mit einem Klang "
"hingewiesen werden soll."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "Legt fest, ob bei Ereignissen Klänge abgespielt werden sollen."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
"Legt fest, ob bei eingehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "Legt fest, ob bei neuen Gesprächen ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
"Legt fest, ob bei ausgehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr ""
"Legt fest, ob beim Anmelden ans Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr ""
"Legt fest, ob beim Abmelden vom Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung Klänge abgespielt werden "
"sollen."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
-"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung eingeblendet "
-"werden soll."
+"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung "
+"eingeblendet werden soll."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
-"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung eingeblendet "
-"werden soll."
+"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung "
+"eingeblendet werden soll."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
-"Whether to show a popup notification when receiving a new message even if the "
-"chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
"Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
"auch dann eingeblendet werden soll, wenn der Chat bereits geöffnet, aber "
"nicht fokussiert ist."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
"eingeblendet werden soll."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Legt fest, ob Benutzerbilder für Kontakte in der Kontaktliste und den Chat-"
"Fenstern angezeigt werden sollen."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Legt fest, ob abgemeldete Kontakte in der Kontaktliste angezeigt werden."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung Benachrichtigungen "
"eingeblendet werden sollen."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Legt fest, ob Protokolle für Kontakte in der Kontaktliste angezeigt werden "
"sollen."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "Legt fest, ob die Kontaktliste in Chaträumen angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
-"Whether to show the message dialog about closing the main window with the 'x' "
-"button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Legt fest, ob der Dialog zum Schließen des Hauptfensters mit dem »x«-Knopf in "
"der Titelleiste angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "Legt fest, ob das Thema für Chaträume verwendet werden soll."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -477,7 +468,7 @@ msgid "Manage Messaging and VoIP accounts"
msgstr "Sofortnachrichten- und VoIP-Konten verwalten"
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:203 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
msgid "Messaging and VoIP Accounts"
msgstr "Sofortnachrichten- und VoIP-Konten"
@@ -500,7 +491,7 @@ msgid "The selected file is empty"
msgstr "Die ausgewählte Datei ist leer"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Personen in der Nähe"
@@ -674,21 +665,21 @@ msgstr "in der Zukunft"
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Benutzername:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "_Anmelden"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -696,15 +687,15 @@ msgstr "_Anmelden"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Aktiviert"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Ein neues Konto auf dem Server anlegen"
@@ -713,19 +704,19 @@ msgstr "Ein neues Konto auf dem Server anlegen"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s auf %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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s-Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Neues Konto"
@@ -924,8 +915,8 @@ msgid ""
msgstr ""
"Dies ist Ihr Benutzername, nicht Ihr gewöhnlicher Facebook-Anmeldename.\n"
"Falls Sie facebook.com/<b>dachs</b> sind, geben Sie <b>dachs</b> ein.\n"
-"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</a> "
-"einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
+"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</"
+"a> einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
@@ -1171,152 +1162,153 @@ msgstr "Alle Dateien"
msgid "Click to enlarge"
msgstr "Zum Vergrößern klicken"
-#: ../libempathy-gtk/empathy-chat.c:232
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
-msgstr "Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
+msgstr ""
+"Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
-#: ../libempathy-gtk/empathy-chat.c:654
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Beitritt in den Chatraum ist fehlgeschlagen"
-#: ../libempathy-gtk/empathy-chat.c:672
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Eine private Unterhaltung konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-chat.c:711
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Ein Thema wird in dieser Unterhaltung nicht unterstützt"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Sie sind nicht berechtigt, das Thema zu ändern"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: Alle Nachrichten der aktuellen Unterhaltung löschen"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <Thema>: Das Thema der aktuellen Unterhaltung festlegen"
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
-#: ../libempathy-gtk/empathy-chat.c:858
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <Kontaktkennung> [<Nachricht>]: Eine private Unterhaltung starten"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <Kontaktkennung> <Nachricht>: Eine private Unterhaltung starten"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <Spitzname>: Den Spitznamen auf dem aktuellen Server wechseln"
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <Nachricht>: Eine »ACTION«-Nachricht zur aktuellen Unterhaltung senden"
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:871
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\""
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
msgstr ""
"/say <Nachricht>: <Nachricht> zur aktuellen Unterhaltung senden. Es wird "
"verwendet, um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /"
"join tritt einem Chatraum bei«"
-#: ../libempathy-gtk/empathy-chat.c:875
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, show "
-"its usage."
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
msgstr ""
"/help [<Befehl>]: Alle verfügbaren Befehle zeigen. Falls <Befehl> angegeben "
"wird, so wird dessen Verwendung erklärt."
-#: ../libempathy-gtk/empathy-chat.c:885
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Aufruf: %s"
-#: ../libempathy-gtk/empathy-chat.c:914
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Unbekannter Befehl"
-#: ../libempathy-gtk/empathy-chat.c:1035
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Unbekannter Befehl; Bitte lesen Sie /help zu verfügbaren Befehlen"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "Abgemeldet"
-#: ../libempathy-gtk/empathy-chat.c:1176
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "Ungültiger Kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "Erlaubnis verweigert"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "Zu lange Nachricht"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "Nicht implementiert"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "Unbekannt"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fehler beim Senden der Nachricht »%s«: %s"
-#: ../libempathy-gtk/empathy-chat.c:1222
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Thema wurde gesetzt auf: %s"
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Kein Thema gesetzt"
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Keine Vorschläge)"
-#: ../libempathy-gtk/empathy-chat.c:1677
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Emoticon einfügen"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1695
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Senden"
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Vor_schläge zur Rechtschreibung"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Failed to retrieve recent logs"
msgstr "Letzte Protokolle konnten nicht geholt werden"
-#: ../libempathy-gtk/empathy-chat.c:1954
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s hat sich abgemeldet"
@@ -1324,12 +1316,12 @@ msgstr "%s hat sich abgemeldet"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1961
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s wurde von %2$s rausgeworfen"
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s wurde rausgeworfen"
@@ -1337,17 +1329,17 @@ msgstr "%s wurde rausgeworfen"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1972
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s wurde von %2$s verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s wurde verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1979
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s hat den Raum verlassen"
@@ -1357,46 +1349,46 @@ msgstr "%s hat den Raum verlassen"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1988
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s hat den Raum betreten"
-#: ../libempathy-gtk/empathy-chat.c:2038
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s ist jetzt bekannt als %s"
-#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Getrennt"
-#: ../libempathy-gtk/empathy-chat.c:2695
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Falsches Kennwort; Bitte versuchen Sie es erneut:"
-#: ../libempathy-gtk/empathy-chat.c:2696
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Wiederholen"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Dieser Raum ist durch ein Kennwort geschützt:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Beitreten"
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Verbunden"
-#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-chat.c:2901
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Unterhaltung"
@@ -1406,20 +1398,20 @@ msgid "Topic:"
msgstr "Thema:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "Link-Adresse _kopieren"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "Link _öffnen"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A, %d. %B %Y"
@@ -1523,129 +1515,129 @@ msgstr "In den Chatraum _einladen"
msgid "Select a contact"
msgstr "Kontakt auswählen"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Wählen"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Gruppe"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "ISO-Länderkennung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Bundesland/Kanton:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Stadt:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Region:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Postleitzahl:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Straße:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Gebäude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Etage::"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Raum:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Beschreibung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "Adresse:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Genauigkeitsgrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Fehler:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Vertikale Ungenauigkeit (Meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Horizontale Ungenauigkeit (Meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Geschwindigkeit:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Peilung:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Steiggeschwindigkeit:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Zuletzt aktualisiert am:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Längengrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Breitengrad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Höhe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Position"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Ort</b>"
-#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y um %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Benutzerbild speichern"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "Benutzerbild konnte nicht gespeichert werden"
@@ -1817,12 +1809,12 @@ msgstr "Klicken, um den Status zu einem Favoriten zu machen"
msgid "Set status"
msgstr "Status setzen"
-#: ../libempathy-gtk/empathy-presence-chooser.c:936
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Ihren gegenwärtigen Anwesenheitsstatus setzen"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Benutzerdefinierte Nachricht …"
@@ -1910,15 +1902,15 @@ msgstr "Sauber"
msgid "Blue"
msgstr "Blau"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Adresse konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Eine Datei auswählen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "Ein Ziel auswählen"
@@ -2126,14 +2118,15 @@ msgid ""
msgstr ""
"Empathy ist freie Software, Sie können sie weitergeben und/oder verändern "
"solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 "
-"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
+"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
+"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
#: ../src/empathy-about-dialog.c:89
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."
+"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 wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
"jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der "
@@ -2196,7 +2189,7 @@ msgstr ""
"Assistenten beenden und später über das »Bearbeiten»-Menü Konten hinzufügen."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Ein Fehler ist aufgetreten"
@@ -2205,36 +2198,36 @@ msgstr "Ein Fehler ist aufgetreten"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Neues %s-Konto"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Welche Art Chat-Konto haben Sie?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Haben Sie weitere Chat-Konten, die Sie einrichten wollen?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Geben Sie Ihre Kontodetails ein"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Welche Art von Chat-Konto wollen Sie anlegen?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Möchten Sie weitere Chat-Konten anlegen?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Geben Sie die Details für das neue Konto ein"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2246,43 +2239,43 @@ msgstr ""
"Programme verwenden. Mit einem Mikrofon oder einer Webcam können Sie auch "
"Audio- bzw. Videoanrufe tätigen."
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Haben Sie ein Konto, das Sie zuvor mit einem anderen Chat-Programm verwendet "
"haben?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Ja, meine Kontodetails importieren von "
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Ja, ich möchte jetzt meine Kontodetails eingeben"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Nein, ich möchte ein neues Konto"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Nein, ich möchte nur Personen in der Nähe sehen"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Wählen Sie die zu importierenden Konten:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Nein, das ist alles"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2294,16 +2287,16 @@ msgstr ""
"bitte die Angaben unten auf Vollständigkeit. Sie können sie später leicht "
"ändern oder das Merkmal im Dialog »Konten« ausschalten"
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Bearbeiten→Konten"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "Nein, ich möchte dieses Funktionsmerkmal derzeit nicht aktivieren"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2315,19 +2308,19 @@ msgstr ""
"wollen, so installieren Sie bitte das Paket telepathy-salut\n"
"und erstellen Sie ein Konto vom Typ »Personen in der Nähe« im Dialog »Konten«."
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ist nicht installiert"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Willkommen bei Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Bestehende Konten importieren"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1285
msgid "Please enter personal details"
msgstr "Bitte geben Sie persönliche Informationen ein"
@@ -2344,33 +2337,33 @@ msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto »%s« vorhanden."
msgid "Your new account has not been saved yet."
msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Verbindung wird aufgebaut …"
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Getrennt — %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Abgemeldet — %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Abgemeldet — Keine Netzwerkverbindung"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Unbekannter Status"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Abgemeldet — Konto ist deaktiviert"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2379,16 +2372,16 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Möchten Sie %s wirklich von Ihrem Rechner entfernen?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2397,7 +2390,7 @@ msgstr ""
"Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
"fortfahren möchten?"
-#: ../src/empathy-accounts-dialog.c:1862
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2407,7 +2400,7 @@ msgstr ""
"fortfahren möchten?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1995
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Konten"
@@ -2525,15 +2518,15 @@ msgstr "Es gab im Netzwerk einen Fehler"
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem Rechner "
-"installiert"
+"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem "
+"Rechner installiert"
#: ../src/empathy-call-window.c:1817
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem Rechner "
-"installiert"
+"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem "
+"Rechner installiert"
#: ../src/empathy-call-window.c:1827
#, c-format
@@ -2791,7 +2784,8 @@ msgstr "%s lädt Sie ein, %s beizutreten"
msgid "_Decline"
msgstr "A_blehnen"
-#: ../src/empathy-event-manager.c:595 ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Beitreten"
@@ -2949,8 +2943,8 @@ msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr ""
-"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur den "
-"Import von Benutzerkonten aus Pidgin."
+"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur "
+"den Import von Benutzerkonten aus Pidgin."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -3401,40 +3395,48 @@ msgstr "Teilnehmer einladen"
msgid "Choose a contact to invite into the conversation:"
msgstr "Wählen Sie einen Kontakt für eine Einladung zur Unterhaltung:"
-#: ../src/empathy-accounts.c:214
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"Keine Dialoge anzeigen, diverse Aufgaben ausführen (z.B. Importieren) und "
"schließen"
-#: ../src/empathy-accounts.c:218
+#: ../src/empathy-accounts.c:217
msgid "Don't display any dialogs if there are any non-salut accounts"
msgstr "Keine Dialoge anzeigen, wenn es irgendwelche Nicht-Salut-Konten gibt"
-#: ../src/empathy-accounts.c:222
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Anfänglich angegebenes Konto auswählen (z.B. gabble/jabber/"
"foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:224
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<Kontokennung>"
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Empathy-Konten"
-#: ../src/empathy-accounts.c:248
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
-msgstr "Konten"
+msgstr " Konten"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Salut-Konto wird erzeugt"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr ""
+#~ "Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erstellt "
+#~ "wurde."
#~ msgid ""
#~ "Try to import any recognized accounts and display an assistant if that "
#~ "fails"
#~ msgstr ""
-#~ "Versuchen, erkannte Konten zu importieren und im Fall des Scheiterns einen "
-#~ "Assistenten anzeigen"
+#~ "Versuchen, erkannte Konten zu importieren und im Fall des Scheiterns "
+#~ "einen Assistenten anzeigen"
#~ msgid "Show the accounts dialog"
#~ msgstr "Konten-Dialog anzeigen"
@@ -3475,8 +3477,8 @@ msgstr "Konten"
#~ msgid ""
#~ "The contact to display in the applet. Empty means no contact is displayed."
#~ msgstr ""
-#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass kein "
-#~ "Kontakt angezeigt wird."
+#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass "
+#~ "kein Kontakt angezeigt wird."
#~ msgid "The contact's avatar token. Empty means contact has no avatar."
#~ msgstr ""
@@ -3515,8 +3517,8 @@ msgstr "Konten"
#~ "Any associated conversations and chat rooms will NOT be removed if you "
#~ "decide to proceed.\n"
#~ "\n"
-#~ "Should you decide to add the account back at a later time, they will still "
-#~ "be available."
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
#~ msgstr ""
#~ "Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, "
#~ "wenn Sie fortfahren.\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index cca6a2724..62f984132 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,14 +2,14 @@
# This file is distributed under the same licence as the empathy package.
# David Lodge <dave@cirt.net>, 2007, 2009.
# Bruce Cowan <bcowan@fastmail.co.uk>, 2009, 2010.
-# Philip Withnall <philip@tecnocode.co.uk>, 2009.
+# Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 13:50+0000\n"
+"POT-Creation-Date: 2010-03-04 23:54+0000\n"
"PO-Revision-Date: 2010-02-24 00:07+0100\n"
-"Last-Translator: Bruce Cowan <bcowan@fastmail.co.uk>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
"Language-Team: British English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -201,103 +201,99 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Pop up notifications when a contact logs out"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut account is created"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Show avatars"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Show contact list in rooms"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Show hint about closing the main window"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Show offline contacts"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "Show protocols"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "The default folder to save file transfers in."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "The last directory that an avatar image was chosen from."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
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/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Use notification sounds"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Use theme for chat rooms"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
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/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Whether Empathy can use the GPS to guess the location."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Whether Empathy can use the mobile phone network to guess the location."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr "Whether Empathy can use the network to guess the location."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Whether Empathy has asked about importing accounts from other programs."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Whether Empathy should automatically log into your accounts on startup."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
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/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
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/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
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/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -305,68 +301,64 @@ msgstr ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "Whether the Salut account has been created on the first Empathy run."
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
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/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Whether to convert smileys into graphical images in conversations."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
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/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
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/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "Whether to play a sound to notify of events."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Whether to play a sound to notify of incoming messages."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "Whether to play a sound to notify of new conversations."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Whether to play a sound to notify of outgoing messages."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "Whether to play a sound when logging into a network."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
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/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr "Whether to play sound notifications when away or busy."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
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/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
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/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -374,37 +366,37 @@ msgstr ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
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/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
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/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
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/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr "Whether to show popup notifications when away or busy."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Whether to show protocols for contacts in the contact list."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "Whether to show the contact list in chat rooms."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "Whether to show the contact list in compact mode."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -412,11 +404,11 @@ msgstr ""
"Whether to show the message dialogue about closing the main window with the "
"'x' button in the title bar."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "Whether to use the theme for chat rooms."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -431,28 +423,28 @@ msgid "Manage Messaging and VoIP accounts"
msgstr "Manage Messaging and VoIP accounts"
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
msgid "Messaging and VoIP Accounts"
msgstr "Messaging and VoIP Accounts"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "The hash of the received file and the sent one do not match"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "File transfer not supported by remote contact"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "The selected file is not a regular file"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "The selected file is empty"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "People nearby"
@@ -626,21 +618,21 @@ msgstr "in the future"
msgid "All"
msgstr "All"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Username:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "L_og in"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -648,15 +640,15 @@ msgstr "L_og in"
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Enabled"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "This account already exists on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Create a new account on the server"
@@ -665,19 +657,19 @@ msgstr "Create a new account on the server"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s on %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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s Account"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "New account"
@@ -1124,59 +1116,59 @@ msgstr "All Files"
msgid "Click to enlarge"
msgstr "Click to enlarge"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Failed to reconnect this chat"
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Failed to join chat room"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Failed to open private chat"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Topic not supported on this conversation"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "You are not allowed to change the topic"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: clear all messages from the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: set the topic of the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: change your nickname on the current server"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: send an ACTION message to the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1186,7 +1178,7 @@ msgstr ""
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1194,76 +1186,80 @@ msgstr ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Usage: %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Unknown command"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Unknown command; see /help for the available commands"
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:1148
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error sending message '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1664
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:1813
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "Failed to retrieve recent logs"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
@@ -1271,12 +1267,12 @@ msgstr "%s has disconnected"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1820
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
@@ -1284,17 +1280,17 @@ msgstr "%s was kicked"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:1838
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
@@ -1304,47 +1300,47 @@ msgstr "%s has left the room"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:1897
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Disconnected"
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Wrong password; please try again:"
-#: ../libempathy-gtk/empathy-chat.c:2567
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Retry"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "This room is protected by a password:"
-#: ../libempathy-gtk/empathy-chat.c:2573
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Join"
-#: ../libempathy-gtk/empathy-chat.c:2713
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:2766
-#: ../libempathy-gtk/empathy-log-window.c:548
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversation"
@@ -1353,20 +1349,20 @@ msgid "Topic:"
msgstr "Topic:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Open Link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
@@ -1415,54 +1411,54 @@ msgstr "Do you really want to remove the contact '%s'?"
msgid "Removing contact"
msgstr "Removing contact"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Add Contact…"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Previous Conversations"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Send file"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Share my desktop"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Infor_mation"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:459
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:513
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Inviting you to this room"
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "_Invite to chat room"
@@ -1470,129 +1466,129 @@ msgstr "_Invite to chat room"
msgid "Select a contact"
msgstr "Select a contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Select"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Group"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "State:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Location"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Location</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Save Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
@@ -1681,12 +1677,12 @@ msgstr "Port"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:541
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-log-window.c:558
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Date"
@@ -1742,34 +1738,34 @@ msgstr "New Call"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "Custom Message…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "Edit Custom Messages…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Click to remove this status as a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Click to make this status a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Set status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Set your presence and current status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Custom messages…"
@@ -1857,15 +1853,15 @@ msgstr "Clean"
msgid "Blue"
msgstr "Blue"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Unable to open URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Select a file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "Select a destination"
@@ -2052,15 +2048,15 @@ msgstr "No error message"
msgid "Instant Message (Empathy)"
msgstr "Instant Message (Empathy)"
-#: ../src/empathy.c:569
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Don't connect on startup"
-#: ../src/empathy.c:573
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Don't display the contact list or any other dialogues on startup"
-#: ../src/empathy.c:585
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
@@ -2139,7 +2135,7 @@ msgstr ""
"this assistant and add accounts later from the Edit menu."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "An error occurred"
@@ -2148,36 +2144,36 @@ msgstr "An error occurred"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "New %s account"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "What kind of chat account do you have?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Do you have any other chat accounts you want to set up?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Enter your account details"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "What kind of chat account do you want to create?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Do you want to create other chat accounts?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Enter the details for the new account"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2189,41 +2185,41 @@ msgstr ""
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "Do you have an account you've been using with another chat program?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Yes, import my account details from "
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Yes, I'll enter my account details now"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "No, I want a new account"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "No, I just want to see people online nearby for now"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Select the accounts you want to import:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Yes"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "No, that's all for now"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2235,16 +2231,16 @@ msgstr ""
"details below are correct. You can easily change these details later or "
"disable this feature by using the 'Accounts' dialogue"
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Edit->Accounts"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "I don't want to enable this feature for now"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2256,19 +2252,19 @@ msgstr ""
"install the telepathy-salut package and create a People Nearby account from "
"the Accounts dialogue"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut not installed"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Welcome to Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Import your existing accounts"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1285
msgid "Please enter personal details"
msgstr "Please enter personal details"
@@ -2285,33 +2281,33 @@ msgstr "There are unsaved modifications to your %s account."
msgid "Your new account has not been saved yet."
msgstr "Your new account has not been saved yet."
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Connecting…"
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Disconnected — %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Offline — No Network Connection"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Unknown Status"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Offline — Account Disabled"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2319,16 +2315,16 @@ msgstr ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Do you want to remove %s from your computer?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "This will not remove your account on the server."
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2336,7 +2332,7 @@ msgstr ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:1863
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2345,7 +2341,7 @@ msgstr ""
"your changes. Are you sure you want to proceed?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1996
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Accounts"
@@ -3265,59 +3261,59 @@ msgstr "Contact Map View"
msgid "Save"
msgstr "Save"
-#: ../src/empathy-debug-window.c:1188
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Debug Window"
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1280
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Level "
-#: ../src/empathy-debug-window.c:1300
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Debug"
-#: ../src/empathy-debug-window.c:1306
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "Message"
-#: ../src/empathy-debug-window.c:1318
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "Warning"
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "Critical"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Time"
-#: ../src/empathy-debug-window.c:1352
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domain"
-#: ../src/empathy-debug-window.c:1354
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Category"
-#: ../src/empathy-debug-window.c:1356
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Level"
-#: ../src/empathy-debug-window.c:1388
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3334,33 +3330,45 @@ msgstr "Invite Participant"
msgid "Choose a contact to invite into the conversation:"
msgstr "Choose a contact to invite into the conversation:"
-#: ../src/empathy-accounts.c:196
-msgid ""
-"Try to import any recognized accounts and display an assistant if that fails"
-msgstr ""
-"Try to import any recognised accounts and display an assistant if that fails"
-
-#: ../src/empathy-accounts.c:201
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
-#: ../src/empathy-accounts.c:205
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Don't display any dialogues if there are any non-Salut accounts"
+
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:207
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:215
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Empathy Accounts"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
msgstr " Accounts"
+#~ msgid "Salut account is created"
+#~ msgstr "Salut account is created"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr ""
+#~ "Whether the Salut account has been created on the first Empathy run."
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr ""
+#~ "Try to import any recognised accounts and display an assistant if that "
+#~ "fails"
+
#~ msgid "Show the accounts dialog"
#~ msgstr "Show the accounts dialogue"
diff --git a/po/es.po b/po/es.po
index d5dd222e6..04af28ced 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: empathy.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-02 11:39+0000\n"
-"PO-Revision-Date: 2010-03-03 07:47+0100\n"
+"POT-Creation-Date: 2010-03-15 08:26+0000\n"
+"PO-Revision-Date: 2010-03-15 09:26+0100\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -105,107 +105,107 @@ msgid "Empathy has asked about importing accounts"
msgstr "Empathy le ha preguntado acerca de importar cuentas"
#: ../data/empathy.schemas.in.h:17
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy ha migrado los registros de butterfly"
+
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should auto-connect on startup"
msgstr "Empathy se debería autoconectar al inicio"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy debería reducir la precisión de la ubicación"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
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/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable WebKit Developer Tools"
msgstr "Activar las herramientas de desarrollo de WebKit"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable popup notifications for new messages"
msgstr "Activar notificaciones emergentes para mensajes nuevos"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Enable spell checker"
msgstr "Activar revisor ortográfico"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide main window"
msgstr "Ocultar la ventana principal"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
msgid "Hide the main window."
msgstr "Ocultar la ventana principal."
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
msgid "MC 4 accounts have been imported"
msgstr "Se han importado las cuentas MC 4"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
msgid "MC 4 accounts have been imported."
msgstr "Se han importado las cuentas MC 4."
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
msgid "Nick completed character"
msgstr "Carácter de completado de apodo"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
msgid "Open new chats in separate windows"
msgstr "Abrir chats nuevos en ventanas separadas"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Ruta del tema Adium que usar"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
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/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Reproducir un sonido cuando lleguen mensajes"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for new conversations"
msgstr "Reproducir un sonido para conversaciones nuevas"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Reproducir un sonido al enviar mensajes"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Reproducir un sonido cuando un contacto inicie sesión"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log in"
msgstr "Reproducir un sonido cuando inicio sesión"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
msgid "Play a sound when we log out"
msgstr "Reproducir un sonido cuando finalizo una sesión"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr ""
"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Se creó la cuenta Salut"
-
#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Mostrar avatares"
@@ -281,33 +281,37 @@ msgstr ""
"programas."
#: ../data/empathy.schemas.in.h:59
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Indica si Empathy ha migrado los registros de butterfly."
+
+#: ../data/empathy.schemas.in.h:60
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/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
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/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
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/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
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/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -315,12 +319,6 @@ msgstr ""
"Indica si se debe usan usar gestores de conectividad para desconectarse/"
"reconectarse automáticamente."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr ""
-"Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez "
-"Empathy."
-
#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether to check words typed against the languages you want to check with."
@@ -465,8 +463,10 @@ msgstr ""
msgid "Manage Messaging and VoIP accounts"
msgstr "Gestionar las cuentas de mensajería y Voz IP"
+#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:203 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Cuentas de mensajería y Voz IP"
@@ -487,7 +487,7 @@ msgid "The selected file is empty"
msgstr "El archivo seleccionado está vacío"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Gente cerca"
@@ -661,21 +661,21 @@ msgstr "en el futuro"
msgid "All"
msgstr "Todo"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "Iniciar _sesión"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -683,15 +683,15 @@ msgstr "Iniciar _sesión"
msgid "Account:"
msgstr "Cuenta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Activada"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
@@ -700,19 +700,19 @@ msgstr "Crear una cuenta nueva en el servidor"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Cuenta nueva"
@@ -1159,59 +1159,59 @@ msgstr "Todos los archivos"
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-chat.c:232
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Falló al reconectar a este chat"
-#: ../libempathy-gtk/empathy-chat.c:654
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Falló al unirse a la sala de chat"
-#: ../libempathy-gtk/empathy-chat.c:672
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:711
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:847
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:849
+#: ../libempathy-gtk/empathy-chat.c:850
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:852
+#: ../libempathy-gtk/empathy-chat.c:853
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:855
+#: ../libempathy-gtk/empathy-chat.c:856
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:858
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:865
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:867
+#: ../libempathy-gtk/empathy-chat.c:868
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:870
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1221,7 +1221,7 @@ 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:875
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1229,80 +1229,80 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:885
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:914
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1035
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1176
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1222
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
-#: ../libempathy-gtk/empathy-chat.c:1677
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1695
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "E_nviar"
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:1954
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1310,12 +1310,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:1961
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1323,17 +1323,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:1972
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:1979
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1343,46 +1343,46 @@ 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:1988
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2038
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2695
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
-#: ../libempathy-gtk/empathy-chat.c:2696
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-chat.c:2901
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversación"
@@ -1392,20 +1392,20 @@ msgid "Topic:"
msgstr "Tema:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Abrir enlace"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
@@ -1429,28 +1429,28 @@ msgstr "Decidir _luego"
msgid "Subscription Request"
msgstr "Petición de suscripción"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "¿Realmente quiere quitar el grupo «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Quitando grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Quitar"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "¿Realmente quiere quitar el contacto «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Quitando el contacto"
@@ -1509,129 +1509,129 @@ msgstr "_Invitar a la sala de chat"
msgid "Select a contact"
msgstr "Seleccionar un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Seleccionar"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
-#: ../src/empathy-main-window.c:1045
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1049
msgid "Group"
msgstr "Grupo"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Ciudad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Calle:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Edificio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Planta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Habitación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Descripción:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Error vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Error horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Velocidad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Retardo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Velocidad de ascenso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Actualizado por última vez:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Longitud_"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Ubicación geográfica"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Ubicación</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a las %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Guardar avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "No se pudo guardar el avatar"
@@ -1803,12 +1803,12 @@ msgstr "Pulse para hacer este estado uno favorito"
msgid "Set status"
msgstr "Establecer estado"
-#: ../libempathy-gtk/empathy-presence-chooser.c:936
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Establecer su presencia y estado actual"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Mensajes personalizados…"
@@ -1896,15 +1896,15 @@ msgstr "Limpio"
msgid "Blue"
msgstr "Azul"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1677
msgid "Select a destination"
msgstr "Seleccionar un destino"
@@ -2176,7 +2176,7 @@ msgstr ""
"Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1303
msgid "An error occurred"
msgstr "Ocurrió un error"
@@ -2185,36 +2185,36 @@ msgstr "Ocurrió un error"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Cuenta de %s nueva"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "¿Qué tipo de cuenta tiene?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Introducir los detalles de su cuenta"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "¿Qué tipo de cuenta quiere crear?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "¿Quiere crear otras cuentas de chat?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Introducir los detalles para la cuenta nueva"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2225,41 +2225,41 @@ msgstr ""
"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
"micrófono o una cámara web puede hacer incluso llamadas de sonido o vídeo."
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Sí, importar los detalles de mi cuenta desde "
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "No, quiero crear una cuenta nueva"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Seleccione las cuentas que quiere importar:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Sí"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "No, eso es todo por ahora"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2272,16 +2272,16 @@ msgstr ""
"estos detalles posteriormente o desactivar esta característica usando el "
"diálogo «Cuentas»."
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Editar->Cuentas"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "No quiero activar esta característica por ahora"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2293,19 +2293,24 @@ msgstr ""
"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
"diálogo Cuentas."
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut no está instalado"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1227
+#| msgid "Messaging and VoIP Accounts"
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Asistente de cuentas de mensajería y Voz IP"
+
+#: ../src/empathy-account-assistant.c:1261
msgid "Welcome to Empathy"
msgstr "Bienvenido a Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1270
msgid "Import your existing accounts"
msgstr "Importar sus cuentas existentes"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1288
msgid "Please enter personal details"
msgstr "Introduzca los detalles personales"
@@ -2322,33 +2327,33 @@ msgstr "Existen modificaciones sin guardar en su cuenta %s."
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Conectando…"
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Desconectado: %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Desconectado: sin conexión de red"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Estado desconocido"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Desconectado: cuenta desactivada"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2356,16 +2361,16 @@ msgstr ""
"Va a crear una cuenta nueva que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "¿Quiere quitar %s de su equipo?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "Esto no quitará su cuenta del servidor."
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2373,7 +2378,7 @@ msgstr ""
"Va a seleccionar otra cuenta lo que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1862
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2381,11 +2386,6 @@ msgstr ""
"Va a cerrar la ventana lo que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1995
-msgid "Accounts"
-msgstr "Cuentas"
-
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "No hay protocolos instalados"
@@ -2950,23 +2950,23 @@ msgstr "Origen"
msgid "%s account"
msgstr "Cuenta %s"
-#: ../src/empathy-main-window.c:433
+#: ../src/empathy-main-window.c:437
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:439
+#: ../src/empathy-main-window.c:443
msgid "Edit Account"
msgstr "Editar cuenta"
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:449
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-main-window.c:1028
+#: ../src/empathy-main-window.c:1032
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1369
+#: ../src/empathy-main-window.c:1413
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
@@ -3376,31 +3376,49 @@ msgstr "Invitar participante"
msgid "Choose a contact to invite into the conversation:"
msgstr "Elegir un contacto para invitar a la conversación:"
-#: ../src/empathy-accounts.c:214
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
-#: ../src/empathy-accounts.c:218
+#: ../src/empathy-accounts.c:217
msgid "Don't display any dialogs if there are any non-salut accounts"
msgstr "No mostrar ningún diálogo si existe alguna cuenta diferente de salut"
-#: ../src/empathy-accounts.c:222
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
-#: ../src/empathy-accounts.c:224
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<id-de-cuenta>"
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr ": Cuentas en Empathy"
-#: ../src/empathy-accounts.c:248
-msgid " Accounts"
-msgstr " Cuentas"
+#: ../src/empathy-accounts.c:247
+msgid "Empathy Accounts"
+msgstr "Cuentas en Empathy"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Depurador de Empathy"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Se creó la cuenta Salut"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr ""
+#~ "Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez "
+#~ "Empathy."
+
+#~ msgid "Accounts"
+#~ msgstr "Cuentas"
+
+#~ msgid " Accounts"
+#~ msgstr " Cuentas"
#~ msgid ""
#~ "Try to import any recognized accounts and display an assistant if that "
diff --git a/po/eu.po b/po/eu.po
index d883e05f0..bcdd16c76 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,13 +4,13 @@
# This file is distributed under the same license as the gossip package.
#
# Mikel Olasagasti <hey_neken@mundurat.net>, 2003.
-# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-09-02 16:26+0000\n"
-"PO-Revision-Date: 2009-09-07 11:09+0200\n"
+"POT-Creation-Date: 2010-03-04 21:59+0000\n"
+"PO-Revision-Date: 2010-03-06 11:12+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
"MIME-Version: 1.0\n"
@@ -52,10 +52,10 @@ msgid "Chat window theme"
msgstr "Berriketako leihoaren gaia"
#: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
-"zerrenda (adib. de, ca, eu)."
+"zerrenda (adib. \"de, ca, eu\")."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
@@ -66,7 +66,7 @@ msgid "Connection managers should be used"
msgstr "Sare-kudeatzaileak erabili beharko lirateke"
#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+msgid "Contact list sort criterion"
msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
#: ../data/empathy.schemas.in.h:8
@@ -154,11 +154,11 @@ msgid "Open new chats in separate windows"
msgstr "Ireki berriketa berriak beste leihoetan"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
+msgid "Path of the Adium theme to use"
msgstr "Bide-izena Adium gaia erabiltzeko"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
#: ../data/empathy.schemas.in.h:31
@@ -190,37 +190,37 @@ msgid "Play a sound when we log out"
msgstr "Jo soinua zuk saioa amaitzean"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut kontua sortzen du"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Erakutsi avatar-ak"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Erakutsi kontaktu-zerrenda geletan"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Erakutsi konektatu gabeko kontaktuak"
+#: ../data/empathy.schemas.in.h:45
+msgid "Show protocols"
+msgstr "Erakutsi protokoloak"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Hizkuntzen zuzentzailea"
@@ -250,222 +250,217 @@ msgid "Use theme for chat rooms"
msgstr "Erabili gaia berriketa-gelan"
#: ../data/empathy.schemas.in.h:53
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
-"ez."
-
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../data/empathy.schemas.in.h:54
+msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/empathy.schemas.in.h:56
+msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
-#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/empathy.schemas.in.h:57
+msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Empathy-k beste programetatik kontuak inportatzeari buruz galdetu duen ala "
"ez."
-#: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+#: ../data/empathy.schemas.in.h:58
+msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+#: ../data/empathy.schemas.in.h:59
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
"duen edo ez."
-#: ../data/empathy.schemas.in.h:61
-msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+#: ../data/empathy.schemas.in.h:60
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
"ez adierazten du."
+#: ../data/empathy.schemas.in.h:61
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
+"ez."
+
#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
"Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
"den edo ez adierazten du."
#: ../data/empathy.schemas.in.h:63
-msgid "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Salut kontua sortu den ala ez (Empathy aurreneko aldiz exekutatzean)."
-
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+msgid "Whether to check words typed against the languages you want to check with."
msgstr ""
"Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
"hizkuntzetan)."
-#: ../data/empathy.schemas.in.h:65
-msgid "Whether or not to convert smileys into graphical images in conversations."
+#: ../data/empathy.schemas.in.h:64
+msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Elkarrizketetan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/empathy.schemas.in.h:65
+msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether to play a sound to notify of events."
msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether to play a sound to notify of incoming messages."
msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether to play a sound to notify of new conversations."
msgstr "Berriketa berriak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether to play a sound when logging into a network."
msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether to play a sound when logging out of a network."
msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether to play sound notifications when away or busy."
msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
"erakutsiko duen edo ez."
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
"duen edo ez."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:76
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
-"adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, egon)"
+"adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
+"egon)."
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show a popup notification when receiving a new message."
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+#: ../data/empathy.schemas.in.h:78
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
-"edo ez adierazten du."
+"ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
"adierazten du."
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
"adierazten du."
+#: ../data/empathy.schemas.in.h:81
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
+"edo ez adierazten du."
+
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
#: ../data/empathy.schemas.in.h:83
+msgid "Whether to show the contact list in compact mode."
+msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
+
+#: ../data/empathy.schemas.in.h:84
msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
"koadroa erakutsi ala ez adierazten du."
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
-
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
#: ../data/empathy.schemas.in.h:86
msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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 ""
"Zein irizpide erabiliko den kontaktu-zerrenda ordenatzean. Lehenetsia "
-"kontaktuen izenen arabera ordenatzea da \"izena\" balioarekin. \"egoera\" "
-"balioak kontaktu-zerrenda egoeraren arabera ordenatuko du."
+"kontaktuen izenen arabera ordenatzea da \"name\" (izena) balioarekin. \"state"
+"\" (egoera)balioak kontaktu-zerrenda egoeraren arabera ordenatuko du."
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Ezin da pantailaren izen hutsa ezarri"
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Mezularitzako eta VoIP-ko kontuak"
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Jasotako fitxategiaren eta bidalitakoaren hash-ak ez datoz bat"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
-msgstr "Hautatutako fitxateagia ez da fitxategi arrunta"
+msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Hautatutako fitxategia hutsik dago"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Inguruko jendea"
@@ -497,39 +492,95 @@ msgstr "Errorea fitxategia transferitzen saiatzean"
msgid "The other participant is unable to transfer the file"
msgstr "Beste partaide batek ezin du fitxategia transferitu"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Arrazoi ezezaguna"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Prest"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Lanpetuta"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Aldendua"
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "Ezkutatua"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Ikusezina"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Deskonektatuta"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Ez da arrazoirik zehaztu"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "Egoera lineaz kanpo gisa ezarri da"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Sareko errorea"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Autentifikazioak huts egin du"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Enkriptazioaren errorea"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Izena erabilita"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Ez da ziurtagiririk eman"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Ziurtagiria ez da fidagarria"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Ziurtagiria iraungituta"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Ziurtagiria aktibatu gabe"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Ziurtagiriaren hatz-marka ez dator bat"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Ziurtagiria bere buruarekin sinatuta"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Ziurtagiriaren errorea"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Inguruko jendea"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Japoniako Yahoo!"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Facebook berriketa"
@@ -579,23 +630,68 @@ msgstr[1] "Duela %d hilabete"
msgid "in the future"
msgstr "etorkizunean"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Denak"
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Erabiltzaile-izena:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Saio-hasiera"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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 "Kontua:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Gaituta"
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+msgid "This account already exists on the server"
+msgstr "Kontu hau badago lehendik ere zerbitzarian"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "Sortu kontu berria zerbitzarian"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%s - %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2039
+#, c-format
+msgid "%s Account"
+msgstr "%s kontua"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Kontu berria"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> NirePantailaIzena</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Adibidea:</b> NirePantailaIzena"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -614,7 +710,7 @@ msgstr "Aurreratua"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Pasahitza:"
@@ -634,7 +730,7 @@ msgstr "Zein da zure AIM pantaila-izena?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -643,7 +739,7 @@ msgstr "_Ataka:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -652,8 +748,8 @@ msgstr "_Zerbitzaria:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> erabiltzaile-izena</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Adibidea:</b> erabiltzaile-izena"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -670,8 +766,8 @@ msgid "What is your GroupWise password?"
msgstr "Zein da zure GroupWise pasahitza?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Adibidea:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -687,15 +783,48 @@ msgstr "Zein da zure ICQ pasahitza?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+msgid "_Character set:"
msgstr "_Karaktere-jokoa:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Sare berria"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+msgid "Auto"
+msgstr "Automatikoa"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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:222
+msgid "Register"
+msgstr "Erregistratu"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Aukerak"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "Bat ere ez"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
msgstr "Karaktere-jokoa:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -727,12 +856,12 @@ msgid "Servers"
msgstr "Zerbitzariak"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> erabiltzailea@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Adibidea:</b> erabiltzailea@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> erabiltzailea@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Adibidea:</b> erabiltzailea@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -747,55 +876,76 @@ msgid "Reso_urce:"
msgstr "_Baliabidea:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Hau zure erabiltzaile-izena da, ez da Facebook-eko zure saio-hasiera.\n"
+"Zu bazara facebook.com/<b>sugegorribeltza</b>, sartu <b>sugegorribeltza</"
+"b>.\n"
+"Erabili <a href=\"http://www.facebook.com/username/\">orrialde hau</a> "
+"Facebook-eko erabiltzaile bat aukeratzeko aurrez ez badaukazu bat."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Erabili SS_L zaharra"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Zein da zure Facebook pasahitza?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Zein da zure Facebook erabiltzaile-izena?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Zein da zure Google-ko IDa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Zein da zure Google-ko pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Zein da zure Jabber IDa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Zein da zure Jabber pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Zein da zure Jabber ID gogokoa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Zein da zure Jabber pasahitz gogokoa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "_Enkritatzea behar da (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Adibidea:</b> erabiltzailea@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Adibidea:</b> erabiltzailea@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Zein da zure Windows Live pasahitza?"
+msgid "What is your Windows Live ID?"
+msgstr "Zein da zure Windows Live IDa?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Zein da zure Windows Live erabiltzaile-izena?"
+msgid "What is your Windows Live password?"
+msgstr "Zein da zure Windows Live pasahitza?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
+msgid "_E-mail address:"
msgstr "_Helb. elek.:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
@@ -819,39 +969,120 @@ msgid "_Published Name:"
msgstr "A_rgitaratutako izena:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr ""
-"<span size=\"small\"><b>Adibidea:</b> erabiltzailea@nire.sip.zerbitzaria</"
-"span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Adibidea:</b> erabiltzailea@nire.sip.zerbitzaria"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Autentifikazioaren erabiltzaile-izena:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Bilatu STUN"
+msgid "Discover Binding"
+msgstr "Aurkitu lotura"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Aurkitu STUN zerbitzaria automatikoki"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN zerbitzaria:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Proxy-aren ostalari-izena irteerako eskaerentzat."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN ataka:"
+msgid "Interval (seconds)"
+msgstr "Bitartea (seg.)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "Konexio iraunkorren aukerak"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr ""
+"Bilatu DNS SRV erregistroa zerbitzuaren domeinuan STUN zerbitzari baten "
+"ostalari izenarentzako."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Bideraketa ez zehatza"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Mekanismoa:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Hainbat aukera"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "NAT zeiharbidearen aukerak"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Proxy-aren ataka irteerako eskaerentzat."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Ataka:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Proxy-aren aukerak"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "STUN zerbitzaria:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Zerbitzaria:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"Erabiltzaile-izena SIPen autentifikatzeko., SIPeko URIaren \n"
+"erabiltzaile-izenaren desberdina bada."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Garraioa:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Eguneratu erregistroaren lotura bezeroaren kanpoko helbidea lokaleko "
+"loturaren desberdina dela atzematen bada."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Erabili bideraketa ez zehatzaren portaera eta bideraketaren goiburukoa RFC "
+"3261-ek gomendatuta bezala."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "Zein da zure SIP kontuaren pasahitza?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "Zein da zure SIP saio-hasierako IDa?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Erabiltzaile-izena:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Erabili japoniako _Yahoo"
+msgid "Use _Yahoo! Japan"
+msgstr "Erabili japoniako _Yahoo!"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
@@ -862,11 +1093,11 @@ msgid "What is your Yahoo! password?"
msgstr "Zein da zure Yahoo! pasahitza?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+msgid "Yahoo! I_D:"
msgstr "Yahoo! _IDa:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
msgstr "_Ez ikusi egin konferentzi eta berriketa-gelen gonbiteei"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -879,94 +1110,173 @@ msgid "Couldn't convert image"
msgstr "Ezin izan da irudia bihurtu"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
msgstr "Sistemak ez du onartzen onartutako irudi-formatuetariko bat bera ere"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
msgstr "Hautatu zure avatar irudia"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Irudirik ez"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Irudiak"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "Fitxategi denak"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Egin klik handitzeko"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Huts egin du berriketa honekin berriro konektatzean"
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Unartu gabeko komandoa"
+#: ../libempathy-gtk/empathy-chat.c:655
+msgid "Failed to join chat room"
+msgstr "Huts egin du berriketa-gelarekin elkartzean"
+
+#: ../libempathy-gtk/empathy-chat.c:673
+msgid "Failed to open private chat"
+msgstr "Huts egin du berriketa pribatua irekitzean"
+
+#: ../libempathy-gtk/empathy-chat.c:712
+msgid "Topic not supported on this conversation"
+msgstr "Gaia ez dago onartuta berriketa honetan"
+
+#: ../libempathy-gtk/empathy-chat.c:718
+msgid "You are not allowed to change the topic"
+msgstr "Ez duzu baimenik gaia aldatzeko"
+
+#: ../libempathy-gtk/empathy-chat.c:847
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: mezu guztiak garbitzen ditu uneko berriketan"
+
+#: ../libempathy-gtk/empathy-chat.c:850
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <gaia>: ezarri uneko berriketaren gaia"
+
+#: ../libempathy-gtk/empathy-chat.c:853
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <berrikera-gelaren IDa>: elkartu berriketa-gela berri batekin"
+
+#: ../libempathy-gtk/empathy-chat.c:856
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <berrikera-gelaren IDa>: elkartu berriketa-gela berri batekin"
+
+#: ../libempathy-gtk/empathy-chat.c:859
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:862
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
+
+#: ../libempathy-gtk/empathy-chat.c:865
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
+
+#: ../libempathy-gtk/empathy-chat.c:868
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <mezua>: bidali ekintzaren mezua uneko berriketara"
+
+#: ../libempathy-gtk/empathy-chat.c:871
+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 <mezua>: bidali <mezua> uneko berriketara. Normalean '/' "
+"karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
+"say /join berriket-gela berri batekin elkartzeko erabiltzen da\""
+
+#: ../libempathy-gtk/empathy-chat.c:876
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
+"definitzen bada, nola erabiltzen den erakusten du."
+
+#: ../libempathy-gtk/empathy-chat.c:886
+#, c-format
+msgid "Usage: %s"
+msgstr "Erabilera: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:915
+msgid "Unknown command"
+msgstr "Komando ezezaguna"
+
+#: ../libempathy-gtk/empathy-chat.c:1036
+msgid "Unknown command; see /help for the available commands"
+msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
+
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "lineaz kanpo"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "kontaktu baliogabea"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "baimena ukatuta"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "mezua luzeegia"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "inplementatu gabe"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "ezezaguna"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Errorea '%s' mezua bidaltzean: %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Gaia honela ezarria: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Ez da gairik definitu"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Iradokizunik ez)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Txertatu aurpegiera"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Bidali"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Iradokizun _ortografikoak"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "Huts egin du azken erregistroak eskuratzean"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s deskonektatu egin da"
@@ -974,12 +1284,12 @@ msgstr "%s deskonektatu egin da"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1184
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s(e)k %1$s kanporatu du"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s kanporatua izan da"
@@ -987,17 +1297,17 @@ msgstr "%s kanporatua izan da"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s(e)k %1$s debekatu du"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s debekatua izan da"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s(e)k gela utzi du"
@@ -1007,61 +1317,81 @@ msgstr "%s(e)k gela utzi du"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s(e)k gelara elkartzea nahi du"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:2044
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s orain honela ezagutzen da: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Deskonektatuta"
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "Wrong password; please try again:"
+msgstr "Okerreko pasahitza, saiatu berriro:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Retry"
+msgstr "Saiatu berriro"
+
+#: ../libempathy-gtk/empathy-chat.c:2707
+msgid "This room is protected by a password:"
+msgstr "Gela hau pasahitz batekin babestuta dago:"
+
+#: ../libempathy-gtk/empathy-chat.c:2708
+msgid "Join"
+msgstr "Elkartu"
+
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Konektatuta"
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Berriketa"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Gaia:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Kopiatu estekaren helbidea"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Ireki esteka"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A, %Y %B %d"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Editatu kontaktuaren informazioa"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Informazio pertsonala"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Kontaktu berria"
@@ -1073,221 +1403,219 @@ msgstr "Erabaki _beranduago"
msgid "Subscription Request"
msgstr "Harpidetza eskaera"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
msgid "Removing group"
msgstr "Taldea kentzen"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Kendu"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
msgid "Removing contact"
msgstr "Kontaktua kentzen"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
msgstr "Gehitu _kontaktua..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Berriketa"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
#| msgid "_Call"
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio-deia"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
-#| msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:289
+#| msgid "New Call"
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Bideo-deia"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_Ikusi aurreko berriketak"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Aurreko berriketak"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Bidali fitxategia"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Partekatu nire mahaigaina"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "_Informazioa"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+#| msgid "_Edit"
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editatu"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Gela honetara gonbidatzea"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+msgid "Inviting you to this room"
+msgstr "Gela honetara gonbidatzen zaituzte"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+msgid "_Invite to chat room"
msgstr "_Gonbidatu berriketa-gelara"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Hautatu kontaktua"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Gorde avatar-a"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Ezin da avatar-a gorde"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Hautatu"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Taldea"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Herrialdearen ISO kodea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Herrialdea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Estatua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Herria:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Posta-kodea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Kalea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Eraikuntza:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Solairua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Gela:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Testua:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Azalpena:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URIa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Zehaztasun maila:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Errorea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Errore bertikala (metroak):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Errore horizontala (metroak):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Abiadura:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Atzerapena:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Igoerako abiadura:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Azken eguneraketa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Longitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitudea:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Kokalekua</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Kokalekua"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Kokalekua</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%Y/%B/%e, %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+msgid "Save Avatar"
+msgstr "Gorde avatar-a"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+msgid "Unable to save avatar"
+msgstr "Ezin da avatar-a gorde"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Kokalekua</b> (data)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Kontua:"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Aliasa:"
@@ -1305,40 +1633,35 @@ msgid "Client:"
msgstr "Bezeroa:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "Kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Kontaktuaren xehetasunak"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Helb. elek.:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "Helbide elektronikoa:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
msgstr "Izen osoa:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Taldeak"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Identifikatzailea:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Informazioa eskatuta..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "Informazioa eskatuta&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "SE:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1346,40 +1669,40 @@ msgstr ""
"Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
"gehiago hauta ditzakezu, edo talderik ez."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Bertsioa:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Web gunea:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
+msgstr "Webgunea:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "_Gehitu taldea"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "zerbitzari berria"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Zerbitzaria"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Ataka"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Kontua"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Data"
@@ -1399,59 +1722,85 @@ msgstr "Bilatu"
msgid "_For:"
msgstr "_Honentzako:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Deitu"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "Kontaktuaren IDa:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "_Berriketa"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "Kontaktuaren IDa:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Berriketa berria"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "Bidali _bideoa"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Deitu"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "Dei berria"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
msgstr "Mezu pertsonalizatua..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
msgstr "Editatu mezu pertsonalizatuak..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Egin klik egoera hau gogokoa izatetik kentzeko"
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Egin klik egoera hau gogoko bihurtzeko"
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Ezarri egoera"
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Ezarri zure presentzia eta uneko egoera"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messages…"
msgstr "Mezu pertsonalizatuak..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Bilatu:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Maiuskula/minuskula"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Ez da esaldia aurkitu"
+
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "Jaso berehalako mezua"
@@ -1492,11 +1841,11 @@ msgstr "Irteerako ahots-deia"
msgid "Voice call ended"
msgstr "Ahots-deia amaituta"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Sartu mezu pertsonalizatua"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Editatu mezu pertsonalizatuak"
@@ -1524,15 +1873,15 @@ msgstr "Garbia"
msgid "Blue"
msgstr "Urdina"
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Ezin da URIa ireki"
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Hautatu fitxategia"
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "Hautatu helburua"
@@ -1703,78 +2052,35 @@ msgstr "Mendebaldekoa"
msgid "Vietnamese"
msgstr "Vietnamera"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid "The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Kontaktua applet-ean bistaratzeko. Hutsik utziz gero, ez da kontakturik "
-"bistaratuko."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr ""
-"Kontaktuaren avatarra. Hutsi utziz gero kontaktuak avatarrik ez duela "
-"adierazten da."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megafonoa"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Hautatutako kontaktuak ezin du fitxategirik jaso"
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "Hitz egin!"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Hautatutako kontaktua lineaz kanpo dago."
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "Honi _buruz"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Ez dago errorearen mezurik"
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Informazioa"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Hobespenak"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Berehalako mezularitza (Empathy)"
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Konfiguratu kontaktua."
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Hautatu kontaktua..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Presentzia"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Ezarri zure presentzia"
-
-#: ../src/empathy.c:658
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Ez konektatu abiatzean"
-#: ../src/empathy.c:662
-msgid "Don't show the contact list on startup"
-msgstr "Ez erakutsi kontaktu-zerrenda abiatzean"
-
-#: ../src/empathy.c:666
-msgid "Show the accounts dialog"
-msgstr "Erakutsi kontuen elkarrizketa-koadroa"
+#: ../src/empathy.c:600
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
-#: ../src/empathy.c:678
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Empathy BM bezeroa"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -1785,7 +2091,7 @@ msgstr ""
"Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
"edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -1797,7 +2103,7 @@ msgstr ""
"HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago nahi izanez gero, "
"ikus GNU Lizentzia Publiko Orokorra."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -1807,38 +2113,38 @@ msgstr ""
"jasoko zenuen; hala ez bada, idatzi hona: Free Software Foundation, Inc., 51 "
"Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Berehalako mezularitzako bezero bat GNOMErako"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Mikel Olasagasti <hey_neken@mundurat.net>\n"
"Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
msgstr "Errore bat gertatu da kontuak inportatzean."
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
msgstr "Errore bat gertatu da kontua sortzean."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
msgstr "Errore bat gertatu da."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Errorearen mezua: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Errorearen mezua: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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."
@@ -1846,47 +2152,46 @@ msgstr ""
"Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
"morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Errore bat gertatu da"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "%s kontu berria"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Zein motako berriketa-kontua duzu?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Sartu kontuaren xehetasunak"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Sartu kontu berriaren xehetasunak"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -1895,80 +2200,133 @@ msgid ""
msgstr ""
"Google Talk, AIM, Windows Live eta beste berriketako programak darabilten "
"inguruko jendearekin, lagunekin eta lankideekin berriketan egin dezakezu "
-"Empathy-rekin. Mikrofono edo web kamera batekin audio edo bideo-deiak egin "
+"Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak egin "
"ditzakezu."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Ez, kontu berri bat nahi dut"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Hautatu inportatzea nahi dituzun kontuak:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Bai"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Ez, hau izan da guztia"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1117
+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 ""
+"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
+"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
+"egiaztatu azpiko xehetasunak zuzenak direla. Xehetasun hauek beranduago "
+"erraz alda ditzakezu (edo eginbide hau desgaitu) 'Kontuak' elkarrizketa-"
+"koadroa erabiliz."
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Editatu->Kontuak"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Oraingoz ez dut eginbide hau gaitzerik nahi"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Ezin izango duzu berriketan egin zure sare lokaleko beste erabiltzaileekin, "
+"telepathy-salut ez baitago instalatuta. Eginbide hau gaitzea nahi izanez "
+"gero, instalatu telepathy-salut paketea eta sortu 'Inguruko jendea' kontu "
+"bat 'Kontuak' elkarrizketa-koadroan."
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut ez dago instalatuta"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Ongietorri Empathy-ra"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Inportatu dauzkazun kontuak"
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Sartu xehetasun pertsonalak"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
-msgid "There are unsaved modification regarding your %s account."
+msgid "There are unsaved modifications to your %s account."
msgstr "Gorde gabeko eraldaketak daude zure %s kontuan."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. 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:70
+msgid "Your new account has not been saved yet."
+msgstr "Zure kontu berria oraindik gorde gabe dago."
+
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connecting…"
+msgstr "Konektatzen..."
+
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
-msgid "%1$s on %2$s"
-msgstr "%s - %s"
+msgid "Disconnected — %s"
+msgstr "Deskonektatuta — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
-msgid "%s Account"
-msgstr "%s kontua"
+msgid "Offline — %s"
+msgstr "Lineaz kanpo — %s"
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "Kontu berria"
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Lineaz kanpo — Ez dago sareko konexiorik"
-#: ../src/empathy-accounts-dialog.c:501
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "Egoera ezezaguna"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Lineaz kanpo — Kontua desgaituta"
+
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1976,30 +2334,16 @@ msgstr ""
"Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.c:786
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"Zure %s kontua ezabatzera zoaz.\n"
-"Ziur zaude ezabatzea nahi duzula?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
-#: ../src/empathy-accounts-dialog.c:791
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Elkartutako berriketak eta gelak EZ dira ezabatuko aurrera jarraitzea "
-"erabakitzen baduzu.\n"
-"\n"
-"Beranduago kontua gehitzea erabakitzen baduzu ere, haiek oraindik "
-"erabilgarri egongo dira."
+#: ../src/empathy-accounts-dialog.c:1119
+msgid "This will not remove your account on the server."
+msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
-#: ../src/empathy-accounts-dialog.c:979
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2007,7 +2351,7 @@ msgstr ""
"Beste kontu bat hautatzera zoaz, eta ondorioz zuk egindako\n"
"aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.c:1474
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2015,23 +2359,20 @@ msgstr ""
"Leihoa ixtera zoaz, eta ondorioz zuk egindako\n"
"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Kontuak"
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Gehitu berria"
-
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "_Sortu"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Ez da protokolorik instalatu"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "Protokoloa:"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2039,110 +2380,232 @@ msgstr ""
"Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
"bakoitzaren motorra instalatu behar duzu."
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "_Gehitu..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Sortu kontu berria"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "_Berrerabili badagoen kontu bat"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "_Gehitu&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "kontua"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "_Inportatu&#x2026;"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Kontrastea"
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Distira"
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Bolumena"
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "Konektatzen..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Albo-barra"
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Dei-teklatua"
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Audio-sarrera"
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Bideo-sarrera"
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Deitu honekin: %s"
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Deitu"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Konektatuta — %d:%02dm"
+#: ../src/empathy-call-window.c:1755
+msgid "Technical Details"
+msgstr "Xehetasun teknikoak"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen "
+"audio-formatuak"
+
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen "
+"bideo-formatuak"
+
+#: ../src/empathy-call-window.c:1804
+#, 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 ""
+"Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
+"baimentzen ez dituen sare batean dago."
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Hutsegite bat egon da sarean"
+
+#: ../src/empathy-call-window.c:1814
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
+"ordenagailuan"
+
+#: ../src/empathy-call-window.c:1817
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
+"ordenagailuan"
+
+#: ../src/empathy-call-window.c:1827
+#, 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 ""
+"Ustekabeko zerbait gertatu da Telepathy osagaian. Mesedez, eskertuko "
+"genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
+"menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Hutsegite bat gertatu da deiaren motorrean"
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr "Ezin da audioaren korrontea ezarri"
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr "Ezin da bideoaren korrontea ezarri"
+
#: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "Deitu kontaktuari berriro"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Itzali kamera"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Piztu kamera"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Gaitu kamera eta bidali bideoa"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Gaitu kamera baina ez bidali bideoa"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Eseki"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Eseki uneko deia"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Aurrebista"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Berriro deitu"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Bidali audioa"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Bidali bideoa"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Txandakatu audioaren igorpena"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Bideoaren aurrebista"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "_Bideoa"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Deitu"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Itzali bideoa"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Piztu bideoa"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Bideoaren aurrebista"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Ikusi"
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d irakurri gabe)"
+msgstr[1] "%s (%d irakurri gabe)"
+
+#: ../src/empathy-chat-window.c:448
#, c-format
-msgid "Conversations (%d)"
-msgstr "Berriketak (%d)"
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (eta beste %u)"
+msgstr[1] "%s (eta beste %u)"
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d irakurri gabe besteengandik)"
+msgstr[1] "%s (%d irakurri gabe besteengandik)"
+
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d irakurri gabe guztietatik)"
+msgstr[1] "%s (%d irakurri gabe guztietatik)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Mezua idazten."
@@ -2151,70 +2614,78 @@ msgid "C_lear"
msgstr "_Garbitu"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_Kontaktua"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Berriketa"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Txertatu _aurpegiera"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Gonbidatu _partaidea..."
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Eraman fitxa e_zkerrera"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Eraman fitxa e_skuinera"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Kontaktua"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Edukia"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Berriketa"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "E_zabatu fitxa"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
-msgstr "_Gogoko gela"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "_Editatu"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
+msgstr "_Gogoko berriketa-gela"
+
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Laguntza"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Hurrengo fitxa"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "_Aurreko fitxa"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "_Erakutsi kontaktu-zerrenda"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Fitxak"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Izena"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Gela"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Konektatu automatikoki"
@@ -2222,75 +2693,76 @@ msgstr "Konektatu automatikoki"
msgid "Manage Favorite Rooms"
msgstr "Kudeatu gogoko gelak"
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:339
+msgid "Incoming video call"
+msgstr "Sarrerako bideo-deia"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Sarrerako deia"
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:343
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
+
+#: ../src/empathy-event-manager.c:344
#, c-format
-msgid "%s is calling you, do you want to answer?"
+msgid "%s is calling you. Do you want to answer?"
msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "Ez ona_rtu"
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Erantzun"
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "Incoming call from %s"
-msgstr "Sarrerako deia %s-(e)ndik"
+msgid "Incoming video call from %s"
+msgstr "Sarrerako bideoko deia %s-(e)ndik"
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s(e)k gonbidapena eskaintzen ari zaizu"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "Kanpoko aplikazioa abiaraziko da hori kudeatzeko."
-
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "Ez daukazu beharrezko aplikaziorik hori kudeatzeko."
+msgid "Incoming call from %s"
+msgstr "Sarrerako deia %s-(e)ndik"
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Gelarako gonbitea"
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "_Ukatu"
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Elkartu"
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "%s-(e)k harpidetzea eskatu du"
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2300,118 +2772,118 @@ msgstr ""
"Mezua: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s lineaz kanpo dago."
#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s linean dago."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
#| msgid "unknown"
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Ezezaguna"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s / %s (%s/s)"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s / %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "\"%s\" hemendik jasotzen: %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "\"%s\" honi bidaltzen: %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Errorea \"%s\" hemendik jasotzean: %s"
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Errorea fitxategi bat jasotzean"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Errorea \"%s\" honi bidaltzean: %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Errorea fitxategi bat bidaltzean"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" hemendik jasota: %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" honi bidalita: %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Fitxategi-transferentzia osatuta"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Beste partaideen erantzunaren zai"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "\"%s\"(r)en osotasuna egiaztatzen"
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "\"%s\"(r)en hash-a egiten"
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Fitxategia"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Falta:"
@@ -2438,15 +2910,15 @@ msgid "Import Accounts"
msgstr "Inportatu kontuak"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Inportatu"
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Protokoloa"
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Iturburua"
@@ -2455,67 +2927,23 @@ msgstr "Iturburua"
msgid "%s account"
msgstr "%s kontua"
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "_Editatu kontua"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Ez da errorerik zehaztu"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Sareko errorea"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Autentifikazioak huts egin du"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Enkriptazioaren errorea"
+#: ../src/empathy-main-window.c:433
+msgid "Reconnect"
+msgstr "Berriz konektatu"
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Izena erabilita"
+#: ../src/empathy-main-window.c:439
+msgid "Edit Account"
+msgstr "Editatu kontua"
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Ez da ziurtagiririk eman"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Itxi"
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Ziurtagiria ez da fidagarria"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Ziurtagiria iraungituta"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Ziurtagiria aktibatu gabe"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Ziurtagiriaren hatz-marka ez dator bat"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Ziurtagiria bere buruarekin sinatuta"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Ziurtagiriaren errorea"
-
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Errore ezezaguna"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Kontaktua"
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Erakutsi eta editatu kontuak"
@@ -2543,71 +2971,78 @@ msgstr "Kudeatu gogokoak"
msgid "N_ormal Size"
msgstr "Tamaina _normala"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Dei _berria..."
+
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Tamaina normala _avatarrekin"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "_Hobespenak"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "Erakutsi p_rotokoloak"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Ordenatu _izenarekiko"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Ordenatu _egoerarekiko"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Kontuak"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "Tamaina _trinkoa"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Araztu"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "_Fitxategi-transferentziak"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
msgstr "_Elkartu..."
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
msgstr "_Berriketa berria..."
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Konektatu gabeko kontaktuak"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Informazio pertsonala"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "_Aurreko berriketak"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Gela"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Berriketa-gela"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Kideak"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2619,16 +3054,16 @@ msgstr ""
"Pasahitza behar da: %s\n"
"Kideak: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Ez"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Ezin izan da gelen zerrenda abiarazi"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Ezin izan da gelen zerrenda gelditu"
@@ -2695,86 +3130,70 @@ msgid "Language"
msgstr "Hizkuntza"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Baimendu _GPS erabiltzea"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Baimendu telefono _mugikorra erabiltzea"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Baimendu _sarea erabiltzea"
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Itxura"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
msgstr "Automatikoki _konektatu abiatzean "
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Portaera"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
msgstr "Berriketa-_gaia:"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Gaitu jakinarazpenak kontaktu bat konektatzen denean"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Gaitu jakinarazpenak kontaktu bat deskonektatzen denean"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Gaitu jakinarazpenak _berriketak fokua ez duenean"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Gaitu hizkuntzen zuzentzailea:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Orokorra"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue ezarpenak"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "Kokalekua"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Kokalekuaren iturburuak:"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Jakinarazpenak"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Jo soinua gertaeretan"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Hobespenak"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Pribatutasuna"
-#: ../src/empathy-preferences.ui.h:21
+#: ../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 "
@@ -2784,40 +3203,52 @@ msgstr ""
"soilik argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
"zehaztasuna edukiko du."
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Erakutsi _aurpegierak irudi gisa"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Erakutsi kontaktu-_zerrenda geletan"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Soinuak"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Zuzentzailea"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Gaiak"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Telefono mugikorra"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
msgstr "_Gaitu jakinarazpen-burbuilak"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
msgstr "_Gaitu soinu-jakinarazpenak"
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Sarea (IP, Wi-Fi)"
+
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "_Ireki berriketa berriak beste leihoetan"
@@ -2830,92 +3261,118 @@ msgstr "_Erakutsi kokalekua nire kontaktuei"
msgid "_Reduce location accuracy"
msgstr "_Murriztu kokalekuaren zehaztasuna"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:176
+msgid "Respond"
+msgstr "Erantzun"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Egoera"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "I_rten"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Ezin da %s zerbitzuaren aplikazioa abiarazi: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"%s(e)k gonbidapena eskaintzen ari zaizu, baina ez daukazu "
-"beharrezkoaplikaziorik gonbidapena kudeatzeko."
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Kontaktuen maparen ikuspegia"
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "Errorea"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "Kritikoa"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "Abisua"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "Mezua"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "Informazioa"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "Arazketa"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Gorde"
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Arazketa-leihoa"
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pausatu"
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Maila: "
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1331
+msgid "Debug"
+msgstr "Arazketa"
+
+#: ../src/empathy-debug-window.c:1337
+msgid "Info"
+msgstr "Informazioa"
+
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Mezua"
+
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Abisua"
+
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Kritikoa"
+
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Errorea"
+
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Ordua"
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domeinua"
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Kategoria"
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Maila"
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Gonbidatu partaidea"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Aukeratu kontaktua berriketara gonbidatzeko:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
+"inportatzea) eta irten"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
+"Ez bistaratu inolako elkarrizketa-koadrorik 'salut' ez den kontuak egonez "
+"gero"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<kontuaren-IDa>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Empathy kontuak"
+
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr " Kontuak"
+
diff --git a/po/fr.po b/po/fr.po
index 70057a3b4..43a2870fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,8 +27,8 @@ msgstr ""
"Project-Id-Version: empathy HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-01-13 10:59+0000\n"
-"PO-Revision-Date: 2010-01-13 21:40+0100\n"
+"POT-Creation-Date: 2010-03-04 18:12+0000\n"
+"PO-Revision-Date: 2010-03-06 16:17+0100\n"
"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -228,112 +228,108 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Bulles de notification lorsqu'un contact se déconnecte"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Le compte Salut est créé"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Afficher les avatars"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Afficher la liste des contacts dans les salons"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Afficher une astuce sur la fermeture de la fenêtre principale"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Afficher les contacts déconnectés"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "Afficher les protocoles"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Langues de la correction orthographique"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "Le dossier par défaut pour enregistrer les transferts de fichiers."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "Dernier répertoire où un avatar a été choisi."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Le thème utilisé pour l'affichage dans les fenêtres de discussion."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Utiliser des frimousses graphiques"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Utiliser des sons de notification"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Utiliser des thèmes pour les salons de discussion"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
"Indique si Empathy peut publier l'emplacement de l'utilisateur à ses "
"contacts."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Indique si Empathy peut utiliser le GPS pour découvrir l'emplacement."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Indique si Empathy peut utiliser le réseau cellulaire pour découvrir "
"l'emplacement."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr ""
"Indique si Empathy peut utiliser le réseau pour découvrir l'emplacement."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Indique si Empathy a demandé l'importation de comptes provenant d'autres "
"logiciels."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Indique si Empathy doit se connecter automatiquement à vos comptes au "
"démarrage."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Indique si Empathy doit réduire la précision de l'emplacement pour des "
"raisons de confidentialité."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Indique si Empathy doit utiliser l'avatar des contacts comme icône de "
"fenêtre de discussion."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Indique si les outils de développement WebKit, tels que Web Inspector, "
"doivent être activés."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -341,77 +337,73 @@ msgstr ""
"Indique si les gestionnaires de connectivité doivent être utilisés pour se "
"déconnecter ou se reconnecter automatiquement."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "Indique si le compte Salut a été créé au premier lancement d'Empathy."
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Indique s'il faut vérifier l'orthographe des mots saisis selon les langues "
"choisies."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indique s'il faut changer les frimousses en images graphiques dans les "
"conversations."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Indique s'il faut jouer un son pour avertir lorsque des contacts se "
"connectent au réseau."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Indique s'il faut jouer un son pour avertir lorsque des contacts se "
"déconnectent du réseau."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "Indique s'il faut jouer un son pour signaler des événements."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Indique s'il faut jouer un son pour avertir de l'arrivée de messages."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
"Indique s'il faut jouer un son pour signaler de nouvelles conversations."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Indique s'il faut jouer un son pour signaler qu'un message est envoyé."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "Indique s'il faut jouer un son lors de la connexion à un réseau."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr "Indique s'il faut jouer un son lors de la déconnexion d'un réseau."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr ""
"Indique s'il faut émettre des sons en cas d'absence ou d'indisponibilité."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
"Indique s'il faut afficher des notifications lorsqu'un contact se déconnecte."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
"Indique s'il faut afficher des notifications lorsqu'un contact se connecte."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -419,48 +411,48 @@ msgstr ""
"Indique s'il faut afficher une bulle de notification lorsqu'un message est "
"reçu, même si la discussion est ouverte, mais sans être au premier plan."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Indique s'il faut afficher une bulle de notification lorsqu'un message est "
"reçu."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Indique s'il faut afficher les avatars des contacts dans la liste des "
"contacts et les fenêtres de discussion."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
"Indique s'il faut afficher les contacts qui sont déconnectés dans la liste "
"des contacts."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr ""
"Indique s'il faut afficher des notifications en cas d'absence ou "
"d'indisponibilité."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
"Indique s'il faut afficher les protocoles des contacts dans la liste des "
"contacts."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr ""
"Indique s'il faut afficher la liste des contacts dans les salons de "
"discussion."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "Indique s'il faut afficher la liste des contacts en mode compact."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -468,40 +460,50 @@ msgstr ""
"Indique s'il faut afficher la boîte de dialogue au sujet de la fermeture de "
"la fenêtre principale avec le bouton « x » dans la barre de titre."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "Indique s'il faut utiliser les thèmes pour les salons de discussion."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 ""
"Quel critère utiliser pour le tri de la liste des contacts. Le comportement "
-"par défaut est de trier selon le nom du contact (valeur : « name »). Une "
+"par défaut est de trier selon le nom du contact (valeur : « name »). Une "
"valeur « state » triera la liste des contacts selon leur état."
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestion des comptes de messagerie et VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Comptes de messagerie et VoIP"
+
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr ""
"La somme de contrôle du fichier reçu ne correspond pas à celle du fichier "
"envoyé"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr ""
"Le transfert de fichiers n'est pas pris en charge par le contact distant"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "Le fichier sélectionné n'est pas un fichier conventionnel"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Le fichier sélectionné est vide"
-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Personnes à proximité"
@@ -550,8 +552,8 @@ msgid "Away"
msgstr "Absent"
#: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
-msgstr "Masqué"
+msgid "Invisible"
+msgstr "Invisible"
#: ../libempathy/empathy-utils.c:247
msgid "Offline"
@@ -562,8 +564,8 @@ msgid "No reason specified"
msgstr "Aucune raison n'a été indiquée"
#: ../libempathy/empathy-utils.c:288
-msgid "User requested disconnect"
-msgstr "L'utilisateur recherché s'est déconnecté"
+msgid "Status is set to offline"
+msgstr "L'état est « déconnecté »"
#: ../libempathy/empathy-utils.c:290
msgid "Network error"
@@ -613,15 +615,15 @@ msgstr "Certificat auto-signé"
msgid "Certificate error"
msgstr "Erreur de certificat"
-#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Personnes à proximité"
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Yahoo! Japon"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Discussion Facebook"
@@ -671,21 +673,25 @@ msgstr[1] "il y a %d mois"
msgid "in the future"
msgstr "dans le futur"
-#: ../libempathy-gtk/empathy-account-chooser.c:450
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Toutes"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s :"
-#: ../libempathy-gtk/empathy-account-widget.c:1320
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "Se _connecter"
-#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -693,15 +699,15 @@ msgstr "Se _connecter"
msgid "Account:"
msgstr "Compte :"
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Activé"
-#: ../libempathy-gtk/empathy-account-widget.c:1460
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Ce compte existe déjà sur le serveur"
-#: ../libempathy-gtk/empathy-account-widget.c:1463
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Créer un nouveau compte sur le serveur"
@@ -710,19 +716,19 @@ msgstr "Créer un nouveau compte sur le serveur"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1846
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sur %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:1864
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "Compte %s"
-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Nouveau compte"
@@ -767,7 +773,7 @@ msgstr "Quel est votre nom à l'écran AIM ?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -776,7 +782,7 @@ msgstr "_Port :"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -913,38 +919,58 @@ msgid "Reso_urce:"
msgstr "Resso_urce :"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"C'est votre nom d'utilisateur, pas votre nom de connexion Facebook.\n"
+"Si vous êtes facebook.com/<b>blaireau</b>, saisissez <b>blaireau</b>.\n"
+"Utilisez <a href=\"http://www.facebook.com/username/\">cette page</a> pour "
+"choisir un nom d'utilisateur Facebook si vous n'en avez pas un."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Utiliser l'ancien SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Quel est votre mot de passe Facebook ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Quel est votre nom d'utilisateur Facebook ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Quel est votre identifiant Google ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Quel est votre mot de passe Google ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Quel est votre identifiant Jabber ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Quel est votre mot de passe Jabber ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Que souhaitez-vous comme identifiant Jabber ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Que souhaitez-vous comme mot de passe Jabber ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "Chiffr_ement requis (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Ignorer les erreurs de certificat SSL"
@@ -1002,7 +1028,7 @@ msgstr "Découvrir automatiquement le serveur STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "Hostname of the proxy for outbound requests."
-msgstr "Nom du serveur mandataire pour les requêtes sortantes"
+msgstr "Nom du serveur mandataire pour les requêtes sortantes."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
@@ -1039,7 +1065,7 @@ msgstr "Options de parcours NAT"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Port of the proxy for outbound requests."
-msgstr "Port du serveur mandataire pour les requêtes sortantes"
+msgstr "Port du serveur mandataire pour les requêtes sortantes."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Port:"
@@ -1152,61 +1178,61 @@ msgstr "Tous les fichiers"
msgid "Click to enlarge"
msgstr "Cliquer pour agrandir"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Échec de reconnexion à cette discussion"
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Impossible de rejoindre le salon de discussion"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Impossible d'ouvrir une discussion privée"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr ""
"L'utilisation d'un sujet n'est pas pris en charge par cette conversation"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Vous n'êtes pas autorisé à modifier le sujet"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear : efface tous les messages dans cette conversation"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <sujet> : définit le sujet de la conversation actuelle"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id du salon> : rejoint un nouveau salon de discussion"
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id du salon> : rejoint un nouveau salon de discussion"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id du contact> [<message>] : ouvre une discussion privée"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id du contact> <message> : ouvre une discussion privée"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <pseudonyme> : modifie votre pseudonyme sur le serveur actuel"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
"/me <message> : envoie un message d'action dans la conversation actuelle"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1216,7 +1242,7 @@ msgstr ""
"pour envoyer un message commençant par un « / ». Par exemple : « /say /join "
"est utilisé pour rejoindre un nouveau salon de discussion »"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1224,77 +1250,81 @@ msgstr ""
"/help [<commande>] : affiche toutes les commandes prises en charge. Si "
"<commande> est définie, affiche son utilisation."
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Utilisation : %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Commande inconnue"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr ""
"Commande inconnue ; utilisez /help pour obtenir les commandes disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "déconnecté"
-#: ../libempathy-gtk/empathy-chat.c:1146
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "contact non valide"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "permission refusée"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "message trop long"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "non implémenté"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "inconnu"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Erreur à l'envoi du message « %s » : %s"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Sujet défini : %s"
-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Pas de sujet défini"
-#: ../libempathy-gtk/empathy-chat.c:1595
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(aucune suggestion)"
-#: ../libempathy-gtk/empathy-chat.c:1649
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Insérer une frimousse"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1667
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Envoyer"
-#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Suggestions orthographiques"
-#: ../libempathy-gtk/empathy-chat.c:1816
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "Impossible de retrouver les journaux récents"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s s'est déconnecté"
@@ -1302,12 +1332,12 @@ msgstr "%s s'est déconnecté"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s a été expulsé par %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s a été expulsé"
@@ -1315,17 +1345,17 @@ msgstr "%s a été expulsé"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s a été banni par %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1837
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s a été banni"
-#: ../libempathy-gtk/empathy-chat.c:1841
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s a quitté la salle"
@@ -1335,47 +1365,47 @@ msgstr "%s a quitté la salle"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1875
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s a rejoint le salon"
-#: ../libempathy-gtk/empathy-chat.c:1900
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s est maintenant connu sous le nom de %s"
-#: ../libempathy-gtk/empathy-chat.c:2035 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Déconnecté"
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Mot de passe incorrect ; essayez de nouveau :"
-#: ../libempathy-gtk/empathy-chat.c:2571
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Réessayer"
-#: ../libempathy-gtk/empathy-chat.c:2576
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Ce salon est protégé par un mot de passe :"
-#: ../libempathy-gtk/empathy-chat.c:2577
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Rejoindre"
-#: ../libempathy-gtk/empathy-chat.c:2717
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Connecté"
-#: ../libempathy-gtk/empathy-chat.c:2770
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversation"
@@ -1384,32 +1414,32 @@ msgid "Topic:"
msgstr "Sujet :"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Copier l'adresse du lien"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Ouvrir le lien"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Modifier les informations du contact"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Informations personnelles"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Nouveau contact"
@@ -1421,78 +1451,79 @@ msgstr "Décider plus _tard"
msgid "Subscription Request"
msgstr "Requête d'abonnement"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1512
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1514
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
msgid "Removing group"
msgstr "Suppression du groupe"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1561
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Supprimer"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1591
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Voulez-vous vraiment supprimer le contact « %s » ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1593
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
msgid "Removing contact"
msgstr "Suppression du contact"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "A_jouter un contact…"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "Dis_cussion"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Appel _audio"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "Appel _vidéo"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversations _précédentes"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Envoyer un fichier"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Partager mon bureau"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Infor_mations"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
-msgstr "É_dition"
+msgstr "Mo_difier"
-#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../libempathy-gtk/empathy-contact-menu.c:513
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Vous invite à ce salon"
-#: ../libempathy-gtk/empathy-contact-menu.c:527
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "_Inviter à un salon de discussion"
@@ -1500,130 +1531,130 @@ msgstr "_Inviter à un salon de discussion"
msgid "Select a contact"
msgstr "Sélectionner un contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Sélectionner"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
-#: ../src/empathy-main-window.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Groupe"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Code ISO du pays :"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Pays :"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "État :"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Ville :"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Région :"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Code postal :"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Rue :"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Bâtiment :"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Étage :"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Salon :"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Texte :"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Description :"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI :"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Niveau de précision :"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Erreur :"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Erreur verticale (mètres) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Erreur horizontale (mètres) :"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Vitesse :"
# http://fr.wikipedia.org/wiki/Rel%C3%A8vement
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Relèvement :"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Vitesse ascensionnelle :"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Dernière mise à jour le :"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Longitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitude :"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Emplacement"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Emplacement</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y à %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Enregistrer l'avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "Impossible d'enregistrer l'avatar"
@@ -1712,12 +1743,12 @@ msgstr "Port"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Compte"
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Date"
@@ -1775,34 +1806,34 @@ msgstr "Nouvel appel"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "Message personnalisé…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "Édition des messages personnalisés…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Cliquez pour supprimer cet état des favoris"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Cliquez pour ajouter cet état aux favoris"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Changer l'état"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Définit votre état de présence actuel"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Messages personnalisés…"
@@ -1811,6 +1842,10 @@ msgid "Find:"
msgstr "Rechercher :"
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Respecter la casse"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Phrase not found"
msgstr "Phrase introuvable"
@@ -1886,15 +1921,15 @@ msgstr "Propre"
msgid "Blue"
msgstr "Bleu"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Impossible d'ouvrir l'URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Sélectionner un fichier"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "Sélectionner une destination"
@@ -2081,25 +2116,21 @@ msgstr "Pas de message d'erreur"
msgid "Instant Message (Empathy)"
msgstr "Message instantané (Empathy)"
-#: ../src/empathy.c:893
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Ne pas se connecter au démarrage"
-#: ../src/empathy.c:897
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
"Ne pas afficher la liste des contacts ou d'autres boîtes de dialogue au "
"démarrage"
-#: ../src/empathy.c:901
-msgid "Show the accounts dialog"
-msgstr "Afficher la boîte de dialogue des comptes"
-
-#: ../src/empathy.c:913
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Client de messagerie instantanée Empathy"
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -2111,7 +2142,7 @@ msgstr ""
"publiée par la Free Software Foundation ; version 2 de la licence ou (à "
"votre discrétion) toute version ultérieure."
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -2123,7 +2154,7 @@ msgstr ""
"D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence "
"Publique Générale GNU."
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -2133,11 +2164,11 @@ msgstr ""
"Empathy ; si ce n'est pas le cas, écrivez à la Free Software Foundation, "
"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Un client de messagerie instantanée pour GNOME"
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Frédéric Brin <duckx@mezimail.com>\n"
@@ -2156,28 +2187,28 @@ msgstr ""
"Christophe Benz <christophe.benz@gmail.com>\n"
"Emmanuel Sunyer <emmanuel.sunyer@dbmail.com>"
-#: ../src/empathy-account-assistant.c:118
+#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgstr "Une erreur est survenue au cours de l'importation des comptes."
-#: ../src/empathy-account-assistant.c:121
+#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
msgstr "Une erreur est survenue au cours de l'analyse des détails du compte."
-#: ../src/empathy-account-assistant.c:124
+#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
msgstr "Une erreur est survenue au cours de la création du compte."
-#: ../src/empathy-account-assistant.c:126
+#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
msgstr "Une erreur est survenue."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Le message d'erreur est : <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Le message d'erreur est : %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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."
@@ -2186,46 +2217,46 @@ msgstr ""
"détails de votre compte, soit quitter l'assistant et ajouter un compte plus "
"tard à partir du menu Édition."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Une erreur est survenue"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:533
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Nouveau compte %s"
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Quel type de compte de discussion possédez-vous ?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Désirez-vous paramétrer d'autres comptes de discussion ?"
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Saisissez les détails de votre compte"
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Quel type de compte de discussion voulez-vous créer ?"
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Désirez-vous créer d'autres comptes de discussion ?"
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Saisissez les détails de votre nouveau compte"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2237,92 +2268,134 @@ msgstr ""
"et bien d'autres programmes de discussion. À l'aide d'un microphone ou d'une "
"webcam, vous pouvez également leur parler et les voir en vidéo."
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Possédez-vous un compte que vous avez utilisé avec un autre programme de "
"discussion ?"
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Oui, importer les détails de mon compte à partir de "
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Oui, je veux saisir les détails de mon compte maintenant"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Non, je veux un nouveau compte"
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr ""
"Non, je veux seulement voir les personnes connectées à proximité pour "
"l'instant"
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Sélectionnez les comptes à importer :"
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Oui"
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Non, c'est tout pour l'instant"
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1117
+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 peut automatiquement trouver et discuter avec les personnes qui sont "
+"connectées sur le même réseau que vous. Si vous voulez utiliser cette "
+"fonctionnalité, vérifiez que les détails ci-dessous sont corrects. Vous "
+"pourrez facilement modifier ces détails plus tard ou désactiver cette "
+"fonctionnalité en utilisant la boîte de dialogue « Comptes »"
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Édition -> Comptes"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Je ne veux pas activer cette fonctionnalité pour l'instant"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Il n'est pas possible de discuter avec les personnes connectées au réseau "
+"local car telepathy-salut n'est pas installé. Si vous voulez activer cette "
+"fonctionnalité, installez le paquet telepathy-salut et créez un compte "
+"« Personnes à proximité » à l'aide de la boîte de dialogue Comptes"
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut n'est pas installé"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Bienvenue dans Empathy"
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Importer vos comptes existants"
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Saisissez vos détails personnels"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "Votre compte %s comporte des modifications non enregistrées."
#. 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:69
+#: ../src/empathy-accounts-dialog.c:70
msgid "Your new account has not been saved yet."
msgstr "Votre nouveau compte n'est pas encore enregistré."
-#: ../src/empathy-accounts-dialog.c:244 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Connexion en cours…"
-#: ../src/empathy-accounts-dialog.c:271
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Déconnecté — %s"
-#: ../src/empathy-accounts-dialog.c:276
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Hors ligne — %s"
-#: ../src/empathy-accounts-dialog.c:289
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Hors ligne — Pas de connexion réseau"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Statut inconnu"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Hors ligne — Compte désactivé"
-#: ../src/empathy-accounts-dialog.c:672
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2330,16 +2403,16 @@ msgstr ""
"Vous êtes sur le point de créer un nouveau compte, ce qui\n"
"annulera vos modifications. Voulez-vous vraiment continuer ?"
-#: ../src/empathy-accounts-dialog.c:963
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Voulez-vous supprimer %s de votre ordinateur ?"
-#: ../src/empathy-accounts-dialog.c:967
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "Cela ne supprimera pas votre compte sur le serveur."
-#: ../src/empathy-accounts-dialog.c:1149
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2347,7 +2420,7 @@ msgstr ""
"Vous êtes sur le point de sélectionner un autre compte, ce qui\n"
"annulera vos modifications. Voulez-vous vraiment continuer ?"
-#: ../src/empathy-accounts-dialog.c:1669
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2356,7 +2429,7 @@ msgstr ""
"vos modifications. Voulez-vous vraiment continuer ?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1763
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Comptes"
@@ -2647,6 +2720,10 @@ msgstr "_Conversation"
msgid "_Detach Tab"
msgstr "_Détacher l'onglet"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "É_dition"
+
#: ../src/empathy-chat-window.ui.h:12
msgid "_Favorite Chat Room"
msgstr "Salon de discussion _favori"
@@ -2687,89 +2764,76 @@ msgstr "Connexion automatique"
msgid "Manage Favorite Rooms"
msgstr "Gérer les salons favoris"
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
msgid "Incoming video call"
msgstr "Appel vidéo entrant"
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Appel entrant"
-#: ../src/empathy-event-manager.c:349
+#: ../src/empathy-event-manager.c:343
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vous appelle en vidéo. Souhaitez-vous répondre ?"
-#: ../src/empathy-event-manager.c:350
+#: ../src/empathy-event-manager.c:344
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vous appelle. Souhaitez-vous répondre ?"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "Re_fuser"
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Répondre"
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
#, c-format
msgid "Incoming video call from %s"
msgstr "Appel vidéo entrant de %s"
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
#, c-format
msgid "Incoming call from %s"
msgstr "Appel entrant de %s"
-#: ../src/empathy-event-manager.c:541
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s vous invite"
-
-#: ../src/empathy-event-manager.c:547
-msgid "An external application will be started to handle it."
-msgstr "Une application externe sera lancée pour la gérer."
-
-#: ../src/empathy-event-manager.c:552
-msgid "You don't have the needed external application to handle it."
-msgstr "Vous ne disposez pas de l'application externe nécessaire."
-
-#: ../src/empathy-event-manager.c:680
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Invitation dans un salon"
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vous invite à rejoindre %s"
-#: ../src/empathy-event-manager.c:691
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "_Refuser"
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Joindre"
-#: ../src/empathy-event-manager.c:735
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vous a invité à rejoindre %s"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transfert de fichiers entrant de %s"
-#: ../src/empathy-event-manager.c:941
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "Demande d'abonnement de %s"
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2779,13 +2843,13 @@ msgstr ""
"Message : %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s s'est déconnecté."
#. someone is logging in
-#: ../src/empathy-event-manager.c:1001
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s s'est connecté."
@@ -2931,23 +2995,23 @@ msgstr "Source"
msgid "%s account"
msgstr "Compte %s"
-#: ../src/empathy-main-window.c:435
+#: ../src/empathy-main-window.c:433
msgid "Reconnect"
msgstr "Reconnecter"
-#: ../src/empathy-main-window.c:442
+#: ../src/empathy-main-window.c:439
msgid "Edit Account"
msgstr "Modifier le compte"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:445
msgid "Close"
msgstr "Fermer"
-#: ../src/empathy-main-window.c:1036
+#: ../src/empathy-main-window.c:1028
msgid "Contact"
msgstr "Contact"
-#: ../src/empathy-main-window.c:1374
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Afficher et modifier les comptes"
@@ -3169,7 +3233,7 @@ msgstr "Afficher des notifications quand un contact se déconnecte"
#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr ""
-"Afficher des notifications quand la discussion n'est pas au premier plan"
+"Afficher des notifications quand la _discussion n'est pas au premier plan"
#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
@@ -3269,7 +3333,7 @@ msgstr "_Publier mon emplacement pour mes contacts"
msgid "_Reduce location accuracy"
msgstr "Réduire la précision de l'_emplacement"
-#: ../src/empathy-status-icon.c:175
+#: ../src/empathy-status-icon.c:176
msgid "Respond"
msgstr "Répondre"
@@ -3281,82 +3345,68 @@ msgstr "État"
msgid "_Quit"
msgstr "_Quitter"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Impossible de démarrer l'application pour le service %s : %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the application "
-"necessary to handle it"
-msgstr ""
-"Vous avez reçu une invitation pour le service %s, mais vous ne disposez pas "
-"de l'application nécessaire pour le gérer"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Carte des contacts"
# Titre de fenêtre
-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Enregistrer"
-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Fenêtre de débogage"
-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Niveau "
-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Débogage"
-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "Informations"
-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "Message"
-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "Avertissement"
-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "Critique"
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "Erreur"
-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Heure"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domaine"
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Catégorie"
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Niveau"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3372,3 +3422,34 @@ msgstr "Inviter un participant"
#: ../src/empathy-invite-participant-dialog.c:35
msgid "Choose a contact to invite into the conversation:"
msgstr "Choisissez un contact à inviter dans la conversation :"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"N'affiche aucune boîte de dialogue ; effectue la tâche (par ex. importation) et "
+"quitte"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
+"N'affiche aucune boîte de dialogue s'il existe au moins un compte d'un type "
+"autre que « salut »"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Sélectionne au départ le compte indiqué (par ex. gabble/jabber/"
+"foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<id_du_compte>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- comptes Empathy"
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=611998
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr " Comptes"
diff --git a/po/gl.po b/po/gl.po
index 67f7e9c70..5eb13b877 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,20 +1,22 @@
-# translation of empathy-master-po-gl-57278.po to Galician
+# translation of empathy to Galego
# This file is distributed under the same license as the EMPATHY package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
#
# Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
-# Fran Diéguez <fran.dieguez@glug.es>,2009.
# Antón Méixome <meixome@mancomun.org>, 2009.
# Fran Dieguez <fran.dieguez@glug.es>, 2009.
-# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
+# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
+# Antón Méixome <meixome@certima.net>, 2010.
+# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: empathy-master-po-gl-57278\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-20 22:23+0100\n"
-"PO-Revision-Date: 2010-02-18 00:29+0100\n"
-"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Gallician <proxecto@trasno.net>\n"
+"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-03-12 13:32+0000\n"
+"PO-Revision-Date: 2010-03-06 22:40+0100\n"
+"Last-Translator: Francisco Diéguez <frandieguez@ubuntu.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +30,7 @@ msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
-msgstr "Cliente de mensaxaría Empathy"
+msgstr "Cliente de mensaxería Empathy"
#: ../data/empathy.desktop.in.in.h:3
msgid "IM Client"
@@ -179,7 +181,7 @@ msgstr "Carácter de completado de alcume"
# rever
#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
-msgstr "Abrir as conversas novas en xanelas separadas"
+msgstr "Abrir as novas conversas en xanelas separadas"
#: ../data/empathy.schemas.in.h:29
msgid "Path of the Adium theme to use"
@@ -243,110 +245,105 @@ msgstr "Facer emerxer unha notificación cando un contacto sae"
# rever
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "A conta Salut foi creada"
-
-# rever
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Mostrar os avatares"
# rever
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Mostrar a lista de contactos nas salas"
# rever
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Mostrar unha indicación sobre pechar a xanela principal"
# rever
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Mostrar os contactos desconectados"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "Mostrar os protocolos"
# rever
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Idiomas para a corrección ortográfica"
# rever
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "O cartafol predefinido en que gardar as transferencias de ficheiros."
# rever
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
# rever
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
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/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Usar emoticonas gráficas"
# rever
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Usar sons de notificación"
# rever
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Usar un tema para as salas de conversa"
# rever
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
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/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
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/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
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/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
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/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr ""
"Indica se o Empathy preguntou sobre a importación de contas doutros "
"programas ou non."
# rever
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
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/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
@@ -354,14 +351,14 @@ msgstr ""
"motivos de privacidade."
# rever
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
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/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
@@ -369,7 +366,7 @@ msgstr ""
"deberían ser activadas."
# rever
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -378,14 +375,7 @@ msgstr ""
"desconectarse automaticamente ou non."
# rever
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr ""
-"Indica se a conta Salut debería ser creada na primeira execución do Empathy "
-"ou non."
-
-# rever
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
@@ -393,80 +383,80 @@ msgstr ""
"as quere verificar."
# rever
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
# rever
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
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/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
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/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "Indica se reproducir ou non un son para notificar os eventos."
# rever
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
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/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
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/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
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/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
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/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
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/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
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/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
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/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
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/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -475,14 +465,14 @@ msgstr ""
"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
# rever
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
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/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
@@ -490,38 +480,38 @@ msgstr ""
"das xanelas de conversa."
# rever
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
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/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
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/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
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/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "Indica se mostrar ou non a lista de contactos nas salas de chat."
# rever
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
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/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -530,12 +520,12 @@ msgstr ""
"principal co botón 'x' da barra de título."
# rever
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "Indica se usar ou non o tema para as salas de conversa."
# rever
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -547,32 +537,34 @@ msgstr ""
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
+msgstr "Xestionar as contas de mensaxería e VoIP"
+#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
+msgstr "Contas de mensaxería e VoIP"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "O ficheiro seleccionado non é un ficheiro regular"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "O ficheiro seleccionado está baleiro"
# rever
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Persoas próximas"
@@ -763,23 +755,23 @@ msgstr "no futuro"
#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
-msgstr "Todo"
+msgstr "Todas"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Nome de _usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "Iniciar sesi_ón"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -787,15 +779,15 @@ msgstr "Iniciar sesi_ón"
msgid "Account:"
msgstr "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Activado"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
@@ -805,20 +797,20 @@ msgstr "Crear unha nova conta no servidor"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Conta nova"
@@ -1284,60 +1276,60 @@ msgstr "Todos os ficheiros"
msgid "Click to enlarge"
msgstr "Prema para ampliar"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Produciuse un fallo ao reconectar á conversa"
# rever
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Produciuse un fallo ao unirse á sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Produciuse un fallo ao abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Ese asunto non se admite nesta conversación"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Non se lle permite cambiar o asunto"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear, limpa todas as mensaxes da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>, estabelece o asunto da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
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:824
+#: ../libempathy-gtk/empathy-chat.c:856
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:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact id> [<message>], abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact id> <message>, abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
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:836
+#: ../libempathy-gtk/empathy-chat.c:868
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:839
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1347,7 +1339,7 @@ msgstr ""
"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
"unirse a unha nova sala de conversa\""
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1355,81 +1347,85 @@ msgstr ""
"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
"definida, mostra o seu uso."
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Orde descoñecida"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "contacto incorrecto"
-#: ../libempathy-gtk/empathy-chat.c:1148
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "permiso denegado"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "a mensaxe é demasiado longa"
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "non implementado"
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "descoñecido"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Cambiouse o asunto a: %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Non se definiu un asunto"
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Sen suxestións)"
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Inserir unha emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1664
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Enviar"
-#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Suxestións de _ortografía"
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "Produciuse un fallo ao obter os rexistros recentes"
+
# rever
-#: ../libempathy-gtk/empathy-chat.c:1813
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
@@ -1437,12 +1433,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:1820
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulsado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulsado"
@@ -1450,17 +1446,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:1831
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi vetado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s foi excluído"
-#: ../libempathy-gtk/empathy-chat.c:1838
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s deixou a sala"
@@ -1470,48 +1466,48 @@ 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:1847
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s uniuse á sala"
-#: ../libempathy-gtk/empathy-chat.c:1897
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
-#: ../libempathy-gtk/empathy-chat.c:2567
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:2573
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:2713
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:2766
-#: ../libempathy-gtk/empathy-log-window.c:548
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversa"
@@ -1520,20 +1516,20 @@ msgid "Topic:"
msgstr "Asunto:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Abrir a ligazón"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
@@ -1560,85 +1556,85 @@ msgid "Subscription Request"
msgstr "Solicitude de subscrición"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Está seguro de que quere eliminar o grupo '%s'?"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Eliminando o grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Eliminar"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Está seguro de quere eliminar o contacto '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Eliminando o contacto"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "Eng_adir un contacto..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Conversa"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audiochamada"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videochamada"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversas _previas"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Enviar o ficheiro"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Compartir o meu escritorio"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:459
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:513
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "Conv_idar á sala de conversa"
@@ -1647,132 +1643,132 @@ msgstr "Conv_idar á sala de conversa"
msgid "Select a contact"
msgstr "Seleccione un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Seleccionar"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Grupo"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Rexión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Rúa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Edificio:"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "_Andar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Descrición:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Erro vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Erro horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Orientación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Velocidade de incremento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Última actualización:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Lonxitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Localización"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Localización</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y de %R UTC"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Gardar o avatar"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "Non foi posíbel gardar o avatar"
@@ -1865,12 +1861,12 @@ msgstr "Porto"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:541
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Conta"
-#: ../libempathy-gtk/empathy-log-window.c:558
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Data"
@@ -1930,34 +1926,34 @@ msgstr "Nova chamada"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "Mensaxe personalizada..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "Editar mensaxes personalizadas..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Faga clic para eliminar este estado como favorito"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Faga clic para facer este estado un dos favoritos"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Estabelecer status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Estabeleza a súa presenza e estado actual"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Mensaxes personalizadas..."
@@ -2054,16 +2050,16 @@ msgstr "Limpo"
msgid "Blue"
msgstr "Azul"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Non foi posíbel abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Seleccione un ficheiro"
# rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1677
msgid "Select a destination"
msgstr "Seleccione un destinatario"
@@ -2253,24 +2249,19 @@ msgid "Instant Message (Empathy)"
msgstr "Mensaxe instantáneo (Empathy)"
# rever
-#: ../src/empathy.c:583
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Non conectarse ao inicio"
# rever
-#: ../src/empathy.c:587
+#: ../src/empathy.c:600
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:591
-msgid "Show the accounts dialog"
-msgstr "Mostra o diálogo de conta"
-
-# rever
-#: ../src/empathy.c:603
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
-msgstr "- Cliente de mensaxaría instantánea Empathy"
+msgstr "- Cliente de mensaxería instantánea Empathy"
# rever
#: ../src/empathy-about-dialog.c:85
@@ -2317,7 +2308,7 @@ msgstr "Un cliente de mensaxería instantánea para o GNOME"
msgid "translator-credits"
msgstr ""
"Fran Diéguez <frandieguez@ubuntu.com>, 2009, 2010;\n"
-"Antón Méixome <meixome@mancomun.org>,2009. "
+"Antón Méixome <meixome@certima.net>,2009,2010;"
# rever
#: ../src/empathy-account-assistant.c:167
@@ -2351,7 +2342,7 @@ msgstr ""
"deste asistente e engadir as contas máis tarde desde o menú Editar."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Produciuse un erro"
@@ -2361,38 +2352,38 @@ msgstr "Produciuse un erro"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Conta nova de %s"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Que clase de conta de chat ten?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ten algunha outra conta de chat que queira estabelecer?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Introduza os seus detalles de conta"
# rever
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Que clase de conta de chat quere crear?"
# rever
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Quere crear outras contas de chat?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Introduza os detalles para a nova conta"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2403,41 +2394,41 @@ msgstr ""
"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun "
"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Si, importar os detalles da miña conta desde "
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Si, introducirei os meus detalles de conta agora"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Non, quero crear unha conta nova"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Seleccione as contas que quere importar:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Si"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Non, isto é todo por agora"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2448,18 +2439,18 @@ msgstr ""
"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
"detalles máis tarde ou desactivar esta característica usando o diálogo "
-"\"Contas\"."
+"\"Contas\""
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Editar->Contas"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "Non quero activar esta característica agora"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2471,20 +2462,20 @@ msgstr ""
"Se quere activar esta característica, instale o paquete telepathy-salut e "
"cree unha conta de Xente próxima desde o diálogo Contas"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut non está instalado"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Benvido/a ao Empathy"
# rever
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "_Importar as súas contas existentes"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1285
msgid "Please enter personal details"
msgstr "Insira os detalles persoais"
@@ -2501,34 +2492,34 @@ msgstr "Hai modificacións sen gardar respecto da súa conta %s."
msgid "Your new account has not been saved yet."
msgstr "A súa nova conta aínda non foi gardada."
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Conectando..."
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Desconectado — %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Desconectado — Sen conexión de rede"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Estado descoñecido"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Desconectado — Conta desactivada"
# rever
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2537,17 +2528,17 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "Isto non eliminará a súa conta no servidor."
# rever
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2556,7 +2547,7 @@ msgstr ""
"Está seguro de que quere proceder?"
# rever
-#: ../src/empathy-accounts-dialog.c:1863
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2564,11 +2555,6 @@ msgstr ""
"Vai cerrar a xanela, e descartaranse os cambios que realizou.\n"
"Está seguro de que quere proceder?"
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1996
-msgid "Accounts"
-msgstr "Contas"
-
# rever
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
@@ -2688,7 +2674,7 @@ msgstr "Produciuse un fallo na rede"
#: ../src/empathy-call-window.c:1814
msgid ""
"The audio formats necessary for this call are not installed on your computer"
-msgstr "Non ten instalados os formatos de son necesarios neste computador"
+msgstr "Non ten instalados os formatos de audio necesarios neste computador"
#: ../src/empathy-call-window.c:1817
msgid ""
@@ -2757,7 +2743,7 @@ msgstr "Previsualizar"
#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
-msgstr "Redial"
+msgstr "Remarcación"
# rever
#: ../src/empathy-call-window.ui.h:11
@@ -2766,7 +2752,7 @@ msgstr "Enviar audio"
#: ../src/empathy-call-window.ui.h:12
msgid "Toggle audio transmission"
-msgstr "Activar/desactivar transmisión de son"
+msgstr "Activar/desactivar transmisión de audio"
#: ../src/empathy-call-window.ui.h:13
msgid "V_ideo"
@@ -3209,7 +3195,7 @@ msgstr "Unirse a pre_feridos"
#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
-msgstr "Xestionar os preferidos"
+msgstr "Xestionar as preferidas"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
@@ -3492,8 +3478,8 @@ msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-"A lista de idiomas reflicte só aqueles idiomas para os que ten un dicionario "
-"instalado."
+"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
+"dicionario instalado."
#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
@@ -3555,59 +3541,59 @@ msgstr "Vista de mapa de contactos"
msgid "Save"
msgstr "Gardar"
-#: ../src/empathy-debug-window.c:1188
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Depurar xanela"
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pausa"
-#: ../src/empathy-debug-window.c:1280
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1300
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Depuración"
-#: ../src/empathy-debug-window.c:1306
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
-msgstr "Info"
+msgstr "Información"
-#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "Mensaxe"
-#: ../src/empathy-debug-window.c:1318
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "Aviso"
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "Crítico"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "Erro"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Tempo"
-#: ../src/empathy-debug-window.c:1352
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-window.c:1354
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Categoría"
-#: ../src/empathy-debug-window.c:1356
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1388
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3624,118 +3610,30 @@ msgstr "Invitar participante"
msgid "Choose a contact to invite into the conversation:"
msgstr "Seleccione o contacto que quere invitar á conversa:"
-#: ../src/empathy-accounts.c:196
-msgid ""
-"Try to import any recognized accounts and display an assistant if that fails"
-msgstr ""
-"Tenta importar calquera das contas recoñecidas e mostra un asistente se falla"
-
-#: ../src/empathy-accounts.c:201
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
-#: ../src/empathy-accounts.c:205
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Non mostrar ningún diálogo se hai algunha conta non-salut"
+
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
"foo_40exemplo_2eorg0)"
-#: ../src/empathy-accounts.c:207
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<account-id>"
# rever
-#: ../src/empathy-accounts.c:215
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Contas de Empathy"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
msgstr " Contas"
-#~ msgid "Hidden"
-#~ msgstr "Oculto"
-
-# rever
-#~ msgid "User requested disconnect"
-#~ msgstr "O usuario solicitou a desconexión"
-
-#~ msgid "<b>Location</b>"
-#~ msgstr "<b>Localización</b>"
-
-#~ msgid "Email:"
-#~ msgstr "Correo electrónico:"
-
-#~ msgid "Edit Custom Messages..."
-#~ msgstr "Editar a mensaxe personalizada..."
-
-#~ msgid "The error message was: <span style=\"italic\">%s</span>"
-#~ msgstr "A mensaxe de erro foi : <span style=\"italic\">%s</span>"
-
-# rever
-#~ msgid "_Add..."
-#~ msgstr "Eng_adir..."
-
-#~ msgid "_Import..."
-#~ msgstr "_Importar..."
-
-# rever
-#~ msgid "%s is offering you an invitation"
-#~ msgstr "%s estalle a ofrecer un convite"
-
-# rever
-#~ msgid "An external application will be started to handle it."
-#~ msgstr "Un aplicativo externo será iniciado para manipulalo."
-
-#~ msgid "You don't have the needed external application to handle it."
-#~ msgstr "Non precisa dun aplicativo externo para manipulalo."
-
-#~ msgid "New _Call..."
-#~ msgstr "Nova _chamada..."
-
-#~ msgid "_Join..."
-#~ msgstr "_Unirse..."
-
-# rever
-#~ msgid "_New Conversation..."
-#~ msgstr "Conversa _nova..."
-
-# rever
-#~ msgid "Unable to start application for service %s: %s"
-#~ msgstr "Non foi posíbel iniciar o aplicativo para o servizo %s: %s"
-
-#~ msgid ""
-#~ "An invitation was offered for service %s, but you don't have the needed "
-#~ "application to handle it"
-#~ msgstr ""
-#~ "Ofrecéuselle un convite para o servizo %s, mais non ten o aplicativo "
-#~ "necesario para xestionalo"
-
-#~ msgid "_Next"
-#~ msgstr "_Seguinte"
-
-#~ msgid "Add new"
-#~ msgstr "Engadir unha nova"
-
-#~ msgid "Cr_eate"
-#~ msgstr "Cr_ear"
-
-#~ msgid "C_all"
-#~ msgstr "Ch_amar"
-
-# rever
-#~ msgid "_Reuse an existing account"
-#~ msgstr "_Reusar unha conta existente"
-
-# rever
-#~ msgid "No error specified"
-#~ msgstr "Non se especificou ningún erro"
-
-#~ msgid "Unknown error"
-#~ msgstr "Erro descoñecido"
-
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Preferencias"
diff --git a/po/it.po b/po/it.po
index 4ce36cb46..ae5bc9bed 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-02 18:55+0100\n"
-"PO-Revision-Date: 2010-03-02 19:07+0100\n"
+"PO-Revision-Date: 2010-03-11 15:16+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
-msgstr "Empathyso"
+msgstr "Empathy"
# (ndt) tentiamo così per il futuro GNOME 3.0?
#: ../data/empathy.desktop.in.in.h:2
diff --git a/po/lv.po b/po/lv.po
index 8b61d4bb1..01c6375e9 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Raivis Dejus <orvils@gmail.com>, 2009.
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2009.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2009, 2010.
+# Anita Reitere <nitalynx@gmail.com>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: lv\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
"cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-11-06 15:10+0000\n"
-"PO-Revision-Date: 2009-11-09 16:41+0200\n"
-"Last-Translator: \n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2010-03-04 17:00+0000\n"
+"PO-Revision-Date: 2010-03-08 20:06+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latviešu <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,6 @@ msgid "Empathy IM Client"
msgstr "Empathy TZ klients"
#: ../data/empathy.desktop.in.in.h:3
-#| msgid "Client:"
msgid "IM Client"
msgstr "TZ klients"
@@ -46,16 +46,18 @@ msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
-"Rakstzīme, kuru pievienot pēc iesaukas, kad izmanto iesaukas pabeigšanu "
-"(tab) grupu tērzēšanā."
+"Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
+"tērzēšanā."
#: ../data/empathy.schemas.in.h:3
msgid "Chat window theme"
msgstr "Tērzēšanas loga tēma"
#: ../data/empathy.schemas.in.h:4
+#| msgid ""
+#| "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Valodu saraksts, ko izmantot pareizrakstības pārbaudei (piemēram: en, fr, "
"nl)."
@@ -66,16 +68,15 @@ msgstr "Kompakts kontaktu saraksts"
#: ../data/empathy.schemas.in.h:6
msgid "Connection managers should be used"
-msgstr "Vajadzētu izmantot savienojumu pārvaldnieku"
+msgstr "Vajadzētu izmantot savienojumu pārvaldniekus"
#: ../data/empathy.schemas.in.h:7
-#| msgid "Contact information"
msgid "Contact list sort criterion"
msgstr "Kontaktu saraksta kārtošanas kritērijs"
#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
-msgstr "Noklusētā mape, no kuras ņemt iemiesojuma attēlu"
+msgstr "Noklusētā mape, no kuras izvēlēties lietotāja attēlu"
#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
@@ -119,9 +120,7 @@ msgstr "Empathy vajadzētu samazināt atrašanās vietas precizitāti"
#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy vajadzētu izmantot kontakta iemiesojuma bildi kā tērzēšanas loga "
-"ikonu"
+msgstr "Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu"
#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
@@ -160,11 +159,13 @@ msgid "Open new chats in separate windows"
msgstr "Atvērt jaunas sarakstes atsevišķos logos"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Ceļš uz Adium tēmu"
+#| msgid "Path of the adium theme to use"
+msgid "Path of the Adium theme to use"
+msgstr "Ceļš uz lietojamo Adium tēmu"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+#| msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Ceļš uz Adium tēmu, ja tādu izmanto šajā tērzēšanā."
#: ../data/empathy.schemas.in.h:31
@@ -196,37 +197,41 @@ msgid "Play a sound when we log out"
msgstr "Atskaņot skaņu, kad mēs izejam"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr "Rādīt paziņojumu izlecošajā logā, ja tērzēšanas logs nav fokusēts"
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Rādīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+#| msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
msgstr "Rādīt paziņojumu izlecošajā logā, kad ienāk kontakts"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+#| msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
msgstr "Rādīt paziņojumu izlecošajā logā, kad iziet kontakts"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut konts ir izveidots"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
-msgstr "Rādīt iemiesojumus"
+msgstr "Rādīt attēlus"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Rādīt kontaktu sarakstu istabās"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Rādīt norādi par galvenā loga aizvēršanu"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Rādīt nesaistes kontaktus"
+#: ../data/empathy.schemas.in.h:45
+#| msgid "Protocol"
+msgid "Show protocols"
+msgstr "Rādīt protokolus"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Pareizrakstības pārbaudes valodas"
@@ -237,7 +242,7 @@ msgstr "Noklusētā mape, kurā saglabāt saņemtos failus."
#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
-msgstr "Pēdējā mape, no kuras tika ņemts iemiesojuma attēls."
+msgstr "Pēdējā mape, no kuras tika ņemts lietotāja attēls."
#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
@@ -245,216 +250,277 @@ msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
-msgstr "Izmantot grafiskos smaidiņus"
+msgstr "Lietot grafiskos smaidiņus"
#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
-msgstr "Izmantot skaņas paziņojumus"
+msgstr "Lietot skaņas paziņojumus"
#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
-msgstr "Izmantot tēmu tērzēšanas istabās"
+msgstr "Lietot tēmu tērzēšanas istabās"
#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Vai WebKit izstrādes rīkiem, piemēram, Web Inspector, vajadzētu būt "
-"ieslēgtiem."
-
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#| msgid ""
+#| "Whether or not Empathy can publish the user's location to his contacts."
+msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Vai Empathy drīkst publicēt lietotāja atrašanās vietu viņa kontaktiem."
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../data/empathy.schemas.in.h:54
+#| msgid "Whether or not Empathy can use the GPS to guess the location."
+msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašanās vietu."
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/empathy.schemas.in.h:55
+#| msgid ""
+#| "Whether or not Empathy can use the cellular network to guess the location."
+msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašanās vietu."
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/empathy.schemas.in.h:56
+#| msgid "Whether or not Empathy can use the network to guess the location."
+msgid "Whether Empathy can use the network to guess the location."
msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašanās vietu."
-#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/empathy.schemas.in.h:57
+#| msgid ""
+#| "Whether or not Empathy has asked about importing accounts from other "
+#| "programs."
+msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Vai Empathy ir jautājusi par kontu importēšanu no citām programmām."
+#: ../data/empathy.schemas.in.h:58
+#| msgid ""
+#| "Whether or not Empathy should automatically log in to your accounts on "
+#| "startup."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Vai Empathy pēc palaišanas vajadzētu automātiski pieslēgties jūsu kontiem."
+
#: ../data/empathy.schemas.in.h:59
+#| msgid ""
+#| "Whether or not Empathy should reduce the location's accuracy for privacy "
+#| "reasons."
msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
-"Vai Empathy vajadzētu palaižoties automātiski pieslēgties jūsu kontiem."
+"Vai Empathy vajadzētu samazināt atrašanās vietas precizitāti (privātumam)."
#: ../data/empathy.schemas.in.h:60
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
-"Vai Empathy vajadzētu samazināt atrašanās vietas precizitāti (privātumam)."
+"Vai Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu."
#: ../data/empathy.schemas.in.h:61
msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
-"Vai Empathy vajadzētu izmantot kontakta iemiesojuma bildi kā tērzēšanas loga "
-"ikonu."
+"Vai WebKit izstrādes rīkiem, piemēram, Web Inspector, vajadzētu būt "
+"ieslēgtiem."
#: ../data/empathy.schemas.in.h:62
+#| msgid ""
+#| "Whether or not connectivity managers should be used to automatically "
+#| "disconnect/reconnect."
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
-"Vai vajadzētu izmantot savienojumu pārvaldnieku, lai automātiski "
-"atslēgtos/pieslēgtos."
+"Vai vajadzētu izmantot savienojumu pārvaldnieku, lai automātiski atvienotos/"
+"savienotos."
#: ../data/empathy.schemas.in.h:63
+#| msgid ""
+#| "Whether or not to check words typed against the languages you want to "
+#| "check with."
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Vai Salut konts ir izveidots, pirmo reizi palaižot Empathy."
+"Whether to check words typed against the languages you want to check with."
+msgstr "Vai pārbaudīt uzrakstīto vārdu piederību izvēlētajām valodām."
#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "Vai pārbaudīt uzrakstīto vārdu piederību pārbaudāmajām valodām."
+#| msgid ""
+#| "Whether or not to convert smileys into graphical images in conversations."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Vai sarunās smaidiņus pārveidot par grafiskiem attēliem."
#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "Vai sarunās smaidiņus pārveidot par grafiskiem attēliem."
+#| msgid ""
+#| "Whether or not to play a sound to notify for contacts logging in the "
+#| "network."
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīklā."
#: ../data/empathy.schemas.in.h:66
+#| msgid ""
+#| "Whether or not to play a sound to notify for contacts logging off the "
+#| "network."
msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīklā."
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izgājis no tīkla."
#: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izgājis no tīkla."
+#| msgid "Whether or not to play a sound to notify for events."
+msgid "Whether to play a sound to notify of events."
+msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
+#| msgid "Whether or not to play a sound to notify for incoming messages."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par ienākošajiem ziņojumiem."
#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par ienākošajiem ziņojumiem."
+#| msgid "Whether or not to play a sound to notify for new conversations."
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Vai atskaņot skaņu, lai paziņotu par jaunām sarunām."
#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "Vai atskaņot skaņu, lai paziņotu par jaunām sarunām."
+#| msgid "Whether or not to play a sound to notify for outgoing messages."
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
+#| msgid "Whether or not to play a sound when logging in a network."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Vai atskaņot skaņu, piesakoties tīklā."
#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "Vai atskaņot skaņu, kad piesakos tīklā."
+#| msgid "Whether or not to play a sound when logging off a network."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Vai atskaņot skaņu, izejot no tīkla."
#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "Vai atskaņot skaņu, kad izeju no tīkla."
-
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+#| msgid "Whether or not to play sound notifications when away or busy."
+msgid "Whether to play sound notifications when away or busy."
msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
+#| msgid ""
+#| "Whether or not to show a popup notification when a contact goes offline."
+msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts iziet."
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
+#| msgid ""
+#| "Whether or not to show a popup notification when a contact goes online."
+msgid "Whether to show a popup notification when a contact goes online."
msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts parādās tiešsaistē."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:76
+#| msgid ""
+#| "Whether or not to show a popup notification when receiving a new message "
+#| "even if the chat is already opened, but not focused."
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
-"Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu, kaut arī "
-"tērzēšanas logs jau ir atvērts, bet nav fokusēts."
+"Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu, kad tērzēšanas "
+"logs jau ir atvērts, bet nav fokusēts."
+
+#: ../data/empathy.schemas.in.h:77
+#| msgid ""
+#| "Whether or not to show a popup notification when receiving a new message."
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
#: ../data/empathy.schemas.in.h:78
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
msgid ""
-"Whether or not to show a popup notification when receiving a new message."
-msgstr "Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Vai rādīt attēlus kontaktiem kontaktu sarakstā un tērzēšanas logos."
#: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr ""
-"Vai rādīt iemiesojumus kontaktiem kontaktu sarakstā un tērzēšanas logos."
+#| msgid ""
+#| "Whether or not to show contacts that are offline in the contact list."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Vai rādīt kontaktu sarakstā kontaktus, kuri ir nesaistē."
#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "Vai rādīt kontaktu sarakstā kontaktus, kuri ir nesaistē."
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Vai rādīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "Vai rādīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Vai rādīt protokolus kontaktiem kontaktu sarakstā un tērzēšanas logos."
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+#| msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
msgstr "Vai rādīt kontaktu sarakstu tērzēšanas istabās."
#: ../data/empathy.schemas.in.h:83
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Vai rādīt kontaktu sarakstu kompaktajā režīmā."
+
+#: ../data/empathy.schemas.in.h:84
+#| msgid ""
+#| "Whether or not to show the message dialog about closing the main window "
+#| "with the 'x' button in the title bar."
msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Vai rādīt ziņojuma dialogu par galvenā loga aizvēršanu ar 'x' pogu "
"virsraksta joslā."
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Vai rādīt kontaktu sarakstu kompaktajā režīmā."
-
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+#| msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
msgstr "Vai izmantot tēmu tērzēšanas istabās."
#: ../data/empathy.schemas.in.h:86
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to use "
+#| "sort by the contact's name with the value \"name\". A value of \"state\" "
+#| "will sort the contact list by state."
msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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 ""
"Kuru kritēriju izmantot, kārtojot kontaktu sarakstu. Noklusētā vērtība ir "
-"\"name\" - kārtot pēc kontakta vārda. Vērtība \"state\" kārtos kontaktus pēc "
+"\"vārds\" - kārtot pēc kontakta vārda. Vērtība \"statuss\" kārtos kontaktus "
+"pēc "
"to statusa."
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Pārvaldīt ziņojumapmaiņas un IP balss pārraides kontus"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Ziņojumapmaiņas un IP balss pārraides konti"
+
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Saņemtā un nosūtītā faila jaucējsumma nesakrīt"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Kontakts neatbalsta failu sūtīšanu"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "Izvēlētais fails nav parasts fails"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Izvēlētais fails ir tukšs"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:292
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Tuvumā esošie cilvēki"
@@ -486,7 +552,7 @@ msgstr "Notika kļūda, mēģinot pārsūtīt failu"
msgid "The other participant is unable to transfer the file"
msgstr "Otrs dalībnieks nevar pārsūtīt failu"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Nezināms iemesls"
@@ -503,22 +569,81 @@ msgid "Away"
msgstr "Projām"
#: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
-msgstr "Slēpts"
+#| msgid "Invite"
+msgid "Invisible"
+msgstr "Neredzams"
#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Nesaistē"
-#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+#| msgid "No reason was specified"
+msgid "No reason specified"
+msgstr "Iemesls netika norādīts"
+
+#: ../libempathy/empathy-utils.c:288
+#| msgid "%s is now offline."
+msgid "Status is set to offline"
+msgstr "Statuss ir \"nesaistē\""
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Tīkla kļūda"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Autentifikācija neizdevās"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Šifrēšanas kļūda"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Vārds jau ir aizņemts"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Nav sertifikāta"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Neuzticams sertifikāts"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Sertifikāts izbeidzies"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Sertifikāts nav aktivizēts"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Sertifikātu servera nosaukumu nesakritība"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Sertifikāta digitālo nospiedumu nesakritība"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Sertifikāts ir pašparakstīts"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Sertifikāta kļūda"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Tuvumā esošie cilvēki"
-#: ../libempathy/empathy-utils.c:388
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:389
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Facebook tērzēšana"
@@ -574,36 +699,72 @@ msgstr[2] "Pirms %d mēnešiem"
msgid "in the future"
msgstr "nākotnē"
-#: ../libempathy-gtk/empathy-account-chooser.c:432
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Visi"
-#: ../libempathy-gtk/empathy-account-widget.c:439
-#: ../libempathy-gtk/empathy-account-widget.c:495
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1289
-msgid "L_og in"
-msgstr "Pi~eteikties"
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+#| msgid "_Username:"
+msgid "Username:"
+msgstr "Lietotājvārds:"
-#: ../libempathy-gtk/empathy-account-widget.c:1353
-msgid "Enabled"
-msgstr "Aktivizēts"
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Pieteikties"
-#.  Translators: this is used only when built on a moblin platform
-#: ../libempathy-gtk/empathy-account-widget.c:1359
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../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 "Konts:"
+#: ../libempathy-gtk/empathy-account-widget.c:1553
+msgid "Enabled"
+msgstr "Aktivizēts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+#| msgid "This will not remove your account on the server."
+msgid "This account already exists on the server"
+msgstr "Uz servera šāds konts jau ir"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+#| msgid "_Create a new account"
+msgid "Create a new account on the server"
+msgstr "Izveidot jaunu kontu uz servera"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s uz %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:2039
+#, c-format
+msgid "%s Account"
+msgstr "%s konts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Jauns konts"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> MansEkrānaVārds</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Piemērs:</b> MansEkrānaVārds"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -622,14 +783,14 @@ msgstr "Paplašināti"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "Pa_role:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
-msgstr "Ekrā~na vārds:"
+msgstr "Ekrā_na vārds:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "What is your AIM password?"
@@ -642,7 +803,7 @@ msgstr "Kāds ir jūsu AIM ekrāna vārds?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -651,7 +812,7 @@ msgstr "_Ports:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -660,8 +821,9 @@ msgstr "_Serveris:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> lietotāja vārds</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> username</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Piemērs:</b> lietotājvārds"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -678,8 +840,9 @@ msgid "What is your GroupWise password?"
msgstr "Kāda ir jūsu GroupWise parole?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> 123456789</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Piemērs:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -695,15 +858,53 @@ msgstr "Kāda ir jūsu ICQ parole?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+#| msgid "_Charset:"
+msgid "_Character set:"
msgstr "_Rakstzīmju kopa:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Jauns tīkls"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#| msgid "_About"
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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:222
+#| msgid "Western"
+msgid "Register"
+msgstr "Reģistrēties"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Opcijas"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#| msgid "No"
+msgid "None"
+msgstr "Nekas"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+#| msgid "Charset:"
+msgid "Character set:"
msgstr "Rakstzīmju kopa:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -731,17 +932,18 @@ msgid "Real name:"
msgstr "Īstais vārds:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-#| msgid "Server"
msgid "Servers"
msgstr "Serveris"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> lietotajs@gmail.com</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Piemērs:</b> lietotajs@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> lietotajs@jabber.org</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Piemērs:</b> lietotajs@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -756,56 +958,81 @@ msgid "Reso_urce:"
msgstr "Res_urss:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Šeit vajadzīgs lietotāja vārds, nevis e-pasta adrese.\n"
+"Ja jūs var atrast facebook.com/<b>saule</b>, ievadiet <b>saule</b>.\n"
+"Ja jums nav Facebook lietotāja vārda, varat to izvēlēties <a "
+"href=\"http://www.facebook.com/username/\">šajā lapā</a>."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Lietot veco SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#| msgid "What is your Yahoo! password?"
+msgid "What is your Facebook password?"
+msgstr "Kāda ir jūsu Facebook parole?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#| msgid "What is your Windows Live user name?"
+msgid "What is your Facebook username?"
+msgstr "Kāds ir jūsu Facebook lietotāja vārds?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Kāds ir jūsu Google ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Kāda ir jūsu Google parole?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Kāds ir jūsu Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Kāda ir jūsu Jabber parole?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Kāds ir jūsu vēlamais Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Kāda ir jūsu vēlamā Jabber parole?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "_Vajadzīga šifrēšana (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Ignorēt SSL sertifikāta kļūdas"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> lietotajs@hotmail.com</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Piemērs:</b> lietotajs@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Kāda ir jūsu Windows Live parole?"
+#| msgid "What is your Windows Live password?"
+msgid "What is your Windows Live ID?"
+msgstr "Kāds ir jūsu Windows Live ID?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Kāds ir jūsu Windows Live lietotāja vārds?"
+msgid "What is your Windows Live password?"
+msgstr "Kāda ir jūsu Windows Live parole?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "_E-pasts:"
+#| msgid "_Email:"
+msgid "_E-mail address:"
+msgstr "_E-pasta adrese:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
@@ -828,37 +1055,122 @@ msgid "_Published Name:"
msgstr "_Publiskotais vārds:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>Piemērs:</b> lietotajs@my.sip.server</span>"
+#| msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Piemērs:</b> lietotajs@my.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#| msgid "Authentication failed"
+msgid "Authentication username:"
+msgstr "Autentifikācijas vārds:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Atklāt STUN"
+#| msgid "Discover STUN"
+msgid "Discover Binding"
+msgstr "Atklāt saistīšanu"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Atklāt STUN serveri automātiski"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN serveris:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Izejošo pieprasījumu starpniekserveris"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN ports:"
+msgid "Interval (seconds)"
+msgstr "Intervāls (sekundēs)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "Keep-alive opcijas"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "Meklēt STUN servera vārdu servisa domēna DNS SRV ierakstā."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Brīvā maršrutēšana"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Mehānisms:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Dažādas opcijas"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "NAT šķērsošanas opcijas"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Starpniekservera ports izejošajiem pieprasījumiem."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#| msgid "_Port:"
+msgid "Port:"
+msgstr "Ports:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Starpniekservera opcijas"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "STUN serveris:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#| msgid "_Server:"
+msgid "Server:"
+msgstr "Serveris:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr "Lietotāja vārds SIP autentifikācijai, ja atšķirīgs no SIP URI vārda."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#| msgid "STUN port:"
+msgid "Transport:"
+msgstr "Transports:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Atjaunināt reģistrācijas piesaisti, ja klienta ārējā adrese izrādās "
+"atšķirīga no lokālās piesaistes."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Lietot brīvo (loose) maršrutēšanu un Route galveni, kā ieteikts RFC 3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "Kāda ir jūsu SIP konta parole?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "Kāds ir jūsu SIP lietotāja ID?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Lietotājvārds:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Izmantot _Yahoo Japan"
+#| msgid "Use _Yahoo Japan"
+msgid "Use _Yahoo! Japan"
+msgstr "Lietot _Yahoo! Japan"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
@@ -869,11 +1181,13 @@ msgid "What is your Yahoo! password?"
msgstr "Kāda ir jūsu Yahoo! parole?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+#| msgid "Yahoo I_D:"
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+#| msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
msgstr "_Ignorēt konferenču un tērzēšanas istabu uzaicinājumus"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -883,15 +1197,16 @@ msgstr "_Istabu saraksta lokāle:"
#: ../libempathy-gtk/empathy-avatar-chooser.c:449
#: ../libempathy-gtk/empathy-avatar-chooser.c:525
msgid "Couldn't convert image"
-msgstr "Nevar konvertēt attēlu"
+msgstr "Neizdevās pārveidot attēlu"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+#| msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
msgstr "Jūsu sistēma neatbalsta nevienu no akceptētajiem attēla formātiem"
#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
-msgstr "Izvēlieties savu iemiesojuma attēlu"
+msgstr "Izvēlieties savu attēlu"
#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
@@ -905,160 +1220,184 @@ msgstr "Attēli"
msgid "All Files"
msgstr "Visi faili"
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Klikšķiniet, lai palielinātu"
-#: ../libempathy-gtk/empathy-chat.c:193
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Neizdevās atkārtoti pieslēgties šai tērzēšanas istabai"
-#: ../libempathy-gtk/empathy-chat.c:591
-msgid "Failed to join chatroom"
+#: ../libempathy-gtk/empathy-chat.c:655
+#| msgid "Failed to join chatroom"
+msgid "Failed to join chat room"
msgstr "Neizdevās pievienoties tērzēšanas istabai"
-#: ../libempathy-gtk/empathy-chat.c:609
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Neizdevās izveidot privātu tērzēšanas istabu"
-#: ../libempathy-gtk/empathy-chat.c:648
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Šai sarunai temats nav atbalstīts"
-#: ../libempathy-gtk/empathy-chat.c:654
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Jums nav tiesību mainīt tematu"
-#: ../libempathy-gtk/empathy-chat.c:752
-msgid "/clear, clear all messages from the current conversation"
-msgstr "/clear, attīrīt visus ziņojumus no šīs sarunas"
-
-#: ../libempathy-gtk/empathy-chat.c:755
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "/topic <topic>, uzlikt tematu šai sarunai"
-
-#: ../libempathy-gtk/empathy-chat.c:758
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <chatroom id>, pievienoties jaunai tērzēšanas istabai"
-
-#: ../libempathy-gtk/empathy-chat.c:761
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <chatroom id>, pievienoties jaunai tērzēšanas istabai"
-
-#: ../libempathy-gtk/empathy-chat.c:764
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr "/query <contact id> [<message>], atvērt privāto tērzēšanu"
-
-#: ../libempathy-gtk/empathy-chat.c:767
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr "/msg <contact id> <message>, atvērt privāto tērzēšanu"
-
-#: ../libempathy-gtk/empathy-chat.c:770
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr "/me <message>, nosūtīt darbības ziņojumu šajā sarunā"
-
-#: ../libempathy-gtk/empathy-chat.c:773
+#: ../libempathy-gtk/empathy-chat.c:847
+#| msgid "/clear, clear all messages from the current conversation"
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: attīrīt visus ziņojumus no šīs sarunas"
+
+#: ../libempathy-gtk/empathy-chat.c:850
+#| msgid "/topic <topic>, set the topic of the current conversation"
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <temats>: uzlikt tematu šai sarunai"
+
+#: ../libempathy-gtk/empathy-chat.c:853
+#| msgid "/join <chatroom id>, join a new chatroom"
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <istabas ID>: pievienoties jaunai tērzēšanas istabai"
+
+#: ../libempathy-gtk/empathy-chat.c:856
+#| msgid "/j <chatroom id>, join a new chatroom"
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <istabas ID>: pievienoties jaunai tērzēšanas istabai"
+
+#: ../libempathy-gtk/empathy-chat.c:859
+#| msgid "/query <contact id> [<message>], open a private chat"
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <kontakta ID> [<ziņojums>]: atvērt privāto tērzēšanu"
+
+#: ../libempathy-gtk/empathy-chat.c:862
+#| msgid "/msg <contact id> <message>, open a private chat"
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <kontakta ID> <ziņojums>: atvērt privāto tērzēšanu"
+
+#: ../libempathy-gtk/empathy-chat.c:865
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <iesauka>: mainīt jūsu iesauku uz šī servera"
+
+#: ../libempathy-gtk/empathy-chat.c:868
+#| msgid "/me <message>, send an ACTION message to the current conversation"
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <darbība>: nosūtīt darbības ziņojumu šajā sarunā"
+
+#: ../libempathy-gtk/empathy-chat.c:871
+#| 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 chatroom\""
msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/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 chatroom\""
+"join a new chat room\""
msgstr ""
-"/say <message>, sūtīt <message> šajā sarunā. To izmanto, lai sūtītu"
-"ziņojumu, kurš sākas ar '/'. Piemēram: \"/say /join tiek izmantots, lai "
-"pievienotos jaunai tērzēšanas istabai\""
-
-#: ../libempathy-gtk/empathy-chat.c:778
+"/say <ziņojums>: sūtīt <ziņojumu> šajā sarunā. To izmanto, lai sūtītu "
+"ziņojumu, kurš sākas ar '/'. Piemēram: \"/say /join tiek izmantots, "
+"lai pievienotos jaunai tērzēšanas istabai\""
+
+#: ../libempathy-gtk/empathy-chat.c:876
+#| msgid ""
+#| "/help [<command>], show all supported commands. If <command> is defined, "
+#| "show its usage."
msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-"/help [<command>], rādīt visas atbalstītās komandas. Ja dots <command> "
-"(konkrēta komanda), parādīt tās lietošanu."
+"/help [<komanda>]: rādīt visas atbalstītās komandas. Ja dota <komanda>, "
+"parādīt tās lietošanu."
-#: ../libempathy-gtk/empathy-chat.c:788
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Lietojums: %s"
-#: ../libempathy-gtk/empathy-chat.c:817
-#| msgid "Unknown reason"
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Nezināma komanda"
-#: ../libempathy-gtk/empathy-chat.c:938
-msgid "Unknown command, see /help for the available commands"
+#: ../libempathy-gtk/empathy-chat.c:1036
+#| msgid "Unknown command, see /help for the available commands"
+msgid "Unknown command; see /help for the available commands"
msgstr "Nezināma komanda; /help var parādīt pieejamās komandas"
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "nesaistē"
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "nederīgs kontakts"
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "atļauja liegta"
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "pārāk garš ziņojums"
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "nav realizēts"
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "nezināms"
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Kļūda, sūtot ziņojumu '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1125
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Temats ir: %s"
-#: ../libempathy-gtk/empathy-chat.c:1127
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Temats nav norādīts"
-#: ../libempathy-gtk/empathy-chat.c:1498
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Nav ieteikumu)"
-#: ../libempathy-gtk/empathy-chat.c:1552
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Ievietot smaidiņu"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1570
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1622
msgid "_Send"
msgstr "_Sūtīt"
-#: ../libempathy-gtk/empathy-chat.c:1604
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Pareizrakstības ieteikumi"
-#: ../libempathy-gtk/empathy-chat.c:1719, c-format
-#| msgid "Disconnected"
+#: ../libempathy-gtk/empathy-chat.c:1829
+#| msgid "Failed to open private chat"
+msgid "Failed to retrieve recent logs"
+msgstr "Neizdevās iegūt pēdējos ierakstus"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
+#, c-format
msgid "%s has disconnected"
msgstr "%s ir izgājis"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1726
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s ņēma un izspēra %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s tika izsperts"
@@ -1066,17 +1405,17 @@ msgstr "%s tika izsperts"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1737
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s ņēma un izraidīja %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1740
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s tika izraidīts"
-#: ../libempathy-gtk/empathy-chat.c:1744
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s pameta istabu"
@@ -1086,60 +1425,82 @@ msgstr "%s pameta istabu"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1753
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1776
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s pievienojās istabai"
-#: ../libempathy-gtk/empathy-chat.c:1908 ../src/empathy-call-window.c:1297
+#: ../libempathy-gtk/empathy-chat.c:2044, c-format
+#| msgid "%s is now online."
+msgid "%s is now known as %s"
+msgstr "%s tagad ir saucas %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Atvienots"
-#: ../libempathy-gtk/empathy-chat.c:2382
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "Wrong password; please try again:"
+msgstr "Nepareiza parole; mēģiniet vēlreiz:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Retry"
+msgstr "Mēģināt vēlreiz"
+
+#: ../libempathy-gtk/empathy-chat.c:2707
+msgid "This room is protected by a password:"
+msgstr "Šī istaba ir aizsargāta ar paroli:"
+
+#: ../libempathy-gtk/empathy-chat.c:2708
+#| msgid "_Join"
+msgid "Join"
+msgstr "Pievienoties"
+
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Savienots"
-#: ../libempathy-gtk/empathy-chat.c:2432
-#: ../libempathy-gtk/empathy-log-window.c:525
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Saruna"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:556
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Temats:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:315
-#: ../libempathy-gtk/empathy-theme-adium.c:808
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Kopēt saites adresi"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-theme-adium.c:815
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Atvērt saiti"
#. 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:423
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Labot kontakta informāciju"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Personīgā informācija"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Jauns kontakts"
@@ -1151,223 +1512,216 @@ msgstr "Izlemt vē_lāk"
msgid "Subscription Request"
msgstr "Pierakstīšanās lūgums"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
#, c-format
msgid "Do you really want to remove the group '%s'?"
-msgstr "Vai jūs tiešām vēlaties izņemt grupu '%s'?"
+msgstr "Vai tiešām vēlaties izņemt grupu '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1418
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
msgid "Removing group"
msgstr "Izņem grupu"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1465
-#: ../libempathy-gtk/empathy-contact-list-view.c:1542
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Izņemt"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr "Vai jūs tiešām vēlaties izņemt kontaktu '%s'?"
+msgstr "Vai tiešām vēlaties izņemt kontaktu '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1497
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
msgid "Removing contact"
msgstr "Izņem kontaktu"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+#| msgid "_Add Contact..."
+msgid "_Add Contact…"
msgstr "_Pievienot kontaktu..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Tērzēšana"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
-#| msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Zvans"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
-#| msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video zvans"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-#: ../src/empathy-main-window.ui.h:24
-#| msgid "Conversations"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Ie_priekšējās sarunas"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Sūtīt failu"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Dalīties ar manu darbvirsmu"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Infor_mācija"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+#| msgid "_Edit"
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_ediģēt"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Uzaicināt uz šo istabu"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+#| msgid "Inviting to this room"
+msgid "Inviting you to this room"
+msgstr "Aicina jūs uz šo istabu"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#| msgid "_Invite to chatroom"
+msgid "_Invite to chat room"
msgstr "Uza_icināt uz tērzēšanas istabu"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Izvēlēties kontaktu"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Saglabāt iemiesojumu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Nevar saglabāt iemiesojumu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Izvēlēties"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1020
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Grupa"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Valsts ISO kods:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
-#| msgid "Account:"
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Valsts:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
-#| msgid "Status:"
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Štats:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
-#| msgid "Client:"
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Pilsēta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
-#| msgid "Armenian"
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Reģions:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
-msgstr "Pasta kods:"
+msgstr "Pasta indekss:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
-#| msgid "Select"
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Iela:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Ēka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Stāvs:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
-#| msgid "Room"
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Istaba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
-#| msgid "Type:"
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Teksts:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
-#| msgid "Version:"
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Apraksts:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Precizitātes līmenis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Kļūda:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Vertikālā kļūda (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Horizontālā kļūda (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Ātrums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
-#| msgid "Version:"
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Peilējums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Kāpšanas ātrums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Pēdējo reizi atjaunināts:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Garums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Platums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Augstums:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-#| msgid "<b>Behavior</b>"
-msgid "<b>Location</b>"
-msgstr "<b>Vieta</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Vieta"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
-#| msgid "<b>Behavior</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Vieta</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+msgid "Save Avatar"
+msgstr "Saglabāt attēlu"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+msgid "Unable to save avatar"
+msgstr "Nevar saglabāt attēlu"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Vieta</b> (datums)\t"
@@ -1381,7 +1735,6 @@ msgid "Birthday:"
msgstr "Dzimšanas diena:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-#| msgid "Contact Information"
msgid "Client Information"
msgstr "Klienta informācija"
@@ -1390,42 +1743,37 @@ msgid "Client:"
msgstr "Klients:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1003
-msgid "Contact"
-msgstr "Kontakts"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#| msgid "Contact List"
msgid "Contact Details"
msgstr "Kontakta informācija"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "E-pasts:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "E-pasta adrese:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#| msgid "Fullname:"
+msgid "Full name:"
msgstr "Vārds, uzvārds:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-#| msgid "Group"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Grupas"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Identifikators:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Informācija pieprasīta..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#| msgid "Information requested..."
+msgid "Information requested&#x2026;"
+msgstr "Informācija pieprasīta&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "OS:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1433,15 +1781,16 @@ msgstr ""
"Izvēlieties grupas, kurās vēlaties redzēt šo kontaktu. Varat izvēlēties "
"vienu, vairākas vai nevienu grupu."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Versija:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#| msgid "Web site:"
+msgid "Website:"
msgstr "Tīmekļa vietne:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "_Pievienot grupu"
@@ -1461,12 +1810,12 @@ msgstr "Ports"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:518
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Konts"
-#: ../libempathy-gtk/empathy-log-window.c:535
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Datums"
@@ -1486,60 +1835,91 @@ msgstr "Meklēt"
msgid "_For:"
msgstr "_Frāze:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "Zv_anīt"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "Kontakta ID:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "_Tērzēt"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "Kontakta ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Jauna saruna"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#| msgid "Send video"
+msgid "Send _Video"
+msgstr "Sūtīt _video"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Zvanīt"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#| msgid "Call"
+msgid "New Call"
+msgstr "Zvans"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:177
-#: ../libempathy-gtk/empathy-presence-chooser.c:213
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#| msgid "Custom Message..."
+msgid "Custom Message…"
msgstr "Pielāgots ziņojums..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:230
-#: ../libempathy-gtk/empathy-presence-chooser.c:232
-msgid "Edit Custom Messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#| msgid "Edit Custom Messages"
+msgid "Edit Custom Messages…"
msgstr "Labot pielāgotos ziņojumus..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:331
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Klikšķiniet, lai izņemtu šo statusu no iecienītajiem"
-#: ../libempathy-gtk/empathy-presence-chooser.c:340
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Klikšķiniet, lai padarītu šo statusu par iecienīto"
-#: ../libempathy-gtk/empathy-presence-chooser.c:374
-#| msgid "Status"
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Iestatīt statusu"
-#: ../libempathy-gtk/empathy-presence-chooser.c:876
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Iestatiet savu klātbūtni un statusu"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1129
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#| msgid "Custom messages..."
+msgid "Custom messages…"
msgstr "Pielāgotās ziņas..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#| msgid "Hindi"
+msgid "Find:"
+msgstr "Meklēt:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Atbilst reģistrs"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Frāze nav atrasta"
+
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "Saņemts tūlītējais ziņojums"
@@ -1554,19 +1934,19 @@ msgstr "Ienākošs tērzēšanas pieprasījums"
#: ../libempathy-gtk/empathy-sound.c:57
msgid "Contact connected"
-msgstr "Kontakts pieslēdzies"
+msgstr "Kontakts savienojies"
#: ../libempathy-gtk/empathy-sound.c:59
msgid "Contact disconnected"
-msgstr "Kontakts atslēdzies"
+msgstr "Kontakts atvienojies"
#: ../libempathy-gtk/empathy-sound.c:61
msgid "Connected to server"
-msgstr "Pieslēdzies serverim"
+msgstr "Savienojies ar serveri"
#: ../libempathy-gtk/empathy-sound.c:63
msgid "Disconnected from server"
-msgstr "Atslēdzies no servera"
+msgstr "Atvienojies no servera"
#: ../libempathy-gtk/empathy-sound.c:65
msgid "Incoming voice call"
@@ -1580,11 +1960,11 @@ msgstr "Izejošs balss zvans"
msgid "Voice call ended"
msgstr "Balss zvans beidzies"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Ievadiet pielāgotu ziņojumu"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Labot pielāgotos ziņojumus"
@@ -1612,16 +1992,15 @@ msgstr "Tīrs"
msgid "Blue"
msgstr "Zils"
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-ui-utils.c:1497
msgid "Unable to open URI"
msgstr "Nevar atvērt URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1614
msgid "Select a file"
msgstr "Izvēlieties failu"
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-#| msgid "Select a file"
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
msgid "Select a destination"
msgstr "Izvēlieties galamērķi"
@@ -1793,140 +2172,154 @@ msgid "Vietnamese"
msgstr "Vjetnamiešu"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
+#| msgid "The contact selected cannot receive files."
+msgid "The selected contact cannot receive files."
msgstr "Izvēlētais kontakts nevar saņemt failus."
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
+#| msgid "The contact selected is offline."
+msgid "The selected contact is offline."
msgstr "Izvēlētais kontakts ir nesaistē."
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
msgid "No error message"
-msgstr "Nav kļūdu paziņojumu"
+msgstr "Nav kļūdas paziņojuma"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
msgstr "Tūlītējs ziņojums (Empathy)"
-#: ../src/empathy.c:871
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
-msgstr "Nepieslēgties palaižoties"
+msgstr "Nepieslēgties automātiski"
-#: ../src/empathy.c:875
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Palaižoties nerādīt kontaktu sarakstu vai kādus citus dialogus"
+msgstr "Pēc palaišanas nerādīt kontaktu sarakstu vai kādus citus dialogus"
-#: ../src/empathy.c:879
-msgid "Show the accounts dialog"
-msgstr "Rādīt kontu dialogu"
-
-#: ../src/empathy.c:891
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Empathy TZ klients"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 ir brīva programmatūra; jūs varat to izplatīt tālāk un/vai modificēt "
+"saskaņā ar GNU Vispārējās publiskās licences noteikumiem, ko publicējis "
+"Brīvas programmatūras fonds; izmantojiet Licences versiju 2 vai (pēc jūsu "
+"izvēles) jebkuru vēlāku versiju."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 tiek izplatīta cerībā, ka tā būs noderīga, taču BEZ JEBKĀDĀM "
+"GARANTIJĀM; pat bez šķietamām KOMERCIĀLAS VĒRTĪBAS un PIEMĒROTĪBAS "
+"KONKRĒTIEM NOLŪKIEM garantijām. Sīkāku informāciju meklējiet GNU Vispārējā "
+"publiskajā licencē."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 ""
+"Jums vajadzēja saņemt GNU Vispārējās publiskās licences kopiju kopā ar šo "
+"programmu; ja jūs to nesaņēmāt, rakstiet uz Brīvas programmatūras fondu, "
+"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA "
+"02111-1307 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Tūlītējās ziņojumapmaiņas klients GNOME videi"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Raivis Dejus <orvils@gmail.com> "
-"Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>"
-
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
-msgstr "Gadījās, kļūda importējot kontus."
-
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
-msgstr "Gadījās kļūda, parsējot konta informāciju."
-
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+"Rūdolfs Mazurs <rudolfs.mazurs@gmail.com> "
+"Anita Reitere <nitalynx@gmail.com>"
+
+#: ../src/empathy-account-assistant.c:167
+#| msgid "There has been an error while importing the accounts."
+msgid "There was an error while importing the accounts."
+msgstr "Gadījās kļūda, importējot kontus."
+
+#: ../src/empathy-account-assistant.c:170
+#| msgid "There has been an error while parsing the account details."
+msgid "There was an error while parsing the account details."
+msgstr "Gadījās kļūda, analizējot konta informāciju."
+
+#: ../src/empathy-account-assistant.c:173
+#| msgid "There has been an error while creating the account."
+msgid "There was an error while creating the account."
msgstr "Gadījās kļūda, veidojot kontu."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+#| msgid "There has been an error."
+msgid "There was an error."
msgstr "Ir notikusi kļūda."
-#: ../src/empathy-account-assistant.c:141
-#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Kļūdas ziņojums bija: <span style=\"italic\">%s</span>"
+#: ../src/empathy-account-assistant.c:179, c-format
+#| msgid "No error message"
+msgid "The error message was: %s"
+msgstr "Kļūdas paziņojums: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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 ""
-"Jūs varat doties atpakaļ un ievadīt konta informāciju atkal vai arī iziet "
-"no šī palīga un pievienot kontus vēlāk caur Rediģēšanas izvēlni."
+"Jūs varat atgriezties un ievadīt konta informāciju vēlreiz, vai arī iziet no "
+"šī palīga un pievienot kontus vēlāk, izmantojot Rediģēšanas izvēlni."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1292
msgid "An error occurred"
msgstr "Notika kļūda"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1369
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Jauns %s konts"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:500
msgid "What kind of chat account do you have?"
msgstr "Kāda veida tērzēšanas konts jums ir?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:506
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:512
msgid "Enter your account details"
msgstr "Ievadiet sava konta informāciju"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:517
msgid "What kind of chat account do you want to create?"
msgstr "Kāda veida tērzēšanas kontu vēlaties izveidot?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:523
msgid "Do you want to create other chat accounts?"
msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:530
msgid "Enter the details for the new account"
msgstr "Ievadiet sava jaunā konta informāciju"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:645
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 "
@@ -1938,83 +2331,132 @@ msgstr ""
"tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs varat veikt arī "
"audio un video zvanus."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:662
msgid "Do you have an account you've been using with another chat program?"
msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:685
msgid "Yes, import my account details from "
msgstr "Jā, es vēlos importēt manu konta informāciju no "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:706
msgid "Yes, I'll enter my account details now"
msgstr "Jā, es tagad ievadīšu sava konta informāciju"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:728
msgid "No, I want a new account"
msgstr "Nē, es vēlos veidot jaunu kontu"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:738
msgid "No, I just want to see people online nearby for now"
-msgstr "Nē, es pagaidām vēlos tikai redzēt tiešsaistē esošos cilvēkus"
+msgstr "Nē, es pagaidām vēlos tikai redzēt tuvumā atrodamos cilvēkus"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:759
msgid "Select the accounts you want to import:"
msgstr "Izvēlieties kontus, kurus vēlaties importēt:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:843
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Jā"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:850
msgid "No, that's all for now"
msgstr "Nē, pagaidām tas ir viss"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1109
+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 var automātiski atrast tērzēšanai cilvēkus jūsu lokālajā tīklā. "
+"Ja vēlaties lietot šo iespēju, lūdzu, pārliecinieties, ka norādītās detaļas "
+"ir pareizas. Vēlāk jūs tās varat viegli izmainīt vai atslēgt šo iespēju, "
+"izmantojot dialogu 'Konti'."
+
+#: ../src/empathy-account-assistant.c:1115
+#: ../src/empathy-account-assistant.c:1171
+#| msgid "_Edit account"
+msgid "Edit->Accounts"
+msgstr "Rediģēt->Konti"
+
+#: ../src/empathy-account-assistant.c:1131
+#| msgid "No, I just want to see people online nearby for now"
+msgid "I don't want to enable this feature for now"
+msgstr "Es pagaidām nevēlos ieslēgt šo iespēju"
+
+#: ../src/empathy-account-assistant.c:1167
+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 ""
+"Neizdosies tērzēt ar cilvēkiem lokālajā tīklā, jo telepathy-salut nav "
+"instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet "
+"telepathy-salut pakotni un izveidojiet atbilstošo kontu Kontu dialogā"
+
+#: ../src/empathy-account-assistant.c:1173
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut nav instalēts"
+
+#: ../src/empathy-account-assistant.c:1250
msgid "Welcome to Empathy"
msgstr "Laipni lūdzam Empathy"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1259
msgid "Import your existing accounts"
msgstr "Importēt jau esošos kontus"
+#: ../src/empathy-account-assistant.c:1277
+msgid "Please enter personal details"
+msgstr "Lūdzu, ievadiet savus datus"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
-#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "Kontam %s ir nesaglabātas izmaiņas"
+#: ../src/empathy-accounts-dialog.c:66, c-format
+#| msgid "There are unsaved modification regarding your %s account."
+msgid "There are unsaved modifications to your %s account."
+msgstr "Kontam %s ir nesaglabātas izmaiņas."
#. 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:67
+#: ../src/empathy-accounts-dialog.c:70
msgid "Your new account has not been saved yet."
msgstr "Jaunais konts vēl nav saglabāts."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:233, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s uz %2$s"
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#| msgid "Connecting..."
+msgid "Connecting…"
+msgstr "Savienojas..."
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:251, c-format
-#| msgid "Account"
-msgid "%s Account"
-msgstr "%s konts"
+#: ../src/empathy-accounts-dialog.c:290, c-format
+#| msgid "Disconnected"
+msgid "Disconnected — %s"
+msgstr "Atvienots — %s"
-#: ../src/empathy-accounts-dialog.c:255
-#| msgid "Account"
-msgid "New account"
-msgstr "Jauns konts"
+#: ../src/empathy-accounts-dialog.c:295, c-format
+#| msgid "Offline"
+msgid "Offline — %s"
+msgstr "Nesaistē — %s"
-#: ../src/empathy-accounts-dialog.c:533
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Nesaistē — nav tīkla savienojuma"
+
+#: ../src/empathy-accounts-dialog.c:316
+#| msgid "Unknown reason"
+msgid "Unknown Status"
+msgstr "Nezināms statuss"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Nesaistē — konts atslēgts"
+
+#: ../src/empathy-accounts-dialog.c:760
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2022,16 +2464,16 @@ msgstr ""
"Jūs tūlīt izveidosiet jaunu kontu, kas izmetīs jūsu izmaiņas.\n"
"Vai tiešām vēlaties turpināt?"
-#: ../src/empathy-accounts-dialog.c:823
+#: ../src/empathy-accounts-dialog.c:1107
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Vai vēlaties izņemt %s no sava datora?"
-#: ../src/empathy-accounts-dialog.c:827
+#: ../src/empathy-accounts-dialog.c:1111
msgid "This will not remove your account on the server."
msgstr "Tas izņems jūsu kontu no servera."
-#: ../src/empathy-accounts-dialog.c:1009
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2039,7 +2481,7 @@ msgstr ""
"Ja jūs izvēlēsieties citu kontu, tas izmetīs jūsu izmaiņas.\n"
"Vai tiešām vēlaties turpināt?"
-#: ../src/empathy-accounts-dialog.c:1455
+#: ../src/empathy-accounts-dialog.c:1925
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2047,138 +2489,110 @@ msgstr ""
"Ja tagad aizvērsiet logu, tas izmetīs jūsu izmaiņas.\n"
"Vai tiešām vēlaties turpināt?"
-#.  Translators: this is used only when built on a moblin platform
-#: ../src/empathy-accounts-dialog.c:1626
-#| msgid "_Next Tab"
-msgid "_Next"
-msgstr "_Nākamais"
-
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2058
msgid "Accounts"
msgstr "Konti"
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Jauns konts"
-
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Izv_eidot"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Protokols nav uzinstalēts"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
+#| msgid "Protocol"
+msgid "Protocol:"
+msgstr "Protokols:"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr ""
-"Lai izveidotu jaunu kontu, jums vispirms jāuzinstalē aizmugure katram "
-"protokolam, kuru vēlaties izmantot."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
-#| msgid "_Add Contact..."
-msgid "_Add..."
-msgstr "_Pievienot..."
+"Lai izveidotu jaunu kontu, vispirms jāinstalē aizmugure katram protokolam, "
+"kuru vēlaties izmantot."
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Izveidot jaunu kontu"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-#| msgid "Import"
-msgid "_Import..."
-msgstr "_Importēt..."
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "_Reuse an existing account"
-msgstr "Atkā_rtoti izmantot esošu kontu"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "_Pievienot&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:10
-#| msgid "Account"
-msgid "account"
-msgstr "konts"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "_Importēt&#x2026;"
-#: ../src/empathy-call-window.c:428
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Kontrasts"
-#: ../src/empathy-call-window.c:431
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Spilgtums"
-#: ../src/empathy-call-window.c:434
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:542
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Skaļums"
-#: ../src/empathy-call-window.c:676
-msgid "Connecting..."
-msgstr "Pieslēdzas..."
-
-#: ../src/empathy-call-window.c:784
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Sānjosla"
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Ciparnīca"
-#: ../src/empathy-call-window.c:809
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Audio ievade"
-#: ../src/empathy-call-window.c:813
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Video ievade"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:876
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Zvans ar %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:957
-#| msgid "_Call"
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Zvans"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1457
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Savienojies — %d:%02dm"
-#: ../src/empathy-call-window.c:1511
+#: ../src/empathy-call-window.c:1755
msgid "Technical Details"
msgstr "Tehniskā informācija"
-#: ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1793
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
"Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
-"audio formātiem."
+"audio formātiem"
-#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-call-window.c:1798
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
"Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
-"video formātiem."
+"video formātiem"
-#: ../src/empathy-call-window.c:1557
+#: ../src/empathy-call-window.c:1804
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2187,43 +2601,149 @@ msgstr ""
"Nevar izveidot savienojumu ar %s. Iespējams, ka viens no jums atrodas tīklā, "
"kurā nav atļauti tiešie savienojumi."
-#: ../src/empathy-call-window.c:1599
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Gadījās tīkla kļūme"
+
+#: ../src/empathy-call-window.c:1814
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "Šim zvanam vajadzīgie audio formāti nav instalēti jūsu datorā"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "Šim zvanam vajadzīgie video formāti nav instalēti jūsu datorā"
+
+#: ../src/empathy-call-window.c:1827
+#, 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 ""
+"Kādā Telepathy sastāvdaļā noticis kas negaidīts. Lūdzu, <a href=\"%s\">"
+"ziņojiet par šo kļūdu</a>, pievienojot ierakstus no 'Atkļūdot' loga "
+"Palīdzības izvēlnē."
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Zvanu dzinī gadījās kļūme"
+
+#: ../src/empathy-call-window.c:1874
msgid "Can't establish audio stream"
msgstr "Nevar izveidot audio plūsmu"
-#: ../src/empathy-call-window.c:1609
+#: ../src/empathy-call-window.c:1884
msgid "Can't establish video stream"
msgstr "Nevar izveidot video plūsmu"
#: ../src/empathy-call-window.ui.h:1
+#| msgid "Compact contact list"
+msgid "Call the contact again"
+msgstr "Zvanīt kontaktam vēlreiz"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Izslēgt kameru"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Ieslēgt kameru"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Atslēgt kameru un pārstāt sūtīt video"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Ieslēgt kameru un sūtīt video"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Ieslēgt kameru, bet nesūtīt video"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Nolikt klausuli"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Beigt šo zvanu"
+
+#: ../src/empathy-call-window.ui.h:9
+#| msgid "Video preview"
+msgid "Preview"
+msgstr "Priekšskatījums"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Zvanīt atkal"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Sūtīt audio"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Sūtīt video"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Pārslēgt audio pārraidi"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Video priekšskatījums"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "V_ideo"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Zvanīt"
+#: ../src/empathy-call-window.ui.h:14
+#| msgid "Video input"
+msgid "Video Off"
+msgstr "Izslēgt video"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:15
+#| msgid "Video input"
+msgid "Video On"
+msgstr "Ieslēgt video"
+
+#: ../src/empathy-call-window.ui.h:16
+#| msgid "Video preview"
+msgid "Video Preview"
+msgstr "Video priekšskatījums"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Skats"
-#: ../src/empathy-chat-window.c:560
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d nelasīts)"
+msgstr[1] "%s (%d nelasīti)"
+msgstr[2] "%s (%d nelasīti)"
+
+#: ../src/empathy-chat-window.c:448
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (un %u cits)"
+msgstr[1] "%s (un %u citi)"
+msgstr[2] "%s (un %u citi)"
+
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d nelasīts no citiem)"
+msgstr[1] "%s (%d nelasīti no citiem)"
+msgstr[2] "%s (%d nelasīti no citiem)"
+
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d nelasīts no visiem)"
+msgstr[1] "%s (%d nelasīti no visiem)"
+msgstr[2] "%s (%d nelasīti no visiem)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Raksta ziņojumu."
@@ -2232,70 +2752,80 @@ msgid "C_lear"
msgstr "At_tīrīt"
#: ../src/empathy-chat-window.ui.h:2
+#| msgid "Contact"
+msgid "C_ontact"
+msgstr "K_ontakts"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Tērzēšana"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Ievietot _smaidiņu"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Ielūgt _dalībnieku..."
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Pārvietot ci_lni pa kreisi"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Pā_rvietot cilni pa labi"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Kontakts"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Saturs"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Saruna"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "At_dalīt cilni"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "R_ediģēt"
+
+#: ../src/empathy-chat-window.ui.h:12
+#| msgid "_Favorite Chatroom"
+msgid "_Favorite Chat Room"
msgstr "_Iecienītā tērzēšanas istaba"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Palīdzība"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Nākamā cilne"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "_Iepriekšējā cilne"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Rādīt kontaktu _sarakstu"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Cilnes"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Nosaukums"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Istaba"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Automātiski savienoties"
@@ -2303,75 +2833,77 @@ msgstr "Automātiski savienoties"
msgid "Manage Favorite Rooms"
msgstr "Pārvaldīt iecienītās istabas"
-#: ../src/empathy-event-manager.c:330
+#: ../src/empathy-event-manager.c:339
+#| msgid "Incoming voice call"
+msgid "Incoming video call"
+msgstr "Ienākošs video zvans"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Ienākošais zvans"
-#: ../src/empathy-event-manager.c:333
-#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s jums zvana, vai vēlaties atbildēt?"
+#: ../src/empathy-event-manager.c:343, c-format
+#| msgid "%s is calling you, do you want to answer?"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s piedāvā video zvanu. Vai vēlaties atbildēt?"
+
+#: ../src/empathy-event-manager.c:344, c-format
+#| msgid "%s is calling you, do you want to answer?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s jums zvana. Vai vēlaties atbildēt?"
-#: ../src/empathy-event-manager.c:340
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "No_raidīt"
-#: ../src/empathy-event-manager.c:346
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Atbildēt"
-#: ../src/empathy-event-manager.c:455
+#: ../src/empathy-event-manager.c:489, c-format
+#| msgid "Incoming call from %s"
+msgid "Incoming video call from %s"
+msgstr "Ienākošais video zvans no %s"
+
+#: ../src/empathy-event-manager.c:489
#, c-format
msgid "Incoming call from %s"
msgstr "Ienākošais zvans no %s"
-#: ../src/empathy-event-manager.c:499
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s jums piedāvā ielūgumu"
-
-#: ../src/empathy-event-manager.c:505
-msgid "An external application will be started to handle it."
-msgstr "Tiks palaista ārējā lietotne, lai ar to apietos."
-
-#: ../src/empathy-event-manager.c:510
-msgid "You don't have the needed external application to handle it."
-msgstr "Jums nav vajadzīgās ārējās lietotnes, lai ar to apietos."
-
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Istabas ielūgums"
-#: ../src/empathy-event-manager.c:641
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s jūs ielūdz pievienoties %s"
-#: ../src/empathy-event-manager.c:649
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "Norai_dīt"
-#: ../src/empathy-event-manager.c:654
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Pievienoties"
-#: ../src/empathy-event-manager.c:693
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s jūs ielūdza pievienoties %s"
-#: ../src/empathy-event-manager.c:719
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Pienāk fails no %s"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "%s prasa pierakstīšanās atļauju"
-#: ../src/empathy-event-manager.c:903
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2381,117 +2913,117 @@ msgstr ""
"Ziņojums: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s tagad ir nesaistē."
#. someone is logging in
-#: ../src/empathy-event-manager.c:959
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s tagad ir tiešsaistē."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../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:105
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:181
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Nezināms"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s no %s ar ātrumu %s/s"
-#: ../src/empathy-ft-manager.c:277
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s no %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Saņem \"%s\" no %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:311
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Sūta \"%s\" lietotājam %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Kļūda, saņemot \"%s\" no %s"
-#: ../src/empathy-ft-manager.c:344
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Kļūda, saņemot failu"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Kļūda, sūtot \"%s\" lietotājam %s"
-#: ../src/empathy-ft-manager.c:352
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Kļūda, sūtot failu"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:491
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" saņemts no %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" aizsūtīts lietotājam %s"
-#: ../src/empathy-ft-manager.c:499
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Faila pārsūtīšana pabeigta"
-#: ../src/empathy-ft-manager.c:618 ../src/empathy-ft-manager.c:785
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Gaida otra dalībnieka atbildi"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Pārbauda \"%s\" integritāti"
-#: ../src/empathy-ft-manager.c:647 ../src/empathy-ft-manager.c:685
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Jauc \"%s\""
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1053
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Fails"
-#: ../src/empathy-ft-manager.c:1075
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Atlicis"
@@ -2529,72 +3061,31 @@ msgstr "Protokols"
msgid "Source"
msgstr "Avots"
-#: ../src/empathy-import-mc4-accounts.c:106, c-format
-#| msgid "Account"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
msgid "%s account"
msgstr "%s konts"
-#: ../src/empathy-main-window.c:401
-msgid "_Edit account"
-msgstr "R_ediģēt kontu"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Kļūda netika norādīta"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Tīkla kļūda"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Neveiksmīga autentifikācija"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Šifrēšanas kļūda"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Vārds jau ir aizņemts"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Nav sertifikāta"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Neuzticams sertifikāts"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Sertifikāts izbeidzies"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Sertifikāts nav aktivizēts"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Sertifikātu servera nosaukumu nesakritība"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Sertifikāta digitālo nospiedumu nesakritība"
+#: ../src/empathy-main-window.c:433
+#| msgid "Disconnected"
+msgid "Reconnect"
+msgstr "Savienoties atkal"
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Sertifikāts ir pašparakstīts"
+#: ../src/empathy-main-window.c:439
+#| msgid "_Edit account"
+msgid "Edit Account"
+msgstr "Rediģēt kontu"
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Sertifikāta kļūda"
+#: ../src/empathy-main-window.c:445
+#| msgid "Clean"
+msgid "Close"
+msgstr "Aizvērt"
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Nezināma kļūda"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Kontakts"
-#: ../src/empathy-main-window.c:1337
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Rādīt un labot kontus"
@@ -2622,75 +3113,89 @@ msgstr "Pārvaldīt iecienītās"
msgid "N_ormal Size"
msgstr "N_ormāls izmērs"
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr "Normāls izmērs ar _iemiesojumiem"
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Jauns _zvans..."
#: ../src/empathy-main-window.ui.h:8
+msgid "Normal Size With _Avatars"
+msgstr "Normāls izmērs ar _attēliem"
+
+#: ../src/empathy-main-window.ui.h:9
+#| msgid "Preferences"
+msgid "P_references"
+msgstr "_Iestatījumi"
+
+#: ../src/empathy-main-window.ui.h:10
+#| msgid "Protocol"
+msgid "Show P_rotocols"
+msgstr "_Rādīt protokolus"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Kārtot pēc _vārda"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Kārtot pēc _statusa"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Konti"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Kompakts izmērs"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Atkļūdot"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "_Failu pārsūtīšana"
-#: ../src/empathy-main-window.ui.h:19
-#| msgid "Join"
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:22
+#| msgid "_Join"
+msgid "_Join…"
msgstr "_Pievienoties..."
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#| msgid "New Conversation"
+msgid "_New Conversation…"
msgstr "Jau_na saruna..."
-#: ../src/empathy-main-window.ui.h:21
-#| msgid "New Contact"
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "Nesaistes k_ontakti"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Personīgā informācija"
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Iestatījumi"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Istaba"
-#: ../src/empathy-new-chatroom-dialog.c:328
-#| msgid "Chat"
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Tērzēšanas istaba"
-#: ../src/empathy-new-chatroom-dialog.c:344
-#| msgid "Themes"
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Dalībnieki"
-#: ../src/empathy-new-chatroom-dialog.c:494
-#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539, c-format
+#| msgctxt ""
+#| "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/"
+#| "no and a number."
+#| msgid ""
+#| "<b>%s</b>\n"
+#| "Invite required: %s\n"
+#| "Password required: %s\n"
+#| "Members: %s"
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2702,16 +3207,16 @@ msgstr ""
"Nepieciešama parole: %s\n"
"Dalībnieki: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Nē"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Nevarēju palaist istabu izdruku"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Nevarēju apstādināt istabu izdruku"
@@ -2723,8 +3228,7 @@ msgstr "Nevarēju ielādēt istabu sarakstu"
msgid ""
"Enter the room name to join here or click on one or more rooms in the list."
msgstr ""
-"Ierakstiet šeit istabas vārdu, kurai pievienoties, vai klikšķiniet uz vienas "
-"vai vairākām istabām sarakstā."
+"Ierakstiet šeit istabas vārdu, kurai pievienoties, vai klikšķiniet sarakstā."
#: ../src/empathy-new-chatroom-dialog.ui.h:4
msgid ""
@@ -2735,12 +3239,10 @@ msgstr ""
"uz pašreizējā konta servera"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
-#| msgid "Room"
msgid "Join Room"
msgstr "Pievienoties istabai"
#: ../src/empathy-new-chatroom-dialog.ui.h:6
-#| msgid "Room"
msgid "Room List"
msgstr "Istabu saraksts"
@@ -2781,7 +3283,6 @@ msgid "Language"
msgstr "Valoda"
#: ../src/empathy-preferences.ui.h:1
-#| msgid "<b>Appearance</b>"
msgid "Appearance"
msgstr "Izskats"
@@ -2790,7 +3291,6 @@ msgid "Automatically _connect on startup "
msgstr "Automātiski _savienoties palaižoties "
#: ../src/empathy-preferences.ui.h:3
-#| msgid "<b>Behavior</b>"
msgid "Behavior"
msgstr "Uzvedība"
@@ -2826,11 +3326,6 @@ msgstr "Ieslēgt pareizrakstības pārbaudi valodai:"
msgid "General"
msgstr "Vispārīgi"
-#: ../src/empathy-preferences.ui.h:12
-#| msgid "Notifications"
-msgid "Location"
-msgstr "Vieta"
-
#: ../src/empathy-preferences.ui.h:13
msgid "Location sources:"
msgstr "Vietas avoti:"
@@ -2904,8 +3399,9 @@ msgid "_GPS"
msgstr "_GPS"
#: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "_Tīkls (IP, Wifi)"
+#| msgid "_Network (IP, Wifi)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Tīkls (IP, Wi-Fi)"
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
@@ -2919,100 +3415,79 @@ msgstr "_Parādīt kontaktiem atrašanās vietu"
msgid "_Reduce location accuracy"
msgstr "Samazināt atrašanās vietas p_recizitāti"
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:176
msgid "Respond"
msgstr "Atbildēt"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Statuss"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "_Iziet"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Nevar palaist lietotni servisam %s: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Tika piedāvāts ielūgums servisam %s, bet jums nav vajadzīgās lietotnes, kura "
-"varētu to apieties"
-
#: ../src/empathy-map-view.ui.h:1
-#| msgid "Contact List"
msgid "Contact Map View"
msgstr "Kontaktu kartes skats"
-#: ../src/empathy-debug-window.c:1042
-#| msgid "Server"
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Saglabāt"
-#: ../src/empathy-debug-window.c:1164
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Atkļūdošanas logs"
-#: ../src/empathy-debug-window.c:1243
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pauze"
-#: ../src/empathy-debug-window.c:1255
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
-msgstr "Līmenis"
+msgstr "Līmenis "
-#: ../src/empathy-debug-window.c:1275
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Atkļūdošanas"
-#: ../src/empathy-debug-window.c:1281
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "Informācijas"
-#: ../src/empathy-debug-window.c:1287 ../src/empathy-debug-window.c:1336
-#| msgid "Message:"
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "Paziņojuma"
-#: ../src/empathy-debug-window.c:1293
-#| msgid "Remaining"
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "Brīdinājuma"
-#: ../src/empathy-debug-window.c:1299
-#| msgid "Croatian"
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "Kritiskais"
-#: ../src/empathy-debug-window.c:1305
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "Kļūdas"
-#: ../src/empathy-debug-window.c:1324
-#| msgid "Simple"
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Laiks"
-#: ../src/empathy-debug-window.c:1327
-#| msgid "Romanian"
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domēns"
-#: ../src/empathy-debug-window.c:1329
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Kategorija"
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Līmenis"
-#: ../src/empathy-debug-window.c:1363
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3020,24 +3495,145 @@ msgstr ""
"Izvēlētais savienojumu pārvaldnieks neatbalsta attālināto atkļūdošanas "
"paplašinājumu."
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Ielūgt dalībnieku"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Izvēlieties kontaktu, ko aicināt uz sarunu:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Nerādīt nekādus dialogus; izdarīt darāmo (piemēram, importēšanu) un iziet"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Nerādīt nekādus dialogus, ja ir ne-salut konti"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Sākumā izvēlēties doto kontu (piemēram, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+#| msgid "account"
+msgid "<account-id>"
+msgstr "<konta-ID>"
+
+#: ../src/empathy-accounts.c:231
+#| msgid "Import Accounts"
+msgid "- Empathy Accounts"
+msgstr " - Empathy konti"
+
+#: ../src/empathy-accounts.c:247
+#| msgid "Accounts"
+msgid " Accounts"
+msgstr " Konti"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Salut konts ir izveidots"
+
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr "Vai Salut konts ir izveidots, pirmo reizi palaižot Empathy."
+
+#~ msgid "Hidden"
+#~ msgstr "Slēpts"
+
+#~| msgid "<b>Behavior</b>"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>Vieta</b>"
+
+#~ msgid "Email:"
+#~ msgstr "E-pasts:"
+
+#~ msgid "C_all"
+#~ msgstr "Zv_anīt"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "Labot pielāgotos ziņojumus..."
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "Rādīt kontu dialogu"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "Kļūdas ziņojums bija: <span style=\"italic\">%s</span>"
+
+#~| msgid "_Next Tab"
+#~ msgid "_Next"
+#~ msgstr "_Nākamais"
+
+#~ msgid "Add new"
+#~ msgstr "Jauns konts"
+
+#~ msgid "Cr_eate"
+#~ msgstr "Izv_eidot"
+
+#~| msgid "_Add Contact..."
+#~ msgid "_Add..."
+#~ msgstr "_Pievienot..."
+
+#~| msgid "Import"
+#~ msgid "_Import..."
+#~ msgstr "_Importēt..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "Atkā_rtoti izmantot esošu kontu"
+
+#~ msgid "_Contact"
+#~ msgstr "_Kontakts"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s jums piedāvā ielūgumu"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "Tiks palaista ārējā lietotne, lai ar to apietos."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "Jums nav vajadzīgās ārējās lietotnes, lai ar to apietos."
+
+#~ msgid "No error specified"
+#~ msgstr "Kļūda netika norādīta"
+
+#~ msgid "Unknown error"
+#~ msgstr "Nezināma kļūda"
+
+#~| msgid "Join"
+#~ msgid "_Join..."
+#~ msgstr "_Pievienoties..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "Jau_na saruna..."
+
+#~ msgid "_Preferences"
+#~ msgstr "_Iestatījumi"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "Nevar palaist lietotni servisam %s: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "Tika piedāvāts ielūgums servisam %s, bet jums nav vajadzīgās lietotnes, "
+#~ "kura varētu to apieties"
+
#~ msgid "Word"
#~ msgstr "Vārds"
#~ msgid "Spell Checker"
#~ msgstr "Pareizrakstības pārbaudītājs"
-#~ msgid "_About"
-#~ msgstr "P_ar"
-
#~ msgid "_Information"
#~ msgstr "_Informācija"
#~ msgid "Presence"
#~ msgstr "Klātbūtne"
-#~ msgid "Invite"
-#~ msgstr "Uzaicināt"
-
#~ msgid "S_erver:"
#~ msgstr "S_erveris:"
diff --git a/po/pa.po b/po/pa.po
index bd578d5e7..d8f2e8efa 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,10 +8,10 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-01-11 12:12+0000\n"
-"PO-Revision-Date: 2010-01-12 08:33+0530\n"
+"POT-Creation-Date: 2010-03-04 17:00+0000\n"
+"PO-Revision-Date: 2010-03-09 07:16+0530\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: ਪੰਜਾਬੀ <punjabi-users@lists.sf.net>\n"
+"Language-Team: l10n-kde4-stable <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -52,8 +52,6 @@ msgid "Chat window theme"
msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
#: ../data/empathy.schemas.in.h:4
-#| msgid ""
-#| "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
@@ -66,7 +64,6 @@ msgid "Connection managers should be used"
msgstr "ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
#: ../data/empathy.schemas.in.h:7
-#| msgid "Contact list sort criterium"
msgid "Contact list sort criterion"
msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
@@ -155,12 +152,10 @@ msgid "Open new chats in separate windows"
msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
#: ../data/empathy.schemas.in.h:29
-#| msgid "Path of the adium theme to use"
msgid "Path of the Adium theme to use"
msgstr "ਵਰਤਣ ਵਾਸਤੀ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
#: ../data/empathy.schemas.in.h:30
-#| msgid "Path of the adium theme to use if the theme used for chat is adium."
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ।"
@@ -193,221 +188,160 @@ msgid "Play a sound when we log out"
msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
#: ../data/empathy.schemas.in.h:38
-#| msgid "Popup notifications if the chat isn't focused"
msgid "Pop up notifications if the chat isn't focused"
msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
#: ../data/empathy.schemas.in.h:39
-#| msgid "Popup notifications when a contact sign in"
msgid "Pop up notifications when a contact logs in"
msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
#: ../data/empathy.schemas.in.h:40
-#| msgid "Popup notifications when a contact sign out"
msgid "Pop up notifications when a contact logs out"
msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "ਸਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "ਅਵਤਾਰ ਵੇਖੋ"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
-#: ../data/empathy.schemas.in.h:46
-#| msgid "Protocol"
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
-#: ../data/empathy.schemas.in.h:54
-#| msgid ""
-#| "Whether or not Empathy can publish the user's location to his contacts."
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
-#: ../data/empathy.schemas.in.h:55
-#| msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
-#: ../data/empathy.schemas.in.h:56
-#| msgid ""
-#| "Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
-#: ../data/empathy.schemas.in.h:57
-#| msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
-#: ../data/empathy.schemas.in.h:58
-#| msgid ""
-#| "Whether or not Empathy has asked about importing accounts from other "
-#| "programs."
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ।"
-#: ../data/empathy.schemas.in.h:59
-#| msgid ""
-#| "Whether or not Empathy should automatically log in to your accounts on "
-#| "startup."
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
-#: ../data/empathy.schemas.in.h:60
-#| msgid ""
-#| "Whether or not Empathy should reduce the location's accuracy for privacy "
-#| "reasons."
+#: ../data/empathy.schemas.in.h:59
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ।"
-#: ../data/empathy.schemas.in.h:61
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "ਕੀ ਇੰਪੈਂਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
-#: ../data/empathy.schemas.in.h:63
-#| msgid ""
-#| "Whether or not connectivity managers should be used to automatically "
-#| "disconnect/reconnect."
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "ਕੀ ਕੁਨੈਕੁਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕੁਨੈਕਟ/ਮੁੜ-ਕੁਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:64
-#| msgid ""
-#| "Whether or not the Salut account has been created on the first Empathy "
-#| "run."
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "ਕੀ ਪਹਿਲੀ ਵਾਰ ਇੰਪੈਂਥੀ ਚਲਾਉਣ ਲਈ ਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾਵੇ"
-
-#: ../data/empathy.schemas.in.h:65
-#| msgid ""
-#| "Whether or not to check words typed against the languages you want to "
-#| "check with."
+#: ../data/empathy.schemas.in.h:63
msgid "Whether to check words typed against the languages you want to check with."
msgstr "ਕੀ ਜਦੋਂ ਤੁਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:66
-#| msgid ""
-#| "Whether or not to convert smileys into graphical images in conversations."
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:67
-#| msgid ""
-#| "Whether or not to play a sound to notify for contacts logging in the "
-#| "network."
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:68
-#| msgid ""
-#| "Whether or not to play a sound to notify for contacts logging off the "
-#| "network."
+#: ../data/empathy.schemas.in.h:66
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:69
-#| msgid "Whether or not to play a sound to notify for events."
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:70
-#| msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "ਕੀ ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:71
-#| msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:72
-#| msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:73
-#| msgid "Whether or not to play a sound when logging in a network."
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:74
-#| msgid "Whether or not to play a sound when logging off a network."
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
-#: ../data/empathy.schemas.in.h:75
-#| msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
-#: ../data/empathy.schemas.in.h:76
-#| msgid ""
-#| "Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
-#: ../data/empathy.schemas.in.h:77
-#| msgid ""
-#| "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
-#: ../data/empathy.schemas.in.h:78
-#| msgid ""
-#| "Whether or not to show a popup notification when receiving a new message "
-#| "even if the chat is already opened, but not focused."
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -415,66 +349,45 @@ msgstr ""
"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
-#: ../data/empathy.schemas.in.h:79
-#| msgid ""
-#| "Whether or not to show a popup notification when receiving a new message."
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ।"
-#: ../data/empathy.schemas.in.h:80
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
+#: ../data/empathy.schemas.in.h:78
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਏ ਜਾਣ।"
-#: ../data/empathy.schemas.in.h:81
-#| msgid ""
-#| "Whether or not to show contacts that are offline in the contact list."
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਏ ਜਾਣ"
-#: ../data/empathy.schemas.in.h:82
-#| msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
-#: ../data/empathy.schemas.in.h:83
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾਏ ਜਾਣ।"
-#: ../data/empathy.schemas.in.h:84
-#| msgid "Whether or not to show the contact list in chat rooms."
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
-#: ../data/empathy.schemas.in.h:85
-#| msgid "Whether to show the contact list in compact mode or not."
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
-#: ../data/empathy.schemas.in.h:86
-#| msgid ""
-#| "Whether or not to show the message dialog about closing the main window "
-#| "with the 'x' button in the title bar."
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸੁਨੇਹਾ ਡਾਈਲਾਗ ਵੇਖਾਇਆ ਜਾਵੇ।"
-#: ../data/empathy.schemas.in.h:87
-#| msgid "Whether to use the theme for chat rooms or not."
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
-#: ../data/empathy.schemas.in.h:88
-#| msgid ""
-#| "Which criterium to use when sorting the contact list. Default is to use "
-#| "sort by the contact's name with the value \"name\". A value of \"state\" "
-#| "will sort the contact list by state."
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -483,23 +396,33 @@ msgstr ""
"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ ਸੰਪਰਕ "
"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
+
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "ਮਿਲੀ ਫਾਇਲ ਅਤੇ ਭੇਜੀ ਦਾ ਹੈਸ਼ ਰਲਦਾ ਨਹੀਂ ਹੈ"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "ਚੁਣੀ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "ਚੁਣੀ ਫਾਇਲ ਖਾਲੀ ਹੈ"
-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "ਨੇੜਲੇ ਲੋਕ"
@@ -548,22 +471,22 @@ msgid "Away"
msgstr "ਦੂਰ"
#: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
-msgstr "ਓਹਲੇ"
+#| msgid "Invite"
+msgid "Invisible"
+msgstr "ਅਦਿੱਖ"
#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "ਆਫਲਾਈਨ"
#: ../libempathy/empathy-utils.c:286
-#| msgid "No reason was specified"
msgid "No reason specified"
msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
#: ../libempathy/empathy-utils.c:288
-#| msgid "%s has disconnected"
-msgid "User requested disconnect"
-msgstr "ਯੂਜ਼ਰ ਨੇ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੀ ਮੰਗ ਕੀਤੀ"
+#| msgid "%s is now offline."
+msgid "Status is set to offline"
+msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤਾ"
#: ../libempathy/empathy-utils.c:290
msgid "Network error"
@@ -613,15 +536,15 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"
msgid "Certificate error"
msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
-#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "ਨੇੜਲੇ ਲੋਕ"
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "ਫੇਸਬੁੱਕ ਚੈਟ"
@@ -671,22 +594,26 @@ msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
msgid "in the future"
msgstr "ਭਵਿੱਖ ਵਿੱਚ"
-#: ../libempathy-gtk/empathy-account-chooser.c:450
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "ਸਭ"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1320
-#| msgid "_Join"
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+#| msgid "_Username:"
+msgid "Username:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "ਲਾਗਇਨ(_o)"
-#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -694,16 +621,15 @@ msgstr "ਲਾਗਇਨ(_o)"
msgid "Account:"
msgstr "ਅਕਾਊਂਟ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "ਚਾਲੂ"
-#: ../libempathy-gtk/empathy-account-widget.c:1460
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../libempathy-gtk/empathy-account-widget.c:1463
-#| msgid "_Create a new account"
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
@@ -712,24 +638,23 @@ msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1846
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1864
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s ਅਕਾਊਂਟ"
-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
msgid "<b>Example:</b> MyScreenName"
msgstr "<b>ਜਿਵੇਂ:</b> MyScreenName"
@@ -770,7 +695,7 @@ msgstr "ਤੁਹਾਡਾ AIM ਸਕਰੀਨ ਨਾਂ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -779,7 +704,7 @@ msgstr "ਪੋਰਟ(_P):"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -788,7 +713,6 @@ msgstr "ਸਰਵਰ(_S):"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> username</span>"
msgid "<b>Example:</b> username"
msgstr "<b>ਜਿਵੇਂ ਕਿ:</b> username"
@@ -807,7 +731,6 @@ msgid "What is your GroupWise password?"
msgstr "ਤੁਹਾਡਾ ਗਰੁੱਪਵਾਈਜ਼ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
msgid "<b>Example:</b> 123456789"
msgstr "<b>ਜਿਵੇਂ:</b> 123456789"
@@ -825,7 +748,6 @@ msgstr "ਤੁਹਾਡਾ ICQ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-#| msgid "_Charset:"
msgid "_Character set:"
msgstr "ਅੱਖਰ ਸੈੱਟ(_C):"
@@ -835,7 +757,6 @@ msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ"
#: ../libempathy-gtk/empathy-account-widget-sip.c:184
#: ../libempathy-gtk/empathy-account-widget-sip.c:217
-#| msgid "_About"
msgid "Auto"
msgstr "ਆਟੋ"
@@ -854,7 +775,6 @@ 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:222
-#| msgid "Western"
msgid "Register"
msgstr "ਰਜਿਸਟਰ"
@@ -865,12 +785,10 @@ msgid "Options"
msgstr "ਚੋਣਾਂ"
#: ../libempathy-gtk/empathy-account-widget-sip.c:230
-#| msgid "No"
msgid "None"
msgstr "ਕੋਈ ਨਹੀਂ"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#| msgid "Charset:"
msgid "Character set:"
msgstr "ਅੱਖਰ ਸੈੱਟ:"
@@ -903,12 +821,10 @@ msgid "Servers"
msgstr "ਸਰਵਰ"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>ਜਿਵੇਂ:</b> user@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#| msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>ਜਿਵੇਂ:</b> user@jabber.org"
@@ -925,48 +841,68 @@ msgid "Reso_urce:"
msgstr "ਸਰੋਤ(_u):"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"ਇਹ ਤੁਹਾਡਾ ਯੂਜ਼ਰ ਨਾਂ ਹੈ, ਤੁਹਾਡਾ ਸਧਾਰਨ ਫੇਸਬੁੱਕ ਲਾਗਇਨ ਨਹੀਂ।\n"
+"ਜੇ ਤੁਸੀਂ facebook.com/<b>badger</b> ਹੋ ਤਾਂ <b>badger</b> ਦਿਓ।\n"
+"ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਨਹੀਂ ਹੈ ਤਾਂ ਇਹ ਚੁਣਨ ਵਾਸਤੇ "
+"<a href=\"http://www.facebook.com/username/\">ਇਹ ਪੇਜ਼</a> ਵਰਤੋਂ।"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "ਪੁਰਾਣੀ SS_L ਵਰਤੋਂ"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#| msgid "What is your Yahoo! password?"
+msgid "What is your Facebook password?"
+msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#| msgid "What is your Windows Live user name?"
+msgid "What is your Facebook username?"
+msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਚਾਹੀਦੀ ਹੈ (TLS/SSL)(_E)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ(_I)"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>ਜਿਵੇਂ:</b> user@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#| msgid "What is your Windows Live password?"
msgid "What is your Windows Live ID?"
msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ID ਕੀ ਹੈ?"
@@ -975,7 +911,6 @@ msgid "What is your Windows Live password?"
msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#| msgid "_Email:"
msgid "_E-mail address:"
msgstr "ਈਮੇਲ ਐਡਰੈੱਸ(_E):"
@@ -1000,27 +935,24 @@ msgid "_Published Name:"
msgstr "ਪਰਕਾਸ਼ਿਤ ਕੀਤਾ ਨਾਂ(_P):"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
msgid "<b>Example:</b> user@my.sip.server"
msgstr "<b>ਜਿਵੇਂ:</b> user@my.sip.server"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-#| msgid "Authentication failed"
msgid "Authentication username:"
msgstr "ਪਰਮਾਣਕਿਤ ਯੂਜ਼ਰਨਾਂ:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#| msgid "Discover STUN"
msgid "Discover Binding"
msgstr "ਬਾਈਡਿੰਗ ਖੋਜ"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "STUN ਸਰਵਰ ਆਟੋਮੈਟਿਕ ਹੀ ਲੱਭੋ"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "Hostname of the proxy for outbound requests."
-msgstr ""
+msgstr "ਆਉਟਬਾਊਂਡ ਮੰਗ ਲਈ ਪਰਾਕਸੀ ਦਾ ਹੋਸਟ-ਨਾਂ।"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
@@ -1054,10 +986,9 @@ msgstr "NAT ਟਰਾਂਸਵਰਸਲ ਚੋਣਾਂ"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Port of the proxy for outbound requests."
-msgstr ""
+msgstr "ਆਉਟਬਾਊਂਡ ਮੰਗ ਲਈ ਪਰਾਕਸੀ ਲਈ ਪੋਰਟ।"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#| msgid "_Port:"
msgid "Port:"
msgstr "ਪੋਰਟ:"
@@ -1070,7 +1001,6 @@ msgid "STUN Server:"
msgstr "STUN ਸਰਵਰ:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#| msgid "_Server:"
msgid "Server:"
msgstr "ਸਰਵਰ:"
@@ -1079,9 +1009,10 @@ msgid ""
"The username for SIP authentication, if different from the SIP URI\n"
"username."
msgstr ""
+"SIP ਪਰਮਾਣਕਿਤਾ ਲਈ ਯੂਜ਼ਰ ਨਾਂ, ਜੇ SIP URI ਯੂਜ਼ਰ ਨਾਂ ਤੋਂ ਵੱਖਰਾ ਹੈ\n"
+"ਤਾਂ।"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#| msgid "STUN port:"
msgid "Transport:"
msgstr "ਟਰਾਂਸਪੋਰਟ:"
@@ -1110,7 +1041,6 @@ msgid "_Username:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#| msgid "Use _Yahoo Japan"
msgid "Use _Yahoo! Japan"
msgstr "ਯਾਹੂ! ਜਾਪਾਨ ਵਰਤੋਂ(_Y)"
@@ -1123,12 +1053,10 @@ msgid "What is your Yahoo! password?"
msgstr "ਤੁਹਾਡਾ ਯਾਹੂ! ਪਾਸਵਰਡ ਕੀ ਹੈ?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#| msgid "Yahoo I_D:"
msgid "Yahoo! I_D:"
msgstr "ਯਾਹੂ! I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-#| msgid "_Ignore conference and chatroom invitations"
msgid "_Ignore conference and chat room invitations"
msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ(_I)"
@@ -1142,7 +1070,6 @@ msgid "Couldn't convert image"
msgstr "ਚਿੱਤਰ ਨਾ ਬਦਲੋ"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-#| msgid "None of the accepted image formats is supported on your system"
msgid "None of the accepted image formats are supported on your system"
msgstr "ਕੋਈ ਵੀ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਚਿੱਤਰ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਸਿਸਟਮ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
@@ -1166,146 +1093,146 @@ msgstr "ਸਭ ਫਾਇਲਾਂ"
msgid "Click to enlarge"
msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:199
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "ਇਸ ਗੱਲ ਨਾਲ ਫੇਰ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ"
-#: ../libempathy-gtk/empathy-chat.c:621
-#| msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "ਗੱਲਬਾਤ-ਰੂਮ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
-#: ../libempathy-gtk/empathy-chat.c:639
-#| msgid "Failed to reconnect this chat"
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
-#: ../libempathy-gtk/empathy-chat.c:678
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "ਇਹ ਗੱਲਬਾਤ ਲਈ ਵਿਸ਼ਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "ਤੁਹਾਨੂੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ"
-#: ../libempathy-gtk/empathy-chat.c:813
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
-msgstr ""
+msgstr "/clear: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਸਾਫ਼ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:816
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
-msgstr ""
+msgstr "/topic <topic>: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
-msgstr ""
+msgstr "/join <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
-msgstr ""
+msgstr "/j <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr ""
+msgstr "/query <contact ID> [<message>]: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
-msgstr ""
+msgstr "/msg <contact ID> <message>: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
-msgstr ""
+msgstr "/nick <nickname>: ਮੌਜੂਦਾ ਸਰਵਰ ਉੱਤੇ ਆਪਣਾ ਨਾਂ ਬਦਲੋ"
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <message>:ਇੱਕ ਐਕਸ਼ਨ ਸੁਨੇਹਾ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਭੇਜੋ"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:871
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 ""
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:852, c-format
-#| msgid ""
-#| "\n"
-#| "Message: %s"
+#: ../libempathy-gtk/empathy-chat.c:886
+#, c-format
msgid "Usage: %s"
msgstr "ਵਰਤੋਂ: %s"
-#: ../libempathy-gtk/empathy-chat.c:881
-#| msgid "Unknown reason"
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
-#: ../libempathy-gtk/empathy-chat.c:1002
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
-msgstr ""
+msgstr "ਅਣਜਾਣ ਕਮਾਂਡ; ਉਪਲੱਬਧ ਕਮਾਂਡ ਵਾਸਤੇ ਮੱਦਦ ਲਈ /help ਵਰਤੋਂ"
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "ਆਫਲਾਈਨ"
-#: ../libempathy-gtk/empathy-chat.c:1144
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "ਗਲਤ ਸੰਪਰਕ"
-#: ../libempathy-gtk/empathy-chat.c:1147
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
-#: ../libempathy-gtk/empathy-chat.c:1150
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "ਬਹੁਤ ਲੰਮਾ ਸੁਨੇਹਾ"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "ਸਥਾਪਤ ਨਹੀਂ"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "ਅਣਜਾਣ"
-#: ../libempathy-gtk/empathy-chat.c:1160
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
-#: ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
-#: ../libempathy-gtk/empathy-chat.c:1642
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1660
-#: ../libempathy-gtk/empathy-ui-utils.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1622
msgid "_Send"
msgstr "ਭੇਜੋ(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1694
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "ਸਪੈਲਿੰਗ ਸੁਝਾਅ(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1829
+#| msgid "Failed to open private chat"
+msgid "Failed to retrieve recent logs"
+msgstr "ਤਾਜ਼ਾ ਲਾਗ ਲੈਣ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
@@ -1313,12 +1240,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:1816
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s ਨੇ %1$s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
-#: ../libempathy-gtk/empathy-chat.c:1819
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
@@ -1326,17 +1253,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:1827
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s ਵਲੋਂ %1$s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
-#: ../libempathy-gtk/empathy-chat.c:1830
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
@@ -1346,81 +1273,81 @@ msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1843
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
-#: ../libempathy-gtk/empathy-chat.c:1893, c-format
-#| msgid "%s is now online."
+#: ../libempathy-gtk/empathy-chat.c:2044
+#, c-format
msgid "%s is now known as %s"
msgstr "%s ਨੂੰ ਹੁਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
-#: ../libempathy-gtk/empathy-chat.c:2028 ../src/empathy-call-window.c:1537
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
-#: ../libempathy-gtk/empathy-chat.c:2556
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
-#: ../libempathy-gtk/empathy-chat.c:2561
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਹੈ:"
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "ਦਾਖਲ"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
-#: ../libempathy-gtk/empathy-chat.c:2755
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "ਗੱਲਬਾਤ"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "ਵਿਸ਼ਾ:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "ਨਵਾਂ ਸੰਪਰਕ"
@@ -1432,81 +1359,80 @@ msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
msgid "Subscription Request"
msgstr "ਮੈਂਬਰੀ ਮੰਗ"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1510
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1512
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
msgid "Removing group"
msgstr "ਗਰੁੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1559
-#: ../libempathy-gtk/empathy-contact-list-view.c:1636
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "ਹਟਾਓ(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1589
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1591
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
msgid "Removing contact"
msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
-#| msgid "_Add Contact..."
msgid "_Add Contact…"
msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "ਗੱਲਬਾਤ(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "ਆਡੀਓ ਕਾਲ(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "ਫਾਇਲ ਭੇਜੋ"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "ਜਾਣਕਾਰੀ(_m)"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+#| msgid "_Edit"
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "ਸੋਧ(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../src/empathy-chat-window.c:864
-#| msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "ਇਸ ਰੂਮ ਲਈ ਤੁਹਾਨੂੰ ਸੱਦਾ"
-#: ../libempathy-gtk/empathy-contact-menu.c:527
-#| msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
@@ -1514,132 +1440,132 @@ msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
msgid "Select a contact"
msgstr "ਸੰਪਰਕ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-contact-widget.c:449
-msgid "Save Avatar"
-msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:505
-msgid "Unable to save avatar"
-msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1028
-#: ../src/empathy-main-window.c:1038
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "ਗਰੁੱਪ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "ਦੇਸ਼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "ਹਾਲਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "ਸ਼ਹਿਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1287
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "ਏਰੀਆ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1289
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "ਡਾਕ ਕੋਡ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "ਗਲੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1293
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "ਇਮਾਰਤ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1295
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "ਮੰਜ਼ਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1297
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "ਘਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1299
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "ਟੈਕਸਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1301
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "ਵੇਰਵਾ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1303
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1305
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "ਸ਼ੁੱਧਤਾ ਲੈਵਲ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1307
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "ਗਲਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1309
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1311
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1313
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1315
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "ਬੀਰਿੰਗ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1317
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "ਚੜ੍ਹਨ ਗਤੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1319
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1321
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "ਲੰਬਕਾਰੀ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1323
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "ਵਿਥਕਾਰ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1325
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "ਉਚਾਈ:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1387
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ਟਿਕਾਣਾ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1403
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>ਟਿਕਾਣਾ</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:1453
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%R UTC %e %B %Y ਨੂੰ"
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+msgid "Save Avatar"
+msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+msgid "Unable to save avatar"
+msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
@@ -1661,42 +1587,36 @@ msgid "Client:"
msgstr "ਕਲਾਇਟ:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1021
-msgid "Contact"
-msgstr "ਸੰਪਰਕ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "E-mail address:"
msgstr "ਈਮੇਲ ਐਡਰੈੱਸ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-#| msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
msgid "Full name:"
msgstr "ਪੂਰਾ ਨਾਂ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "ਗਰੁੱਪ"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "ਪਛਾਣਕਰਤਾ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-#| msgid "Information requested..."
-msgid "Information requested…"
-msgstr "ਜਾਣਕਾਰੀ ਮੰਗੀ ਗਈ..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#| msgid "Information requested…"
+msgid "Information requested&#x2026;"
+msgstr "ਮੰਗੀ ਗਈ ਜਾਣਕਾਰੀ&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "OS:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1704,16 +1624,15 @@ msgstr ""
"ਗਰੁੱਪ ਚੁਣੋ, ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਤੁਸੀਂ ਇੱਕ ਤੋਂ ਵੱਧ ਗਰੁੱਪ ਜਾਂ ਕੋਈ "
"ਗਰੁੱਪ ਨਹੀਂ ਵੀ ਚੁਣ ਸਕਦੇ ਹੋ।"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "ਵਰਜਨ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-#| msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
msgid "Website:"
msgstr "ਵੈੱਬਸਾਈਟ:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ(_A)"
@@ -1733,12 +1652,12 @@ msgstr "ਪੋਰਟ"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "ਅਕਾਊਂਟ"
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "ਮਿਤੀ"
@@ -1774,7 +1693,6 @@ msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
#. add video toggle
#: ../libempathy-gtk/empathy-new-call-dialog.c:188
-#| msgid "Send video"
msgid "Send _Video"
msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
@@ -1786,7 +1704,6 @@ msgstr "ਕਾਲ ਕਰੋ(_C)"
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-call-dialog.c:206
-#| msgid "Call"
msgid "New Call"
msgstr "ਨਵੀਂ ਕਾਲ"
@@ -1796,40 +1713,50 @@ msgstr "ਨਵੀਂ ਕਾਲ"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
-#| msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹਾ..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
-#| msgid "Edit Custom Messages"
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ ਸੋਧੋ..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਵਜੋਂ ਹਟਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
-#| msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#| msgid "Hindi"
+msgid "Find:"
+msgstr "ਲੱਭੋ:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "ਮਿਲਦੇ ਕੇਸ"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
+
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਮਿਲਿਆ"
@@ -1902,15 +1829,15 @@ msgstr "ਸਾਫ਼"
msgid "Blue"
msgstr "ਨੀਲਾ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1519
+#: ../libempathy-gtk/empathy-ui-utils.c:1497
msgid "Unable to open URI"
msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1649
+#: ../libempathy-gtk/empathy-ui-utils.c:1614
msgid "Select a file"
msgstr "ਫਾਇਲ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1709
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
msgid "Select a destination"
msgstr "ਟਿਕਾਣਾ ਚੁਣੋ"
@@ -2082,17 +2009,14 @@ msgid "Vietnamese"
msgstr "ਵੀਅਤਨਾਮੀ"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-#| msgid "The selected file is not a regular file"
msgid "The selected contact cannot receive files."
msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਫਾਇਲਾਂ ਨਹੀਂ ਲੈ ਸਕਦਾ ਹੈ।"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-#| msgid "The selected file is empty"
msgid "The selected contact is offline."
msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ।"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
-#| msgid "too long message"
msgid "No error message"
msgstr "ਕੋਈ ਗਲਤੀ ਸੁਨੇਹਾ ਨਹੀਂ"
@@ -2100,24 +2024,19 @@ msgstr "ਕੋਈ ਗਲਤੀ ਸੁਨੇਹਾ ਨਹੀਂ"
msgid "Instant Message (Empathy)"
msgstr "ਤੁਰੰਤ ਸੁਨੇਹਾ (ਇੰਪੈਂਥੀ)"
-#: ../src/empathy.c:893
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਕੁਨੈਕਟ ਨਾ ਕਰੋ"
-#: ../src/empathy.c:897
-#| msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕੋਈ ਹੋਰ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
-#: ../src/empathy.c:901
-msgid "Show the accounts dialog"
-msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
-
-#: ../src/empathy.c:913
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- ਇੰਪੈਂਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -2128,7 +2047,7 @@ msgstr ""
"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ "
"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -2139,7 +2058,7 @@ msgstr ""
"ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ "
"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -2149,42 +2068,39 @@ msgstr ""
"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧੫੯, "
"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "ਗਨੋਮ ਲਈ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009, 2010\n"
"http://www.satluj.com/"
-#: ../src/empathy-account-assistant.c:118
-#| msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-#: ../src/empathy-account-assistant.c:121
-#| msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
msgstr "ਅਕਾਊਂਟ ਵੇਰਵਾ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-#: ../src/empathy-account-assistant.c:124
-#| msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-#: ../src/empathy-account-assistant.c:126
-#| msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
msgstr "ਗਲਤੀ ਆਈ ਹੈ।"
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "ਗਲਤੀ ਸੁਨੇਹਾ ਸੀ: <span style=\"italic\">%s</span>"
+#| msgid "No error message"
+msgid "The error message was: %s"
+msgstr "ਗਲਤੀ ਸੁਨੇਹਾ ਸੀ: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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."
@@ -2192,46 +2108,46 @@ msgstr ""
"ਤੁਸੀਂ ਜਾ ਕੇ ਆਪਣੇ ਅਕਾਊਂਟ ਵੇਰਵੇ ਵਿੱਚ ਆਪਣੇ ਵੇਰਵਾ ਲਈ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ ਸਹਾਇਕ ਬੰਦ ਕਰਕੇ "
"ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1292
msgid "An error occurred"
msgstr "ਗਲਤੀ ਆਈ"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:504
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:500
msgid "What kind of chat account do you have?"
msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:506
msgid "Do you have any other chat accounts you want to set up?"
msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:512
msgid "Enter your account details"
msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:517
msgid "What kind of chat account do you want to create?"
msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:523
msgid "Do you want to create other chat accounts?"
msgstr "ਕੀ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:530
msgid "Enter the details for the new account"
msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:645
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 "
@@ -2242,90 +2158,127 @@ msgstr ""
"ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ ਤੁਸੀਂ ਆਡੀਓ ਅਤੇ "
"ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:662
msgid "Do you have an account you've been using with another chat program?"
msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:685
msgid "Yes, import my account details from "
msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:706
msgid "Yes, I'll enter my account details now"
msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹੁਣ ਦੇਵਾਂਗਾ"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:728
msgid "No, I want a new account"
msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹੁੰਦਾ ਹਾਂ"
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:738
msgid "No, I just want to see people online nearby for now"
msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹੁਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:759
msgid "Select the accounts you want to import:"
msgstr "ਅਕਾਊਂਟ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ:"
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:843
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "ਹਾਂ"
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:850
msgid "No, that's all for now"
msgstr "ਨਹੀਂ, ਹੁਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1109
+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 ""
+"ਇੰਪੈਥੀ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਮੌਜੂਦ ਕੁਨੈਕਟ ਹੋਏ ਲੋਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੱਭ ਅਤੇ ਗੱਲਬਾਤ ਕਰਵਾ ਸਕਦਾ ਹੈ। "
+"ਜੇ ਤੁਸੀਂ ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ। "
+"ਤੁਸੀਂ ਇਹ ਵੇਰਵਾ ਬਾਅਦ ਵਿੱਚ ਵੀ ਸੌਖੀ ਤਰ੍ਹਾਂ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ 'ਅਕਾਊਂਟ' ਡਾਈਲਾਗ "
+"ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਫੀਚਰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#: ../src/empathy-account-assistant.c:1115
+#: ../src/empathy-account-assistant.c:1171
+#| msgid "Edit Account"
+msgid "Edit->Accounts"
+msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
+
+#: ../src/empathy-account-assistant.c:1131
+#| msgid "No, I just want to see people online nearby for now"
+msgid "I don't want to enable this feature for now"
+msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹੁਣੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ"
+
+#: ../src/empathy-account-assistant.c:1167
+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 ""
+
+#: ../src/empathy-account-assistant.c:1173
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
+
+#: ../src/empathy-account-assistant.c:1250
msgid "Welcome to Empathy"
msgstr "ਇੰਪੈਂਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1259
msgid "Import your existing accounts"
msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
+#: ../src/empathy-account-assistant.c:1277
+msgid "Please enter personal details"
+msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65, c-format
-#| msgid "There are unsaved modification regarding your %s account."
+#: ../src/empathy-accounts-dialog.c:66
+#, c-format
msgid "There are unsaved modifications to your %s account."
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:69
+#: ../src/empathy-accounts-dialog.c:70
msgid "Your new account has not been saved yet."
msgstr "ਤੁਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
-#: ../src/empathy-accounts-dialog.c:230 ../src/empathy-call-window.c:729
-#| msgid "Connecting..."
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../src/empathy-accounts-dialog.c:257, c-format
-#| msgid "Disconnected"
+#: ../src/empathy-accounts-dialog.c:290
+#, c-format
msgid "Disconnected — %s"
msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ — %s"
-#: ../src/empathy-accounts-dialog.c:262, c-format
-#| msgid "Offline"
+#: ../src/empathy-accounts-dialog.c:295
+#, c-format
msgid "Offline — %s"
msgstr "ਆਫਲਾਈਨ — %s"
-#: ../src/empathy-accounts-dialog.c:275
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "ਆਫਲਾਈਨ — ਕੋਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
-#: ../src/empathy-accounts-dialog.c:283
-#| msgid "Unknown reason"
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "ਅਣਜਾਣ ਹਾਲਤ"
-#: ../src/empathy-accounts-dialog.c:294
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "ਆਫਲਾਈਨ — ਅਕਾਊਂਟ ਆਯੋਗ ਹੈ"
-#: ../src/empathy-accounts-dialog.c:642
+#: ../src/empathy-accounts-dialog.c:760
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2333,16 +2286,16 @@ msgstr ""
"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:931, c-format
-#| msgid "Do you really want to remove the group '%s'?"
+#: ../src/empathy-accounts-dialog.c:1107
+#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੋਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:935
+#: ../src/empathy-accounts-dialog.c:1111
msgid "This will not remove your account on the server."
msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾਏਗਾ।"
-#: ../src/empathy-accounts-dialog.c:1117
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2350,7 +2303,7 @@ msgstr ""
"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚੁਣਨ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਅਣਡਿੱਠੇ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1637
+#: ../src/empathy-accounts-dialog.c:1925
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2359,7 +2312,7 @@ msgstr ""
"ਅਣਡਿੱਠੇ ਕੀਤੇ ਜਾਣਗੇ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1731
+#: ../src/empathy-accounts-dialog.c:2058
msgid "Accounts"
msgstr "ਅਕਾਊਂਟ"
@@ -2368,7 +2321,6 @@ msgid "No protocol installed"
msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ"
#: ../src/empathy-accounts-dialog.ui.h:2
-#| msgid "Protocol"
msgid "Protocol:"
msgstr "ਪਰੋਟੋਕਾਲ:"
@@ -2434,71 +2386,77 @@ msgid "Call"
msgstr "ਕਾਲ ਕਰੋ"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1700
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
-#: ../src/empathy-call-window.c:1761
-#| msgid "Contact Details"
+#: ../src/empathy-call-window.c:1755
msgid "Technical Details"
msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:1793
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:1804
+#: ../src/empathy-call-window.c:1798
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
-#: ../src/empathy-call-window.c:1810
+#: ../src/empathy-call-window.c:1804
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr ""
+"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, ਜੋ ਸਿੱਧਾ "
+"ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-#: ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:1810
msgid "There was a failure on the network"
msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:1820
+#: ../src/empathy-call-window.c:1814
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:1823
+#: ../src/empathy-call-window.c:1817
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:1833
+#: ../src/empathy-call-window.c:1827
#, 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-call-window.c:1841
+#: ../src/empathy-call-window.c:1835
msgid "There was a failure in the call engine"
msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:1880
+#: ../src/empathy-call-window.c:1874
msgid "Can't establish audio stream"
msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-#: ../src/empathy-call-window.c:1890
+#: ../src/empathy-call-window.c:1884
msgid "Can't establish video stream"
msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
#: ../src/empathy-call-window.ui.h:1
-#| msgid "Compact contact list"
msgid "Call the contact again"
msgstr "ਸੰਪਰਕ ਨੂੰ ਫੇਰ ਕਾਲ ਕਰੋ"
@@ -2531,7 +2489,6 @@ msgid "Hang up current call"
msgstr "ਮੌਜੂਦਾ ਕਾਲ ਬੰਦ ਕਰੋ"
#: ../src/empathy-call-window.ui.h:9
-#| msgid "Video preview"
msgid "Preview"
msgstr "ਝਲਕ"
@@ -2545,24 +2502,21 @@ msgstr "ਆਡੀਓ ਭੇਜੋ"
#: ../src/empathy-call-window.ui.h:12
msgid "Toggle audio transmission"
-msgstr ""
+msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
#: ../src/empathy-call-window.ui.h:13
msgid "V_ideo"
msgstr "ਵਿਡੀਓ(_i)"
#: ../src/empathy-call-window.ui.h:14
-#| msgid "Video input"
msgid "Video Off"
msgstr "ਵਿਡੀਓ ਬੰਦ"
#: ../src/empathy-call-window.ui.h:15
-#| msgid "Video input"
msgid "Video On"
msgstr "ਵਿਡੀਓ ਚਾਲੂ"
#: ../src/empathy-call-window.ui.h:16
-#| msgid "Video preview"
msgid "Video Preview"
msgstr "ਵਿਡੀਓ ਝਲਕ"
@@ -2570,35 +2524,35 @@ msgstr "ਵਿਡੀਓ ਝਲਕ"
msgid "_View"
msgstr "ਵੇਖੋ(_V)"
-#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
msgstr[1] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
-#: ../src/empathy-chat-window.c:447
+#: ../src/empathy-chat-window.c:448
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ਅਤੇ %u ਹੋਰ)"
msgstr[1] "%s (ਅਤੇ %u ਹੋਰ)"
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
+msgstr[1] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:473
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
+msgstr[1] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
-#: ../src/empathy-chat-window.c:683
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
@@ -2607,7 +2561,6 @@ msgid "C_lear"
msgstr "ਸਾਫ਼ ਕਰੋ(_l)"
#: ../src/empathy-chat-window.ui.h:2
-#| msgid "Contact"
msgid "C_ontact"
msgstr "ਸੰਪਰਕ(_o)"
@@ -2643,8 +2596,11 @@ msgstr "ਗੱਲਬਾਤ(_C)"
msgid "_Detach Tab"
msgstr "ਟੈਬ ਵੱਖ ਕਰੋ(_D)"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "ਸੋਧ(_E)"
+
#: ../src/empathy-chat-window.ui.h:12
-#| msgid "_Favorite Chatroom"
msgid "_Favorite Chat Room"
msgstr "ਪਸੰਦੀਦਾ ਗੱਲਬਾਤ-ਰੂਮ(_F)"
@@ -2684,90 +2640,76 @@ msgstr "ਆਟੋ-ਕੁਨੈਕਟ"
msgid "Manage Favorite Rooms"
msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
-#: ../src/empathy-event-manager.c:345
-#| msgid "Incoming voice call"
+#: ../src/empathy-event-manager.c:339
msgid "Incoming video call"
msgstr "ਆ ਰਹੀ ਵਿਡੀਓ ਕਾਲ"
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "ਆ ਰਹੀ ਕਾਲ"
-#: ../src/empathy-event-manager.c:349, c-format
-#| msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-event-manager.c:343
+#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ਤੁਹਾਨੂੰ ਵਿਡੀਓ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-event-manager.c:350, c-format
-#| msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-event-manager.c:344
+#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ਤੁਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "ਰੱਦ ਕਰੋ(_R)"
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "ਜਵਾਬ ਦਿਓ(_A)"
-#: ../src/empathy-event-manager.c:495, c-format
-#| msgid "Incoming call from %s"
+#: ../src/empathy-event-manager.c:489
+#, c-format
msgid "Incoming video call from %s"
msgstr "%s ਤੋਂ ਵਿਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ"
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
#, c-format
msgid "Incoming call from %s"
msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
-#: ../src/empathy-event-manager.c:541
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s ਤੁਹਾਨੂੰ ਇੱਕ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ"
-
-#: ../src/empathy-event-manager.c:547
-msgid "An external application will be started to handle it."
-msgstr "ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਇੱਕ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੀ ਜਾਵੇਗੀ।"
-
-#: ../src/empathy-event-manager.c:552
-msgid "You don't have the needed external application to handle it."
-msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
-
-#: ../src/empathy-event-manager.c:680
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "ਰੂਮ ਸੱਦਾ"
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
-#: ../src/empathy-event-manager.c:691
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "ਇਨਕਾਰ(_D)"
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "ਦਾਖਲ(_J)"
-#: ../src/empathy-event-manager.c:735
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s ਨੇ ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
-#: ../src/empathy-event-manager.c:941
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "%s ਵਲੋਂ ਮੈਂਬਰੀ ਚਾਹੀਦੀ ਹੈ"
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2777,13 +2719,13 @@ msgstr ""
"ਸੁਨੇਹਾ: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s ਹੁਣ ਆਫਲਾਈਨ ਹੈ।"
#. someone is logging in
-#: ../src/empathy-event-manager.c:1001
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s ਹੁਣ ਆਨਲਾਈਨ ਹੈ।"
@@ -2929,22 +2871,23 @@ msgstr "ਸਰੋਤ"
msgid "%s account"
msgstr "%s ਅਕਾਊਂਟ"
-#: ../src/empathy-main-window.c:431
-#| msgid "Disconnected"
+#: ../src/empathy-main-window.c:433
msgid "Reconnect"
msgstr "ਮੁੜ-ਕੁਨੈਕਟ"
-#: ../src/empathy-main-window.c:438
-#| msgid "_Edit account"
+#: ../src/empathy-main-window.c:439
msgid "Edit Account"
msgstr "ਅਕਾਊਂਟ ਸੋਧ"
#: ../src/empathy-main-window.c:445
-#| msgid "Clean"
msgid "Close"
msgstr "ਬੰਦ ਕਰੋ"
-#: ../src/empathy-main-window.c:1331
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "ਸੰਪਰਕ"
+
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
@@ -2981,12 +2924,10 @@ msgid "Normal Size With _Avatars"
msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
#: ../src/empathy-main-window.ui.h:9
-#| msgid "Preferences"
msgid "P_references"
msgstr "ਪਸੰਦ(_r)"
#: ../src/empathy-main-window.ui.h:10
-#| msgid "Protocol"
msgid "Show P_rotocols"
msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
@@ -3015,12 +2956,10 @@ msgid "_File Transfers"
msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
#: ../src/empathy-main-window.ui.h:22
-#| msgid "_Join"
msgid "_Join…"
msgstr "ਦਾਖਲ(_J)..."
#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-#| msgid "New Conversation"
msgid "_New Conversation…"
msgstr "ਨਵੀਂ ਗੱਲਬਾਤ..."
@@ -3046,15 +2985,8 @@ 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:539, c-format
-#| msgctxt ""
-#| "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/"
-#| "no and a number."
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
+#: ../src/empathy-new-chatroom-dialog.c:539
+#, c-format
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -3182,7 +3114,6 @@ msgid "General"
msgstr "ਆਮ"
#: ../src/empathy-preferences.ui.h:13
-#| msgid "Location"
msgid "Location sources:"
msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
@@ -3238,7 +3169,6 @@ msgid "Themes"
msgstr "ਥੀਮ"
#: ../src/empathy-preferences.ui.h:25
-#| msgid "Megaphone"
msgid "_Cellphone"
msgstr "ਸੈੱਲਫੋਨ(_C)"
@@ -3270,7 +3200,7 @@ msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸ
msgid "_Reduce location accuracy"
msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:176
msgid "Respond"
msgstr "ਜਵਾਬ"
@@ -3282,81 +3212,67 @@ msgstr "ਹਾਲਤ"
msgid "_Quit"
msgstr "ਬੰਦ ਕਰੋ(_Q)"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "%s ਸਰਵਿਸ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ: %s"
-
-#: ../src/empathy-tube-dispatch.c:447, c-format
-#| msgid ""
-#| "An invitation was offered for service %s, but you don't have the needed "
-#| "application to handle it"
-msgid ""
-"An invitation was offered for service %s, but you don't have the application "
-"necessary to handle it"
-msgstr "ਸਰਵਿਸ %s ਲਈ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਸੀ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਕਾਰਜ ਨਹੀਂ ਹੈ।"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "ਸੰਪਰਕ ਮੈਪ ਝਲਕ"
-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "ਸੰਭਾਲੋ"
-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "ਡੀਬੱਗ ਵਿੰਡੋ"
-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "ਵਿਰਾਮ"
-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "ਲੈਵਲ "
-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "ਡੀਬੱਗ"
-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "ਜਾਣਕਾਰੀ"
-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "ਸੁਨੇਹਾ"
-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "ਨਾਜ਼ੁਕ"
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "ਗਲਤੀ"
-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "ਸਮਾਂ"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "ਡੋਮੇਨ"
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "ਕੈਟਾਗਰੀ"
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "ਲੈਵਲ"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3369,14 +3285,80 @@ msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ"
#: ../src/empathy-invite-participant-dialog.c:35
msgid "Choose a contact to invite into the conversation:"
+msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸੱਦਣ ਲਈ ਸੰਪਰਕ ਚੁਣੋ:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "ਕੋਈ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ; ਕੁਝ ਵੀ ਕਰੋ (ਇੰਪੋਰਟ ਆਦਿ) ਅਤੇ ਬੰਦ ਕਰੋ"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
msgstr ""
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ਦਿੱਤਾ ਅਕਾਊਂਟ ਸ਼ੁਰੂ ਵੇਲੇ ਚੁਣੋ (ਜਿਵੇਂ gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+#| msgid "account"
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:231
+#| msgid "Import Accounts"
+msgid "- Empathy Accounts"
+msgstr "- ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
+
+#: ../src/empathy-accounts.c:247
+#| msgid "Accounts"
+msgid " Accounts"
+msgstr " ਅਕਾਊਂਟ"
+
+#~ msgid "Salut account is created"
+#~ msgstr "ਸਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ"
+
+#~| msgid ""
+#~| "Whether or not the Salut account has been created on the first Empathy "
+#~| "run."
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "ਕੀ ਪਹਿਲੀ ਵਾਰ ਇੰਪੈਂਥੀ ਚਲਾਉਣ ਲਈ ਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾਵੇ"
+
+#~ msgid "Hidden"
+#~ msgstr "ਓਹਲੇ"
+
+#~| msgid "%s has disconnected"
+#~ msgid "User requested disconnect"
+#~ msgstr "ਯੂਜ਼ਰ ਨੇ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੀ ਮੰਗ ਕੀਤੀ"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "ਗਲਤੀ ਸੁਨੇਹਾ ਸੀ: <span style=\"italic\">%s</span>"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s ਤੁਹਾਨੂੰ ਇੱਕ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਇੱਕ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੀ ਜਾਵੇਗੀ।"
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "%s ਸਰਵਿਸ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#~| msgid ""
+#~| "An invitation was offered for service %s, but you don't have the needed "
+#~| "application to handle it"
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the "
+#~ "application necessary to handle it"
+#~ msgstr "ਸਰਵਿਸ %s ਲਈ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਸੀ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਕਾਰਜ ਨਹੀਂ ਹੈ।"
+
#~ msgid "Can't set an empty display name"
#~ msgstr "ਖਾਲੀ ਡਿਸਪਲੇਅ ਨਾਂ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-#~ msgid "What is your Windows Live user name?"
-#~ msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
-
#~ msgid "Unsupported command"
#~ msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਕਮਾਂਡ"
@@ -3454,10 +3436,6 @@ msgstr ""
#~ msgid "_Reuse an existing account"
#~ msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਨੂੰ ਵਰਤੋਂ(_R)"
-#~| msgid "Account"
-#~ msgid "account"
-#~ msgstr "ਅਕਾਊਂਟ"
-
#~ msgid "Conversations (%d)"
#~ msgstr "ਗੱਲਬਾਤ (%d)"
@@ -3639,9 +3617,6 @@ msgstr ""
#~ msgid "Invitation _message:"
#~ msgstr "ਸੱਦਾ ਸੁਨੇਹਾ(_m):"
-#~ msgid "Invite"
-#~ msgstr "ਸੱਦਾ"
-
#~ msgid "You have been invited to join a chat conference."
#~ msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਗੱਲਬਾਤ ਕਨਫਰੰਸ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਹੈ।"
diff --git a/po/pl.po b/po/pl.po
index fca262c7e..bcb59d229 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 13:17+0100\n"
-"PO-Revision-Date: 2010-03-03 13:15+0100\n"
+"POT-Creation-Date: 2010-03-15 17:19+0100\n"
+"PO-Revision-Date: 2010-03-15 17:10+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <gnomepl@aviary.pl>\n"
"MIME-Version: 1.0\n"
@@ -108,107 +108,107 @@ msgid "Empathy has asked about importing accounts"
msgstr "Zapytano o zaimportowanie kont"
#: ../data/empathy.schemas.in.h:17
+msgid "Empathy has migrated butterfly logs"
+msgstr "Przeprowadzono migrację dzienników butterfly"
+
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should auto-connect on startup"
msgstr "Automatyczne łączenie się podczas uruchamiania"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should reduce the location's accuracy"
msgstr "Zmniejszenie dokładności położenia"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable WebKit Developer Tools"
msgstr "Włączenie narzędzi programistycznych WebKit"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable popup notifications for new messages"
msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Enable spell checker"
msgstr "Włączenie sprawdzania pisowni"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide main window"
msgstr "Ukrycie głównego okna"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
msgid "Hide the main window."
msgstr "Ukrycie głównego okna."
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
msgid "MC 4 accounts have been imported"
msgstr "Konta MC 4 zostały zaimportowane"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
msgid "MC 4 accounts have been imported."
msgstr "Konta MC 4 zostały zaimportowane."
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
msgid "Nick completed character"
msgstr "Znak do dodania po uzupełnieniu pseudonimu"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
msgid "Open new chats in separate windows"
msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Ścieżka używanego motywu Adium"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
"Adium."
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Odtworzenie dźwięku dla nadchodzących wiadomości"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for new conversations"
msgstr "Odtworzenie dźwięku dla nowych rozmów"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Odtworzenie dźwięku dla wychodzącej wiadomości"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log in"
msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
msgid "Play a sound when we log out"
msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Wyskakujące powiadomienia, kiedy kontakt się zaloguje"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Wyskakujące powiadomienia, kiedy kontakt się wyloguje"
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Utworzono konto Salut"
-
#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Wyświetlanie awatarów"
@@ -275,33 +275,35 @@ msgstr "Określa, czy używać sieci do odnajdowania położenia."
#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Określa, czy program Empathy zapytał o zaimportowanie kont z innych "
-"programów."
+msgstr "Określa, czy zapytano o zaimportowanie kont z innych programów."
#: ../data/empathy.schemas.in.h:59
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Określa, czy przeprowadzono migrację dzienników butterfly."
+
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Określa, czy włączyć narzędzia programistyczne WebKit, takie jak Web "
"Inspector."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -309,12 +311,6 @@ msgstr ""
"Określa, czy menedżery łączności powinny być używane do automatycznego "
"rozłączenia/ponownego połączenia."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr ""
-"Określa, czy konto Salut zostało stworzone podczas pierwszego uruchomienia "
-"programu Empathy."
-
#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether to check words typed against the languages you want to check with."
@@ -449,8 +445,10 @@ msgstr ""
msgid "Manage Messaging and VoIP accounts"
msgstr "Zarządzanie kontami komunikatora i VoIP"
+#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:207 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Konta komunikatora i VoIP"
@@ -471,7 +469,7 @@ msgid "The selected file is empty"
msgstr "Wybrany plik jest pusty"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Osoby w pobliżu"
@@ -1150,60 +1148,60 @@ msgstr "Wszystkie pliki"
msgid "Click to enlarge"
msgstr "Kliknięcie powiększy"
-#: ../libempathy-gtk/empathy-chat.c:232
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Ponowne połączenie z tą rozmową się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:654
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Dołączenie do pokoju rozmów się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:672
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:711
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Brak uprawnienia do zmiany tematu"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
-#: ../libempathy-gtk/empathy-chat.c:858
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
"/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <wiadomość>: wysyła wiadomość DZIAŁANIA do bieżącej rozmowy"
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1213,7 +1211,7 @@ msgstr ""
"wysyłania wiadomości zaczynającej się od znaku \"/\". Na przykład: \"/say /"
"join jest używane do dołączenia do nowego pokoju rozmowy\""
-#: ../libempathy-gtk/empathy-chat.c:875
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1221,80 +1219,80 @@ msgstr ""
"/help [<polecenie>]: wyświetla wszystkie obsługiwane polecenia. Jeśli podano "
"<polecenie>, zostanie wyświetlone jej użycie."
-#: ../libempathy-gtk/empathy-chat.c:885
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Użycie: %s"
-#: ../libempathy-gtk/empathy-chat.c:914
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Nieznane polecenie"
-#: ../libempathy-gtk/empathy-chat.c:1035
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1176
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "nieprawidłowy kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "brak dostępu"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "za długa wiadomość"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "niezaimplementowane"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "nieznany"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1222
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Temat ustawiony na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Temat nie został określony"
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(brak podpowiedzi)"
-#: ../libempathy-gtk/empathy-chat.c:1677
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Wstaw emotikonę"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1695
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1626
msgid "_Send"
msgstr "_Wyślij"
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Podpowiedzi pi_sowni"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Failed to retrieve recent logs"
msgstr "Pobranie ostatnich dzienników się nie powiodło"
-#: ../libempathy-gtk/empathy-chat.c:1954
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "Użytkownik %s został rozłączony"
@@ -1302,12 +1300,12 @@ msgstr "Użytkownik %s został rozłączony"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1961
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "Użytkownik %1$s został wyrzucony przez użytkownika %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "Użytkownik %s został wyrzucony"
@@ -1315,17 +1313,17 @@ msgstr "Użytkownik %s został wyrzucony"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1972
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "Użytkownik %1$s został zablokowany przez użytkownika %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "Użytkownik %s został zablokowany"
-#: ../libempathy-gtk/empathy-chat.c:1979
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "Użytkownik %s opuścił pokój"
@@ -1335,46 +1333,46 @@ msgstr "Użytkownik %s opuścił pokój"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1988
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "Użytkownik %s dołączył do pokoju"
-#: ../libempathy-gtk/empathy-chat.c:2038
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "Użytkownik %s jest teraz znany jako %s"
-#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
msgid "Disconnected"
msgstr "Rozłączony"
-#: ../libempathy-gtk/empathy-chat.c:2695
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Błędne hasło. Proszę spróbować ponownie:"
-#: ../libempathy-gtk/empathy-chat.c:2696
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Ponów"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Ten pokój jest chroniony hasłem:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Dołącz"
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Połączony"
-#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-chat.c:2901
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Rozmowa"
@@ -1384,20 +1382,20 @@ msgid "Topic:"
msgstr "Temat:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "S_kopiuj adres odnośnika"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Otwórz odnośnik"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
@@ -1405,11 +1403,11 @@ msgstr "%A %d %B %Y"
msgid "Edit Contact Information"
msgstr "Modyfikowanie informacji o kontakcie"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:300
+#: ../libempathy-gtk/empathy-contact-dialogs.c:301
msgid "Personal Information"
msgstr "Informacje osobiste"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:406
msgid "New Contact"
msgstr "Nowy kontakt"
@@ -1421,81 +1419,86 @@ msgstr "Z_decyduj później"
msgid "Subscription Request"
msgstr "Prośba o upoważnienie"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1631
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Na pewno usunąć grupę \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1633
msgid "Removing group"
msgstr "Usuwanie grupy"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1682
+#: ../libempathy-gtk/empathy-contact-list-view.c:1759
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Usuń"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1712
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Na pewno usunąć kontakt \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1714
msgid "Removing contact"
msgstr "Usuwanie kontaktu"
-#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../libempathy-gtk/empathy-contact-menu.c:206
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Dodaj kontakt…"
-#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../libempathy-gtk/empathy-contact-menu.c:233
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Rozmowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:257
+#: ../libempathy-gtk/empathy-contact-menu.c:264
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Rozmow_a głosowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:289
+#: ../libempathy-gtk/empathy-contact-menu.c:296
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Wideorozmowa"
-#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../libempathy-gtk/empathy-contact-menu.c:347
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Poprzednie rozmowy"
# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:362
+#: ../libempathy-gtk/empathy-contact-menu.c:369
msgid "Send file"
msgstr "Wyślij plik"
# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:385
+#: ../libempathy-gtk/empathy-contact-menu.c:392
msgid "Share my desktop"
msgstr "Współdziel pulpit"
-#: ../libempathy-gtk/empathy-contact-menu.c:413
+#: ../libempathy-gtk/empathy-contact-menu.c:432
+#: ../libempathy-gtk/empathy-contact-widget.c:1379
+msgid "Favorite"
+msgstr "Ulubione"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:462
msgid "Infor_mation"
msgstr "Infor_macje"
-#: ../libempathy-gtk/empathy-contact-menu.c:459
+#: ../libempathy-gtk/empathy-contact-menu.c:508
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "Z_modyfikuj"
-#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../libempathy-gtk/empathy-contact-menu.c:562
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Zapraszanie do tego pokoju"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-contact-menu.c:593
msgid "_Invite to chat room"
msgstr "_Zaproś do pokoju rozmowy"
@@ -1503,129 +1506,129 @@ msgstr "_Zaproś do pokoju rozmowy"
msgid "Select a contact"
msgstr "Wybór kontaktu"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:238
msgid "Select"
msgstr "Wybór"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
-#: ../src/empathy-main-window.c:1045
+#: ../libempathy-gtk/empathy-contact-widget.c:247
+#: ../src/empathy-main-window.c:1050
msgid "Group"
msgstr "Grupa"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:478
msgid "Country ISO Code:"
msgstr "Kod ISO kraju:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:480
msgid "Country:"
msgstr "Kraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:482
msgid "State:"
msgstr "Stan/województwo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:484
msgid "City:"
msgstr "Miasto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:486
msgid "Area:"
msgstr "Obszar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:488
msgid "Postal Code:"
msgstr "Kod pocztowy:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:490
msgid "Street:"
msgstr "Ulica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:492
msgid "Building:"
msgstr "Budynek:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:494
msgid "Floor:"
msgstr "Piętro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:496
msgid "Room:"
msgstr "Pokój:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:498
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:500
msgid "Description:"
msgstr "Opis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:502
msgid "URI:"
msgstr "Adres URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Accuracy Level:"
msgstr "Poziom dokładności:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:506
msgid "Error:"
msgstr "Błąd:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:508
msgid "Vertical Error (meters):"
msgstr "Błąd w pionie (metry):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:510
msgid "Horizontal Error (meters):"
msgstr "Błąd w poziomie (metry):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:512
msgid "Speed:"
msgstr "Prędkość:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:514
msgid "Bearing:"
msgstr "Kierunek:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:516
msgid "Climb Speed:"
msgstr "Prędkość wznoszenia:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:518
msgid "Last Updated on:"
msgstr "Ostatnia aktualizacja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:520
msgid "Longitude:"
msgstr "Długość geograficzna:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:522
msgid "Latitude:"
msgstr "Szerokość geograficzna:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:524
msgid "Altitude:"
msgstr "Wysokość n.p.m.:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:587
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Położenie"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:603
msgid "<b>Location</b>, "
msgstr "<b>Położenie</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-contact-widget.c:653
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y o %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-contact-widget.c:736
msgid "Save Avatar"
msgstr "Zapisanie awatara"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:792
msgid "Unable to save avatar"
msgstr "Nie można zapisać awatara"
@@ -1797,12 +1800,12 @@ msgstr "Kliknięcie doda ten stan do ulubionych"
msgid "Set status"
msgstr "Ustaw stan"
-#: ../libempathy-gtk/empathy-presence-chooser.c:936
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Ustawienie obecności i obecnego stanu"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Własne wiadomości…"
@@ -1890,15 +1893,15 @@ msgstr "Czysty"
msgid "Blue"
msgstr "Niebieski"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1501
msgid "Unable to open URI"
msgstr "Nie można otworzyć adresu URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1618
msgid "Select a file"
msgstr "Wybór pliku"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1682
msgid "Select a destination"
msgstr "Wybór miejsca docelowego"
@@ -2170,7 +2173,7 @@ msgstr ""
"tego asystenta i dodać konta później z menu Edycja."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1293
+#: ../src/empathy-account-assistant.c:1303
msgid "An error occurred"
msgstr "Wystąpił błąd"
@@ -2179,36 +2182,36 @@ msgstr "Wystąpił błąd"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:414 ../src/empathy-accounts-dialog.c:579
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Nowe konto %s"
-#: ../src/empathy-account-assistant.c:501
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Rodzaj posiadanego konta rozmów:"
-#: ../src/empathy-account-assistant.c:507
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Inne posiadane konta rozmów do ustawienia:"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Proszę wprowadzić szczegóły konta"
-#: ../src/empathy-account-assistant.c:518
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Rodzaj konta rozmów do utworzenia:"
-#: ../src/empathy-account-assistant.c:524
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Utworzyć inne konta rozmów?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Proszę wprowadzić szczegóły nowego konta"
-#: ../src/empathy-account-assistant.c:646
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2220,41 +2223,41 @@ msgstr ""
"Windows Live i wielu innych komunikatorów. Za pomocą mikrofonu lub kamery "
"internetowej można także prowadzić rozmowy głosowe i wideokonferencje."
-#: ../src/empathy-account-assistant.c:663
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "Czy konto było już używane za pomocą innego komunikatora?"
-#: ../src/empathy-account-assistant.c:686
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Tak, zaimportuj szczegóły konta z "
-#: ../src/empathy-account-assistant.c:707
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Tak, wprowadzę teraz szczegóły konta"
-#: ../src/empathy-account-assistant.c:729
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Nie, chcę utworzyć nowe konto"
-#: ../src/empathy-account-assistant.c:739
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Nie, chcę na razie widzieć tylko osoby w sieci będące w pobliżu"
-#: ../src/empathy-account-assistant.c:760
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Proszę wybrać konta do zaimportowania:"
-#: ../src/empathy-account-assistant.c:844
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Tak"
-#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Nie, to na razie wszytko"
-#: ../src/empathy-account-assistant.c:1110
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2266,16 +2269,16 @@ msgstr ""
"czy poniższe dane są poprawne. Można je łatwo zmienić w późniejszym czasie "
"lub wyłączyć tę funkcję używając okna \"Konta\""
-#: ../src/empathy-account-assistant.c:1116
-#: ../src/empathy-account-assistant.c:1172
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Edycja->Konta"
-#: ../src/empathy-account-assistant.c:1132
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "Nie chcę na razie włączać tej funkcji"
-#: ../src/empathy-account-assistant.c:1168
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2287,19 +2290,23 @@ msgstr ""
"proszę zainstalować pakiet telepathy-salut i utworzyć konto \"Osoby w pobliżu"
"\" z okna Konta"
-#: ../src/empathy-account-assistant.c:1174
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "Pakiet telepathy-salut nie jest zainstalowany"
-#: ../src/empathy-account-assistant.c:1251
+#: ../src/empathy-account-assistant.c:1227
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Asystent kont komunikatora i VoIP"
+
+#: ../src/empathy-account-assistant.c:1261
msgid "Welcome to Empathy"
msgstr "Witamy w programie Empathy"
-#: ../src/empathy-account-assistant.c:1260
+#: ../src/empathy-account-assistant.c:1270
msgid "Import your existing accounts"
msgstr "Importowanie istniejących kont"
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1288
msgid "Please enter personal details"
msgstr "Proszę wprowadzić dane osobiste"
@@ -2342,7 +2349,7 @@ msgstr "Nieznany stan"
msgid "Offline — Account Disabled"
msgstr "Offline — konto jest wyłączone"
-#: ../src/empathy-accounts-dialog.c:759
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2350,16 +2357,16 @@ msgstr ""
"Za chwilę nastąpi utworzenie nowego konta, co\n"
"spowoduje utratę zmian. Na pewno kontynuować?"
-#: ../src/empathy-accounts-dialog.c:1106
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Na pewno usunąć \"%s\" z komputera?"
-#: ../src/empathy-accounts-dialog.c:1110
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "Nie usunie to konta na serwerze."
-#: ../src/empathy-accounts-dialog.c:1347
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2367,7 +2374,7 @@ msgstr ""
"Za chwilę nastąpi wybranie innego konta, co spowoduje\n"
"utratę zmian. Na pewno kontynuować?"
-#: ../src/empathy-accounts-dialog.c:1924
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2375,11 +2382,6 @@ msgstr ""
"Za chwilę nastąpi zamknięcie okna, co spowoduje\n"
"utratę zmian. Na pewno kontynuować?"
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2057
-msgid "Accounts"
-msgstr "Konta"
-
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Brak zainstalowanych protokołów"
@@ -2425,41 +2427,41 @@ msgid "_Sidebar"
msgstr "_Panel"
#: ../src/empathy-call-window.c:1041
-msgid "Dialpad"
-msgstr "Panel wybierania"
-
-#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Wejście dźwięku"
-#: ../src/empathy-call-window.c:1051
+#: ../src/empathy-call-window.c:1045
msgid "Video input"
msgstr "Wejście obrazu"
+#: ../src/empathy-call-window.c:1049
+msgid "Dialpad"
+msgstr "Panel wybierania"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1116
+#: ../src/empathy-call-window.c:1117
#, c-format
msgid "Call with %s"
msgstr "Rozmowa z użytkownikiem %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1197
+#: ../src/empathy-call-window.c:1198
msgid "Call"
msgstr "Rozmowa"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1694
+#: ../src/empathy-call-window.c:1695
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Połączony — %d:%02dm"
-#: ../src/empathy-call-window.c:1755
+#: ../src/empathy-call-window.c:1756
msgid "Technical Details"
msgstr "Szczegóły techniczne"
-#: ../src/empathy-call-window.c:1793
+#: ../src/empathy-call-window.c:1794
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2468,7 +2470,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
"używanego przez ten komputer"
-#: ../src/empathy-call-window.c:1798
+#: ../src/empathy-call-window.c:1799
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2477,7 +2479,7 @@ msgstr ""
"Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
"przez ten komputer"
-#: ../src/empathy-call-window.c:1804
+#: ../src/empathy-call-window.c:1805
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2486,23 +2488,23 @@ msgstr ""
"Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
"się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
-#: ../src/empathy-call-window.c:1810
+#: ../src/empathy-call-window.c:1811
msgid "There was a failure on the network"
msgstr "Wystąpił błąd sieci"
-#: ../src/empathy-call-window.c:1814
+#: ../src/empathy-call-window.c:1815
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:1817
+#: ../src/empathy-call-window.c:1818
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Formaty wideo wymagane dla tej rozmowy nie są zainstalowane na komputerze"
-#: ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1828
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2513,15 +2515,15 @@ msgstr ""
"\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
"w menu Pomoc."
-#: ../src/empathy-call-window.c:1835
+#: ../src/empathy-call-window.c:1836
msgid "There was a failure in the call engine"
msgstr "Wystąpił błąd mechanizmu rozmowy"
-#: ../src/empathy-call-window.c:1874
+#: ../src/empathy-call-window.c:1875
msgid "Can't establish audio stream"
msgstr "Nie można utworzyć strumienia dźwięku"
-#: ../src/empathy-call-window.c:1884
+#: ../src/empathy-call-window.c:1885
msgid "Can't establish video stream"
msgstr "Nie można utworzyć strumienia obrazu"
@@ -2944,23 +2946,23 @@ msgstr "Źródło"
msgid "%s account"
msgstr "Konto %s"
-#: ../src/empathy-main-window.c:433
+#: ../src/empathy-main-window.c:437
msgid "Reconnect"
msgstr "Połącz ponownie"
-#: ../src/empathy-main-window.c:439
+#: ../src/empathy-main-window.c:443
msgid "Edit Account"
msgstr "Zmodyfikuj konto"
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:449
msgid "Close"
msgstr "Zamknij"
-#: ../src/empathy-main-window.c:1028
+#: ../src/empathy-main-window.c:1033
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1369
+#: ../src/empathy-main-window.c:1414
msgid "Show and edit accounts"
msgstr "Wyświetla i umożliwia modyfikowanie kont"
@@ -3392,5 +3394,9 @@ msgid "- Empathy Accounts"
msgstr "- Konta programu Empathy"
#: ../src/empathy-accounts.c:247
-msgid " Accounts"
-msgstr " Konta"
+msgid "Empathy Accounts"
+msgstr "Konta programu Empathy"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Debuger programu Empathy"
diff --git a/po/ro.po b/po/ro.po
index c152e795e..33f9c48fa 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,8 +6,8 @@ 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: 2010-02-13 17:13+0000\n"
-"PO-Revision-Date: 2010-02-14 15:03+0200\n"
+"POT-Creation-Date: 2010-03-04 17:00+0000\n"
+"PO-Revision-Date: 2010-03-08 13:10+0200\n"
"Last-Translator: Adi Roiban <adi@roiban.ro>\n"
"Language-Team: Romanian GNOME Team <gnomero-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -194,194 +194,186 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Notificări popup la deconectarea unui contact"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Contul Salut a fost creat"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Arată avataruri"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Arată lista contactelor în camerele de discuții"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Arată un indiciu despre închiderea ferestrei principale"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Arată contactele deconectate"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "Arată protocoalele"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Limbi corectare ortografică"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "Dosarul implicit în care se salvează fișierele transferate."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "Ultimul dosar de unde a fost aleasă o imagine pentru avatar."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Tema care este folosită pentru a afișa conversația în ferestrele de discuții."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Folosește emoticonuri grafice"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Folosește sunete de notificare"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Folosește tema pentru camerele de discuții"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Dacă Empathy poate să publice contactelor locația utilizatorului."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Dacă Empathy poate să utilizeze GPS-ul pentru a estima locația."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Dacă Empathy poate să utilizeze rețeaua de telefonie mobilă pentru a estima locația."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr "Dacă Empathy poate să utilizeze rețeaua pentru a estima locația."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Dacă Empathy a întrebat despre importarea conturilor din alte programe."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Dacă Empathy ar trebui să autentifice automat conturile dumneavoastră la pornire."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Dacă Empathy ar trebui să reducă acuratețea locației din motive de intimitate."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Dacă Empathy ar trebui să folosească avatarul contactului ca iconiță a ferestrei de discuții."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Dacă ar trebui activate uneltele de dezvoltare Webkit, cum ar fi Inspectorul Web."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
msgstr "Dacă administratorii conexiunilor de rețea ar trebui folosiți pentru deconectare/reconectare automată."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "Dacă la prima pornire a Empathy, contul Salut a fost creat."
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid "Whether to check words typed against the languages you want to check with."
msgstr "Dacă să se verifice, în limbile alese, corectitudinea cuvintelor tastate."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Dacă să se convertească în cadrul conversațiilor emoticonurile în imagini."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Dacă la autentificarea unui contact, să se redea notificări sonore."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "Dacă la deconectarea unui contact, să se redea notificări sonore."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "Dacă să se redea, notificări sonore pentru evenimente."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Dacă să se redea, un sunet la primirea mesajelor."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "Dacă să se redea, un sunet la începerea unei conversații noi."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Dacă să se redea, un sunet la trimiterea mesajelor."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "Dacă să se redea, un sunet la conectarea la rețea."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr "Dacă să se redea un sunet, la deconectarea de la o rețea."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr "Dacă să se redea notificări sonore când sunteți plecat sau ocupat."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Dacă să afișeze o notificare popup, atunci când un contact se deconectează."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Dacă să afișeze o notificare popup, atunci când un contact se conectează."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
msgstr "Dacă să fie afișate notificări popup la primirea de mesaje noi, chiar dacă conversația este deja deschisă, dar nu este focalizată."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Dacă să fie afișate notificări popup la primirea de mesaje noi."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Dacă să se afișeze avataruri pentru contacte în lista de contacte și ferestrele de discuții."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Dacă să se arate contactele deconectate în lista de contacte."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr "Dacă să fie afișate notificări popup când sunteți plecat sau ocupat."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Dacă să se afișeze în lista de contacte și ferestrele de discuții avataruri pentru contacte."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "Dacă să afișeze lista de contacte în camerele de discuții."
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "Dacă să se arate lista de contacte compactă."
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
msgstr "Dacă să se arate un dialog de confirmare la închiderea ferestrei principale de la butonul „x” din bara de titlu."
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "Dacă să se folosească tema pentru camerele de discuții."
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "Ce criteriu să fie folosit la sortarea listei de contacte. Implicit vor fi sortate după nume, cu valoarea „name”. O valoare „state” va sorta lista de contacte după starea lor."
@@ -390,29 +382,29 @@ msgid "Manage Messaging and VoIP accounts"
msgstr "Administrare conturi de mesagerie și VoIP"
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201
+#: ../src/cc-empathy-accounts-page.c:229
#: ../src/cc-empathy-accounts-panel.c:70
msgid "Messaging and VoIP Accounts"
msgstr "Conturi de mesagerie și VoIP"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Valoarea de dispersie a fișierului primit nu coincide cu cea a fișierului trimis"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Transferul de fișiere nu este suportat de contactul cu care discutați"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "Fișierul ales nu este unul obișnuit"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Fișierul selectat este gol"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Persoane din apropiere"
@@ -590,25 +582,25 @@ msgstr[2] "acum %d de luni"
msgid "in the future"
msgstr "în viitor"
-#: ../libempathy-gtk/empathy-account-chooser.c:450
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Toate"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Utilizator:"
-#: ../libempathy-gtk/empathy-account-widget.c:1445
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "Autent_ificare"
-#: ../libempathy-gtk/empathy-account-widget.c:1512
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -616,15 +608,15 @@ msgstr "Autent_ificare"
msgid "Account:"
msgstr "Cont:"
-#: ../libempathy-gtk/empathy-account-widget.c:1523
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Activat"
-#: ../libempathy-gtk/empathy-account-widget.c:1588
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Acest cont există deja de pe server."
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "Crează un cont nou pe server"
@@ -633,19 +625,19 @@ msgstr "Crează un cont nou pe server"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1974
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s pe %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:2000
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "Cont %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Cont nou"
@@ -1078,136 +1070,141 @@ msgstr "Toate fișierele"
msgid "Click to enlarge"
msgstr "Clic pentru mărire"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Reconectarea la această conversație a eșuat"
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Intrarea în camera de discuții a eșuat"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Nu s-a putut deschide conversația privată"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Subiectul nu este suportat în această conversație"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Nu aveți dreptul să modificați subiectul"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: curăță toate mesajele din conversația curentă"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: modifică subiectul conversației curente"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <identificator cameră>: intră într-o nouă cameră de discuții"
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <identificator cameră>: intră într-o nouă cameră de discuții"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id contact> [<message>]: deschide o conversație privată"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id contact> <message>: deschide o conversație privată"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <pseudonim>: modifică pseudonimul pe serverul curent"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mesaj>: trimite un mesaj de tip ACTION conversației curente"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:871
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 <mesaj>: trimite <mesaj> conversației curente. Această comandă vă permite să trimiteți un mesaj ce începe cu „/”. De exemplu: \"/say /join este folosit pentru a intra într-o cameră de discuții nouă\""
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<comanda>]: afișează toate comenzile suportate. Dacă <comanda> este definită, se va afișa un ghid de utilizare pentru aceasta."
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Utlizare: %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Comandă necunoscută"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Comandă necunoscută: utilizați /help pentru a vedea comenzile disponibile"
-#: ../libempathy-gtk/empathy-chat.c:1144
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "deconectat"
-#: ../libempathy-gtk/empathy-chat.c:1147
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "contact nevalid"
-#: ../libempathy-gtk/empathy-chat.c:1150
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "permisiune respinsă"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "mesaj prea lung"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "neimplementat"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "necunoscut"
-#: ../libempathy-gtk/empathy-chat.c:1163
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Eroare la trimiterea mesajului „%s”: %s"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Subiect definit la: %s"
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Niciun subiect definit"
-#: ../libempathy-gtk/empathy-chat.c:1594
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Nicio sugestie)"
-#: ../libempathy-gtk/empathy-chat.c:1648
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Inserează un emoticon"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1666
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1622
msgid "_Send"
msgstr "_Trimite"
-#: ../libempathy-gtk/empathy-chat.c:1700
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Sugestii corectare ortografică"
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1829
+#| msgid "Failed to open private chat"
+msgid "Failed to retrieve recent logs"
+msgstr "Nu s-a putut obține înregistrările recente"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s s-a deconectat"
@@ -1215,12 +1212,12 @@ msgstr "%s s-a deconectat"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1822
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s a fost dat afară de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1825
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s a fost dat afară"
@@ -1228,17 +1225,17 @@ msgstr "%s a fost dat afară"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1833
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s a fost blocat definitiv de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1836
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s a fost blocat"
-#: ../libempathy-gtk/empathy-chat.c:1840
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s a ieșit din cameră"
@@ -1248,71 +1245,71 @@ msgstr "%s a ieșit din cameră"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1849
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1874
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s a intrat în cameră"
-#: ../libempathy-gtk/empathy-chat.c:1899
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s este acum cunoscut ca %s"
-#: ../libempathy-gtk/empathy-chat.c:2034
+#: ../libempathy-gtk/empathy-chat.c:2179
#: ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Deconectat"
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Parolă incorectă; încercați din nou:"
-#: ../libempathy-gtk/empathy-chat.c:2569
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Încearcă din nou"
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Această cameră este protejată de o parolă:"
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Intră"
-#: ../libempathy-gtk/empathy-chat.c:2715
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Conectat"
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../libempathy-gtk/empathy-log-window.c:548
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Conversație"
#: ../libempathy-gtk/empathy-chat.ui.h:1
-#: ../src/empathy-chat-window.c:681
+#: ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Subiect:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Copiază adresa legăturii"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Deschide legătura"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A, %d %B %Y"
@@ -1361,55 +1358,54 @@ msgstr "Sigur doriți să ștergeți contactul „%s”?"
msgid "Removing contact"
msgstr "Ștergere contact"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
-#| msgid "_Add Contact..."
msgid "_Add Contact…"
msgstr "_Adaugă contact…"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "Dis_cuție"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Apel _audio"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "Apel _video"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversații an_terioare"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Trimite fișier"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Partajează desktop"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Infor_mații"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:459
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editare"
-#: ../libempathy-gtk/empathy-contact-menu.c:497
-#: ../src/empathy-chat-window.c:866
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Sunteți invitat în această cameră"
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "_Invită într-o cameră"
@@ -1417,129 +1413,129 @@ msgstr "_Invită într-o cameră"
msgid "Select a contact"
msgstr "Alege un contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Selectează"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Grup"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "Cod ISO țără:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Țară:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Stat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Oraș:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Zonă:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Cod poștal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Stradă:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Clădire:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Etaj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Cameră discuții:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Descriere:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Nivel acuratețe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Eroare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Eroare verticală (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Eroare orizontală (metri):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Viteză:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Orientare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Viteză de urcare:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Actualizat ultima dată pe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Longitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Latitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Altitudine:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Locație"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Locație</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B %Y la ora %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "Salvează avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "Nu se poate salva avatarul"
@@ -1624,12 +1620,12 @@ msgstr "Port"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:541
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Cont"
-#: ../libempathy-gtk/empathy-log-window.c:558
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Dată"
@@ -1685,34 +1681,34 @@ msgstr "Apel nou"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "Mesaj personalizat…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "Modificare mesajele personalizate…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Apăsați pentru a șterge acest mesaj de stare din lista de favorite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Apăsați pentru a adăuga acest mesaj de stare în lista de favorite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Definește mesaj de stare"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Definiți preferințele și mesajul de stare curent"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Mesaje personalizate…"
@@ -1800,15 +1796,15 @@ msgstr "Curat"
msgid "Blue"
msgstr "Albastru"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1497
msgid "Unable to open URI"
msgstr "Nu se poate deschide URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1614
msgid "Select a file"
msgstr "Alegeți un fișier"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
msgid "Select a destination"
msgstr "Alegeți o destinație"
@@ -1995,19 +1991,15 @@ msgstr "Niciun mesaj de eroare"
msgid "Instant Message (Empathy)"
msgstr "Mesaj instant (Empathy)"
-#: ../src/empathy.c:605
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Nu conecta la pornire"
-#: ../src/empathy.c:609
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Nu arăta lista de contacte sau orice alt dialog la pornire"
-#: ../src/empathy.c:613
-msgid "Show the accounts dialog"
-msgstr "Arată dialoguri cu conturile"
-
-#: ../src/empathy.c:625
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Mesagerie instant Empathy"
@@ -2042,33 +2034,33 @@ msgstr ""
" Ic3-T https://launchpad.net/~mazilu59\n"
" Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu"
-#: ../src/empathy-account-assistant.c:166
+#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgstr "S-a produs o eroare în timpul importării conturilor."
-#: ../src/empathy-account-assistant.c:169
+#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
msgstr "S-a produs o eroare în timpul analizării detaliilor contului."
-#: ../src/empathy-account-assistant.c:172
+#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
msgstr "S-a produs o eroare în timpul creării contului."
-#: ../src/empathy-account-assistant.c:174
+#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
msgstr "S-a produs o eroare."
-#: ../src/empathy-account-assistant.c:178
+#: ../src/empathy-account-assistant.c:179
#, c-format
msgid "The error message was: %s"
msgstr "Mesajul de eroare a fost: %s"
-#: ../src/empathy-account-assistant.c:182
+#: ../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 "Puteți să vă întoarceți și să încercați să introduceți din nou detaliile contului sau să închideți asistentul și să adăugați mai târziu detaliile contului din meniul Editare."
-#: ../src/empathy-account-assistant.c:219
-#: ../src/empathy-account-assistant.c:1275
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1292
msgid "An error occurred"
msgstr "S-a produs o eroare"
@@ -2077,110 +2069,110 @@ msgstr "S-a produs o eroare"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:414
-#: ../src/empathy-accounts-dialog.c:560
+#: ../src/empathy-account-assistant.c:413
+#: ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Cont %s nou"
-#: ../src/empathy-account-assistant.c:495
+#: ../src/empathy-account-assistant.c:500
msgid "What kind of chat account do you have?"
msgstr "Ce fel de cont aveți?"
-#: ../src/empathy-account-assistant.c:501
+#: ../src/empathy-account-assistant.c:506
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Aveți alte conturi pe care doriți să le configurați?"
-#: ../src/empathy-account-assistant.c:507
+#: ../src/empathy-account-assistant.c:512
msgid "Enter your account details"
msgstr "Introduceți detaliile contului"
-#: ../src/empathy-account-assistant.c:512
+#: ../src/empathy-account-assistant.c:517
msgid "What kind of chat account do you want to create?"
msgstr "Ce fel de cont doriți să creați?"
-#: ../src/empathy-account-assistant.c:518
+#: ../src/empathy-account-assistant.c:523
msgid "Do you want to create other chat accounts?"
msgstr "Doriți să creați alte conturi?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:530
msgid "Enter the details for the new account"
msgstr "Introduceți detaliile noului cont"
-#: ../src/empathy-account-assistant.c:640
+#: ../src/empathy-account-assistant.c:645
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 "Cu Empathy puteți discuta cu persoane din vecinătate și cu prieteni sau colegi care folosesc Google Talk, AIM, Windows Line și multe alte astfel de programe. Cu un microfon sau o cameră web puteți efectua și apeluri audio sau video."
-#: ../src/empathy-account-assistant.c:657
+#: ../src/empathy-account-assistant.c:662
msgid "Do you have an account you've been using with another chat program?"
msgstr "Aveți un cont pe care l-ați folosit din alt program de mesagerie instant?"
-#: ../src/empathy-account-assistant.c:680
+#: ../src/empathy-account-assistant.c:685
msgid "Yes, import my account details from "
msgstr "Da, importă detaliile contului din "
-#: ../src/empathy-account-assistant.c:701
+#: ../src/empathy-account-assistant.c:706
msgid "Yes, I'll enter my account details now"
msgstr "Da, voi introduce acum detaliile contului"
-#: ../src/empathy-account-assistant.c:723
+#: ../src/empathy-account-assistant.c:728
msgid "No, I want a new account"
msgstr "Nu, doresc un cont nou"
-#: ../src/empathy-account-assistant.c:733
+#: ../src/empathy-account-assistant.c:738
msgid "No, I just want to see people online nearby for now"
msgstr "Nu, pentru moment vreau doar să descopăr persoane din vecinătate"
-#: ../src/empathy-account-assistant.c:754
+#: ../src/empathy-account-assistant.c:759
msgid "Select the accounts you want to import:"
msgstr "Alegeți conturile pe care doriți să le importați:"
-#: ../src/empathy-account-assistant.c:838
+#: ../src/empathy-account-assistant.c:843
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Da"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:850
msgid "No, that's all for now"
msgstr "Nu, atât pentru acum"
-#: ../src/empathy-account-assistant.c:1098
+#: ../src/empathy-account-assistant.c:1109
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 poate descoperi automat și comunica cu persoane conectate la aceeași rețea ca dumneavoastră. Dacă doriți să utilizați această facilitate, verificați dacă detaliile de mai jos sunt corecte. Puteți modifica cu ușurință aceste detalii mai târziu sau puteți dezactiva această facilitate utilizând dialogul „Conturi”"
-#: ../src/empathy-account-assistant.c:1104
-#: ../src/empathy-account-assistant.c:1160
+#: ../src/empathy-account-assistant.c:1115
+#: ../src/empathy-account-assistant.c:1171
msgid "Edit->Accounts"
msgstr "Editare->Conturi"
-#: ../src/empathy-account-assistant.c:1120
+#: ../src/empathy-account-assistant.c:1131
msgid "I don't want to enable this feature for now"
msgstr "Nu vreau să activez această facilitate acum"
-#: ../src/empathy-account-assistant.c:1156
-msgid ""
-"You won't be able to chat with people connected to your local network, as telepathy-salut is not installed.\n"
-"If you want to enable this feature, please install the telepathy-salut package\n"
-"and create a People Nearby account from the Accounts dialog "
-msgstr ""
-"Nu veți putea discuta cu persoane conectate la aceeași rețea ca dumneavoastră pentru că telepathy-salut nu este instalat.\n"
-"Dacă doriți să activați această facilitate, instalați pachetul telepathy-salut\n"
-"și creați un contact „Persoane din apropiere” din dialogul Conturi"
-
-#: ../src/empathy-account-assistant.c:1162
+#: ../src/empathy-account-assistant.c:1167
+#| msgid ""
+#| "You won't be able to chat with people connected to your local network, as "
+#| "telepathy-salut is not installed.\n"
+#| "If you want to enable this feature, please install the telepathy-salut "
+#| "package\n"
+#| "and create a People Nearby account from the Accounts dialog "
+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 "Nu veți putea discuta cu persoane conectate la aceeași rețea ca dumneavoastră pentru că telepathy-salut nu este instalat. Dacă doriți să activați această facilitate, instalați pachetul telepathy-salut și creați un contact „Persoane din apropiere” din dialogul Conturi"
+
+#: ../src/empathy-account-assistant.c:1173
msgid "telepathy-salut not installed"
msgstr "telepathy-salut nu este instalat"
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1250
msgid "Welcome to Empathy"
msgstr "Bun venit la Empathy"
-#: ../src/empathy-account-assistant.c:1248
+#: ../src/empathy-account-assistant.c:1259
msgid "Import your existing accounts"
msgstr "Importă conturile existente"
-#: ../src/empathy-account-assistant.c:1266
+#: ../src/empathy-account-assistant.c:1277
msgid "Please enter personal details"
msgstr "Introduceți datele personale"
@@ -2197,34 +2189,34 @@ msgstr "Există modificări nesalvate pentru contul %s."
msgid "Your new account has not been saved yet."
msgstr "Contul nou nu a fost încă salvat."
-#: ../src/empathy-accounts-dialog.c:261
+#: ../src/empathy-accounts-dialog.c:263
#: ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Se conectează…"
-#: ../src/empathy-accounts-dialog.c:288
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Deconectat – %s"
-#: ../src/empathy-accounts-dialog.c:293
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Deconectat – %s"
-#: ../src/empathy-accounts-dialog.c:306
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Deconectat – Nicio conexiune la rețea"
-#: ../src/empathy-accounts-dialog.c:314
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Mesaj de stare necunoscut"
-#: ../src/empathy-accounts-dialog.c:325
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Deconectat – Cont dezactivat"
-#: ../src/empathy-accounts-dialog.c:731
+#: ../src/empathy-accounts-dialog.c:760
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2232,16 +2224,16 @@ msgstr ""
"Sunteți pe cale să creați un nou cont, ceea ce va duce\n"
"la pierderea modificărilor curente. Doriți să continuați?"
-#: ../src/empathy-accounts-dialog.c:1068
+#: ../src/empathy-accounts-dialog.c:1107
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Doriți să ștergeți %s de pe calculatorul dumneavoastră?"
-#: ../src/empathy-accounts-dialog.c:1072
+#: ../src/empathy-accounts-dialog.c:1111
msgid "This will not remove your account on the server."
msgstr "Această acțiune nu va șterge contul de pe server."
-#: ../src/empathy-accounts-dialog.c:1302
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2249,7 +2241,7 @@ msgstr ""
"Sunteți pe cale să alegeți un alt cont, ceea ce va duce\n"
"la pierderea modificărilor curente. Doriți să continuați?"
-#: ../src/empathy-accounts-dialog.c:1849
+#: ../src/empathy-accounts-dialog.c:1925
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2258,7 +2250,7 @@ msgstr ""
"la pierderea modificărilor curente. Doriți să continuați?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1982
+#: ../src/empathy-accounts-dialog.c:2058
msgid "Accounts"
msgstr "Conturi"
@@ -2450,8 +2442,8 @@ msgstr "Previzualizare video"
msgid "_View"
msgstr "_Vizualizare"
-#: ../src/empathy-chat-window.c:437
-#: ../src/empathy-chat-window.c:457
+#: ../src/empathy-chat-window.c:436
+#: ../src/empathy-chat-window.c:456
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2459,7 +2451,7 @@ msgstr[0] "%s (%d necitit)"
msgstr[1] "%s (%d necitite)"
msgstr[2] "%s (%d necitite)"
-#: ../src/empathy-chat-window.c:449
+#: ../src/empathy-chat-window.c:448
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -2467,7 +2459,7 @@ msgstr[0] "%s (și %u altul)"
msgstr[1] "%s (și altele %u)"
msgstr[2] "%s (și altele %u)"
-#: ../src/empathy-chat-window.c:465
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -2475,7 +2467,7 @@ msgstr[0] "%s (%d necitit de la alții)"
msgstr[1] "%s (%d necitite de la alții)"
msgstr[2] "%s (%d necitite de la alții)"
-#: ../src/empathy-chat-window.c:474
+#: ../src/empathy-chat-window.c:473
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -2483,7 +2475,7 @@ msgstr[0] "%s (%d necitit de la toți)"
msgstr[1] "%s (%d necitite de la toți)"
msgstr[2] "%s (%d necitite de la toți)"
-#: ../src/empathy-chat-window.c:685
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Scrie un mesaj."
@@ -3127,7 +3119,7 @@ msgstr "_Publică contactelor locația mea"
msgid "_Reduce location accuracy"
msgstr "_Redu acuratețea locației"
-#: ../src/empathy-status-icon.c:175
+#: ../src/empathy-status-icon.c:176
msgid "Respond"
msgstr "Răspunde"
@@ -3143,64 +3135,64 @@ msgstr "_Ieșire"
msgid "Contact Map View"
msgstr "Vizualizare hartă de contacte"
-#: ../src/empathy-debug-window.c:1065
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Salvează"
-#: ../src/empathy-debug-window.c:1187
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Fereastră de depanare"
-#: ../src/empathy-debug-window.c:1267
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pauză"
-#: ../src/empathy-debug-window.c:1279
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Depanare"
-#: ../src/empathy-debug-window.c:1305
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "Informativ"
-#: ../src/empathy-debug-window.c:1311
-#: ../src/empathy-debug-window.c:1360
+#: ../src/empathy-debug-window.c:1343
+#: ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "Mesaj"
-#: ../src/empathy-debug-window.c:1317
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "Avertisment"
-#: ../src/empathy-debug-window.c:1323
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "Critic"
-#: ../src/empathy-debug-window.c:1329
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "Eroare"
-#: ../src/empathy-debug-window.c:1348
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Timp"
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domeniu"
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Categorie"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1424
msgid "The selected connection manager does not support the remote debugging extension."
msgstr "Administratorul de conexiuni ales nu suportă extensia de depanare de la distanță."
@@ -3213,33 +3205,42 @@ msgstr "Invită participant"
msgid "Choose a contact to invite into the conversation:"
msgstr "Alegeți contactul care va fi invitat în conversație:"
-#: ../src/empathy-accounts.c:196
-msgid "Try to import any recognized accounts and display an assistant if that fails"
-msgstr "Încearcă importarea conturilor recunoscute și afișează un asistent dacă aceasta eșuează"
-
-#: ../src/empathy-accounts.c:201
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Nu afișa nici un dialog; fă orice acțiune (ex: importare) și ieși"
-#: ../src/empathy-accounts.c:205
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Nu afișa dialoguri dacă există conturi care nu sunt de tipul „salut”"
+
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Alege inițial contul dat (ex: gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:207
-#| msgid "account"
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:215
-#| msgid "Import Accounts"
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Conturi Empathy"
-#: ../src/empathy-accounts.c:231
-#| msgid "Accounts"
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
msgstr "Conturi"
+#~ msgid "Salut account is created"
+#~ msgstr "Contul Salut a fost creat"
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "Dacă la prima pornire a Empathy, contul Salut a fost creat."
+#~ msgid "Show the accounts dialog"
+#~ msgstr "Arată dialoguri cu conturile"
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr ""
+#~ "Încearcă importarea conturilor recunoscute și afișează un asistent dacă "
+#~ "aceasta eșuează"
#~ msgid "Hidden"
#~ msgstr "Ascuns"
#~ msgid "<b>Location</b>"
diff --git a/po/ru.po b/po/ru.po
index 98c4efb17..5ecada959 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,26 +1,24 @@
-# translation of ru.po to Russian
# Russian translation of Empathy
-# Copyright (C) 2003, 2008, 2009 Free Software Foundation, Inc.
-#
+# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
#
# Grigory Bakunov <bobuk@justos.org>, 2003, 2005.
# Il'ya Mertsalov <a567765@yandex.ru>, 2008.
-# Leonid Kanter <leon@asplinux.ru>, 2009.
+#
msgid ""
msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: empathy trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-20 14:25+0300\n"
-"PO-Revision-Date: 2009-10-05 14:41+0300\n"
-"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"POT-Creation-Date: 2010-03-10 00:12+0200\n"
+"PO-Revision-Date: 2010-03-09 21:10+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
+"Language-Team: Russian <gnome-cyr@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"<d.yacenko@gmail.com>\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
@@ -28,11 +26,11 @@ msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
-msgstr "Программа обмена сообщений Empathy"
+msgstr "Клиент обмена мгновенными сообщениями Empathy"
#: ../data/empathy.desktop.in.in.h:3
msgid "IM Client"
-msgstr "Программа мгновенных сообщений"
+msgstr "Клиент обмена мгновенными сообщениями"
#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
@@ -56,21 +54,20 @@ msgstr "Тема окна беседы"
#: ../data/empathy.schemas.in.h:4
msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Список языков, используемых при проверке орфографии, разделённых запятыми "
"(например «en, fr, ru»)."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
-msgstr "Сжатый список собеседников"
+msgstr "Компактный список собеседников"
#: ../data/empathy.schemas.in.h:6
msgid "Connection managers should be used"
-msgstr "Используемый менеджер соединений"
+msgstr "Используемые менеджеры соединений"
#: ../data/empathy.schemas.in.h:7
-#, fuzzy
msgid "Contact list sort criterion"
msgstr "Критерий упорядочивания списка собеседников"
@@ -80,11 +77,11 @@ msgstr "Каталог, используемый для выбора изобр
#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
-msgstr "Выключить всплывающие уведомления в состоянии «_отошёл»"
+msgstr "Выключить всплывающие уведомления в состоянии «отошёл»"
#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
-msgstr "Выключить звуки в состоянии «_отошёл»"
+msgstr "Выключить звуки в состоянии «отошёл»"
#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
@@ -100,15 +97,15 @@ msgstr "Empathy может использовать сотовую сеть дл
#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
-msgstr "Empathy может сеть для определения местоположения"
+msgstr "Empathy может использовать сеть для определения местоположения"
#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
-msgstr "Каталог для загрузки файлов"
+msgstr "Папка Empathy для загрузки файлов"
#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
-msgstr "Был ли запрос об импорте учётных записей"
+msgstr "Empathy запросил импортирование учётных записей"
#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
@@ -116,7 +113,7 @@ msgstr "Присоединяться при запуске"
#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy должен снизить точность местоположения"
+msgstr "Empathy должен снижать точность местоположения"
#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
@@ -124,7 +121,7 @@ msgstr "Empathy должен использовать аватар контак
#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
-msgstr "Включить инструмент разработчика WebKit"
+msgstr "Включить инструменты разработчика WebKit"
#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
@@ -144,11 +141,11 @@ msgstr "Скрывать главное окно."
#: ../data/empathy.schemas.in.h:25
msgid "MC 4 accounts have been imported"
-msgstr "Были импортированы учетные записи MC 4"
+msgstr "Учётные записи MC 4 импортированы"
#: ../data/empathy.schemas.in.h:26
msgid "MC 4 accounts have been imported."
-msgstr "Были импортированы учетные записи MC 4"
+msgstr "Учётные записи MC 4 импортированы."
#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
@@ -159,12 +156,13 @@ msgid "Open new chats in separate windows"
msgstr "Открывать новые беседы в новом окне"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Путь к теме adium"
+msgid "Path of the Adium theme to use"
+msgstr "Путь к используемой теме Adium"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Путь к теме adium, используемой если тема используемая чатом - adium."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Путь к используемой теме Adium, если тема, используемая для беседы — Adium."
#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
@@ -195,38 +193,37 @@ msgid "Play a sound when we log out"
msgstr "Воспроизводить звук при выходе из сети"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr ""
-"Показывать ли всплывающие уведомления если беседа находится не в фокусе"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Показывать всплывающие уведомления, если беседа находится не в фокусе"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
-msgstr "Показывать ли всплывающие уведомления когда когда контакт вошел"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Показывать всплывающие уведомления, когда появляется собеседник"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
-msgstr "Показывать ли всплывающие уведомления когда когда контакт вышел"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Показывать всплывающие уведомления, когда собеседник уходит"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Учётная запись Salut создана"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Показывать аватары"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
-msgstr "Показать список собеседников в комнатах"
+msgstr "Показывать список собеседников в комнатах"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Показывать подсказку о закрытии главного окна"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Показывать отсутствующих собеседников"
+#: ../data/empathy.schemas.in.h:45
+msgid "Show protocols"
+msgstr "Показывать протоколы"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Языки для проверки орфографии"
@@ -256,211 +253,212 @@ msgid "Use theme for chat rooms"
msgstr "Использовать тему для бесед"
#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
-"Какой WebKit инструмент разработчика, как например the Web Inspector, будет "
-"разрешен."
+"Может ли Empathy публиковать местоположение пользователя для его "
+"собеседников."
#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Публиковать или нет местоположение пользователя для его контактов?"
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Может ли Empathy использовать GPS для определения местоположения."
#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Должен ли Empathy использовать GPS для определения местоположения."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Может ли Empathy использовать сотовую сеть для определения местоположения."
#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
-"Должен ли Empathy использовать сотовую сеть для определения местоположения."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Может ли Empathy использовать сеть для определения местоположения."
#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Должен ли Empathy использовать сеть для определения местоположения."
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Был ли запрос об импортировании учётных записей из других приложений."
#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Был ли запрос о импорте учётных записей из других приложений."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Должен ли Empathy автоматически входить в ваши учётные записи при запуске."
#: ../data/empathy.schemas.in.h:59
msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Автоматически подключать учётные записи при запуске."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Должен ли Empathy уменьшать точность определения местоположения по причинам "
+"приватности."
#: ../data/empathy.schemas.in.h:60
-#, fuzzy
msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "Использовать ли аватары собеседников как значки окон с беседами."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Использовать ли аватар собеседника в качестве значка окна беседы."
#: ../data/empathy.schemas.in.h:61
msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "Использовать ли аватары собеседников как значки окон с беседами."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Должны ли быть включены инструменты разработчика WebKit, например Web "
+"Inspector."
#: ../data/empathy.schemas.in.h:62
-#, fuzzy
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
-msgstr "Использовать менеджер сети для автоматической установки/разрыва связи."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Использовать ли менеджеры связности для автоматического отключения или "
+"переподключения."
#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Создавать учётную запись Salut при первом запуске."
+"Whether to check words typed against the languages you want to check with."
+msgstr "Проверять ли введённые слова из списка языков для проверки орфографии."
#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "Проверять ли набранные слова по списку языков для проверки орфографии."
-
-#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
-"Преобразовывать ли текстовые улыбки (смайлы) в разговорах в графические "
+"Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические "
"изображения."
-#: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/empathy.schemas.in.h:65
+msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:66
msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети."
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether to play a sound to notify of events."
msgstr "Воспроизводить ли звук для уведомления о событиях."
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether to play a sound to notify of incoming messages."
msgstr "Воспроизводить ли звук для уведомления о входящих сообщениях."
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether to play a sound to notify of new conversations."
msgstr "Воспроизводить ли звук для уведомления о начале новой беседы."
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Воспроизводить ли звук для уведомления об исходящих сообщениях."
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether to play a sound when logging into a network."
msgstr "Воспроизводить ли звук при входе в сеть."
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether to play a sound when logging out of a network."
msgstr "Воспроизводить ли звук при выходе из сети."
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+"Воспроизводить ли звуковые уведомления в состояниях «отошёл» или «занят»."
+
#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "Воспроизводить ли звуки в состоянии «отошёл» или «занят»."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Показывать ли всплывающее уведомление, когда собеседник выходит из сети."
#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
-msgstr "Показывать ли всплывающие уведомления когда контакт отключился."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Показывать ли всплывающее уведомление, когда собеседник выходит в сеть."
#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr "Показывать ли всплывающие уведомления когда контакт подключился"
-
-#: ../data/empathy.schemas.in.h:77
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
-"Показывать ли всплывающее уведомление о получении нового сообщения когда "
+"Показывать ли всплывающее уведомление о получении нового сообщения, когда "
"беседа уже ведётся, но не находится в фокусе."
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Показывать ли всплывающее уведомление при получении нового сообщения."
+
#: ../data/empathy.schemas.in.h:78
msgid ""
-"Whether or not to show a popup notification when receiving a new message."
-msgstr "Показывать ли всплывающие уведомление при получении нового сообщения."
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Показывать ли аватары собеседников в списке собеседников и окнах беседы."
#: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "Показывать ли аватары собеседников в списке или окнах разговоров."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Показывать ли собеседников не в сети."
#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "Показывать недоступных в сети собеседников в списке или нет."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Показывать ли всплывающие уведомления «отошёл» или «занят»."
#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "Показывать ли всплывающие уведомления «отошёл» или «занят»."
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Показывать ли протоколы для собеседников в списке собеседников."
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "Показывать или нет список собеседников в комнатах чата."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Показывать ли список собеседников в комнатах."
#: ../data/empathy.schemas.in.h:83
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "Подтверждать закрытие главного окна."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Показывать ли компактный список собеседников."
#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Показывать ли список собеседников сжатым или нет."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» "
+"в строке заголовка."
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "Использовать темы для окон бесед или нет."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Использовать ли темы для комнат."
#: ../data/empathy.schemas.in.h:86
-#, fuzzy
msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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» список будет упорядочен по "
+"статусу."
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Не могу установить пустое имя"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление учётными записями для обмена сообщениями и VoIP"
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Учётные записи обмена сообщениями и VoIP"
+
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
-msgstr "Хэш принятого файла не соответствует переданному"
+msgstr "Хэш принятого файла не совпадает с хэшем отправленного"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
-msgstr "Передача файлов не поддерживается удаленным контактом"
+msgstr "Удалённый собеседник не поддерживает передачу файлов"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
-msgstr "Выьранный файл не является регулярным"
+msgstr "Выбранный файл не является обычным файлом"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
-msgstr "Выбранный файл является пустым"
+msgstr "Выбранный файл пуст"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:279
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Люди поблизости"
#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
-msgstr "Неподдерживаемый тип сокета"
+msgstr "Тип «сокет» не поддерживается"
#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
@@ -486,41 +484,97 @@ msgstr "Во время передачи файла возникла ошибк
msgid "The other participant is unable to transfer the file"
msgstr "Собеседник не может передавать файлы"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Неизвестная причина"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Доступен"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Занят"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Отошёл"
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "Скрытый"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Невидимый"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Не в сети"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Причина не указана"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "Установлен статус «не в сети»"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Ошибка сети"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Аутентификация не удалась"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Ошибка шифрования"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Имя уже занято"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Сертификат недоступен"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Сертификат не является доверенным"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Сертификат устарел"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Сертификат не активирован"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Сертификат с ошибкой в имени узла"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Отпечатки сертификатов не совпадают"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Сертификат подписан самостоятельно"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Ошибка сертификата"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Люди поблизости"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
-msgstr "_Yahoo! япония"
+msgstr "Yahoo! Япония"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
-msgstr "Чат фейсбука"
+msgstr "Беседа Facebook"
#: ../libempathy/empathy-time.c:137
#, c-format
@@ -574,36 +628,68 @@ msgstr[2] "%d месяцев назад"
msgid "in the future"
msgstr "в будущем"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Все"
-#: ../libempathy-gtk/empathy-account-widget.c:433
-#: ../libempathy-gtk/empathy-account-widget.c:489
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1252
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "_Войти"
-#: ../libempathy-gtk/empathy-account-widget.c:1302
-msgid "Enabled"
-msgstr "Включено"
-
-#.  Translators: this is used only when built on a moblin platform 
-#: ../libempathy-gtk/empathy-account-widget.c:1308
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../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-account-widget.c:1553
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+msgid "This account already exists on the server"
+msgstr "Эта учётная запись уже существует на сервере"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "Создать новую учётную запись на сервере"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, 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:2039
+#, c-format
+msgid "%s Account"
+msgstr "Учётная запись %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Новая учётная запись"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> МоеИмя</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> MyScreenName"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -622,7 +708,7 @@ msgstr "Дополнительно"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Пароль:"
@@ -633,16 +719,16 @@ msgstr "_Имя:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "What is your AIM password?"
-msgstr "Какой у вас AIM пароль?"
+msgstr "Какой у вас пароль AIM?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM screen name?"
-msgstr "Какое у вас AIM имя?"
+msgstr "Какое у вас имя пользователя AIM?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -651,7 +737,7 @@ msgstr "П_орт:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -660,8 +746,8 @@ msgstr "_Сервер:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> имяпользователя</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> имя_пользователя"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -671,15 +757,15 @@ msgstr "_Идентификатор:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
msgid "What is your GroupWise User ID?"
-msgstr "Какой у вас GroupWise ИД пользователя"
+msgstr "Какой у вас ID пользователя GroupWise?"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise password?"
-msgstr "Какой у вас GroupWise пароль?"
+msgstr "Какой у вас пароль GroupWise?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Пример:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -695,16 +781,49 @@ msgstr "Какой у вас пароль ICQ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+msgid "_Character set:"
msgstr "_Кодировка:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Новая сеть"
+#: ../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:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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: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:227
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "Отсутствует"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "Кодировка:"
+msgid "Character set:"
+msgstr "_Кодировка:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Network"
@@ -732,15 +851,15 @@ msgstr "Настоящее имя:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Servers"
-msgstr "Серверы:"
+msgstr "Серверы"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> user@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> пользователь@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> user@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> пользователь@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -755,55 +874,75 @@ msgid "Reso_urce:"
msgstr "Ре_сурс:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Это ваше имя пользователя, а не имя для входа в систему Facebook.\n"
+"Если ваш адрес facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
+"Используйте <a href=\"http://www.facebook.com/username/\">эту страницу</a> "
+"для выбора имени пользователя Facebook, если у вас его ещё нет."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Использовать старое _шифрование (SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Какой у вас пароль Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Какое у вас имя пользователя Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Какой у вас Google ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
-msgstr "Какой у вас Google пароль?"
+msgstr "Какой у вас пароль Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Какой у вас Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
-msgstr "Какой у вас Jabber пароль?"
+msgstr "Какой у вас пароль Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
-msgstr "Какой хотите Jabber ID?"
+msgstr "Какой Jabber ID вы хотите?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
-msgstr "Какой хотите Jabber пароль?"
+msgstr "Какой пароль Jabber вы хотите?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "Требуется шифров_ание (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Игнорировать ошибки сертификатов SSL"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> user@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Пример:</b> user@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Какой у вас Windows Live пароль?"
+msgid "What is your Windows Live ID?"
+msgstr "Какой у вас Windows Live ID?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Какое у вас имя пользователя Windows Live?"
+msgid "What is your Windows Live password?"
+msgstr "Какой у вас пароль Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
+msgid "_E-mail address:"
msgstr "_Электронная почта:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
@@ -827,53 +966,134 @@ msgid "_Published Name:"
msgstr "_Имя:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> user@my.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Пример:</b> user@my.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Имя пользователя для аутентификации:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Найти STUN"
+msgid "Discover Binding"
+msgstr "Обнаруживать соединения"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Автоматический поиск сервера STUN"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Имя хоста прокси для исходящих запросов"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "Порт STUN:"
+msgid "Interval (seconds)"
+msgstr "Интервал (в секундах)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "What is your SIP account password?"
-msgstr "Какой ваш пароль к учетной записи SIP"
+msgid "Keep-Alive Options"
+msgstr "Параметры Keep-Alive"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "What is your SIP login ID?"
-msgstr "Какой ваш логин ИД SIP?"
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "Искать запись DNS SRV в домене службы для имени хоста сервера STUN."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Свободная маршрутизация"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Механизм:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Различные параметры"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "Параметры NAT Traversal"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Порт прокси для исходящих запросов."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Параметры прокси"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"Имя пользователя для аутентификации SIP, если оно отличается\n"
+"от имени пользователя SIP URI."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Транспорт:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Обновлять регистрационное соединение, если обнаружено, что внешний адрес для "
+"клиента отличается от локального соединения."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Использовать свободную маршрутизацию и заголовок маршрута, как рекомендуется "
+"в RFC 3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "What is your SIP account password?"
+msgstr "Какой у вас пароль учётной записи SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+msgid "What is your SIP login ID?"
+msgstr "Какой у вас ID входа для SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Имя:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Использовать _Yahoo япония"
+msgid "Use _Yahoo! Japan"
+msgstr "Использовать _Yahoo! Япония"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
-msgstr "Какой ваш ИД Yahoo!"
+msgstr "Какой у вас Yahoo! ID?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! password?"
-msgstr "Какой ваш пароль Yahoo!"
+msgstr "Какой у вас пароль Yahoo! ?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
-msgstr "_Игнорировать приглашения в беседы и конференции"
+msgid "_Ignore conference and chat room invitations"
+msgstr "_Игнорировать приглашения к беседам и конференциям"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
@@ -885,125 +1105,205 @@ msgid "Couldn't convert image"
msgstr "Не удалось преобразовать изображение"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "Система не поддерживает ни один из нужных форматов"
+msgid "None of the accepted image formats are supported on your system"
+msgstr ""
+"Ни один из разрешённых форматов изображений не поддерживается в вашей системе"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:913
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
-msgstr "Выберите изображение вашего аватара"
+msgstr "Выберите изображение для аватара"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:916
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Нет изображения"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:978
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Изображения"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:982
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "Все файлы"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Щёлкните для увеличения"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:232
msgid "Failed to reconnect this chat"
-msgstr "Ошибка переподключения к этому чату"
+msgstr "Не удалсь повторно подключиться к этому чату"
+
+#: ../libempathy-gtk/empathy-chat.c:654
+msgid "Failed to join chat room"
+msgstr "Не удалось войти в комнату"
+
+#: ../libempathy-gtk/empathy-chat.c:672
+msgid "Failed to open private chat"
+msgstr "Не удалось открыть личную беседу"
+
+#: ../libempathy-gtk/empathy-chat.c:711
+msgid "Topic not supported on this conversation"
+msgstr "В этой беседе темы не поддерживаются"
+
+#: ../libempathy-gtk/empathy-chat.c:717
+msgid "You are not allowed to change the topic"
+msgstr "Вы не можете менять тему"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: очистить все сообщения в текущей беседе"
+
+#: ../libempathy-gtk/empathy-chat.c:849
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <тема>: установить тему текущей беседы"
+
+#: ../libempathy-gtk/empathy-chat.c:852
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <ID комнаты>: войти в новую комнату"
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Неподдерживаемая команда"
+#: ../libempathy-gtk/empathy-chat.c:855
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <ID комнаты>: войти в новую комнату"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:858
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <ID контакта> [<сообщение>]: открыть личную беседу"
+
+#: ../libempathy-gtk/empathy-chat.c:861
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <ID контакта> <сообщение>: открыть личную беседу"
+
+#: ../libempathy-gtk/empathy-chat.c:864
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <псевдоним>: изменить псевдоним на текущем сервере"
+
+#: ../libempathy-gtk/empathy-chat.c:867
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <сообщение>: отправить сообщение о ДЕЙСТВИИ"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+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:875
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<команда>]: показать все поддерживаемые команды. Если <команда> "
+"определена, показать её использование."
+
+#: ../libempathy-gtk/empathy-chat.c:885
+#, c-format
+msgid "Usage: %s"
+msgstr "Использование: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:914
+msgid "Unknown command"
+msgstr "Неизвестная команда"
+
+#: ../libempathy-gtk/empathy-chat.c:1035
+msgid "Unknown command; see /help for the available commands"
+msgstr "Неизвестная команда; для всех доступных команд см. /help"
+
+#: ../libempathy-gtk/empathy-chat.c:1173
msgid "offline"
msgstr "не в сети"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "invalid contact"
msgstr "неверный собеседник"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "permission denied"
msgstr "отказано"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "too long message"
msgstr "слишком длинное сообщение"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "not implemented"
msgstr "эта возможность не санкционирована"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "unknown"
msgstr "неизвестно"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1192
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Ошибка при отправке сообщения «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1222
#, c-format
msgid "Topic set to: %s"
msgstr "Тема: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1224
msgid "No topic defined"
msgstr "Тема не установлена"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1623
msgid "(No Suggestions)"
-msgstr "(нет вариантов)"
+msgstr "(Нет предположений)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1677
msgid "Insert Smiley"
msgstr "Вставить улыбку"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "От_править"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1729
msgid "_Spelling Suggestions"
msgstr "_Варианты правописания"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1823
+msgid "Failed to retrieve recent logs"
+msgstr "Не удалось получить последние журналы"
+
+#: ../libempathy-gtk/empathy-chat.c:1954
#, c-format
msgid "%s has disconnected"
-msgstr "%s вышел из сети"
+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:1184
+#: ../libempathy-gtk/empathy-chat.c:1961
#, c-format
msgid "%1$s was kicked by %2$s"
-msgstr "%1$s был кикнут пользователем %2$s"
+msgstr "%2$s выгнал %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1964
#, 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:1195
+#: ../libempathy-gtk/empathy-chat.c:1972
#, c-format
msgid "%1$s was banned by %2$s"
-msgstr "%1$s был забанен пользователем %2$s"
+msgstr "%2$s забанил %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1975
#, c-format
msgid "%s was banned"
-msgstr "%s был забанен"
+msgstr "%s забанили"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1979
#, c-format
msgid "%s has left the room"
msgstr "%s покинул беседу"
@@ -1013,60 +1313,81 @@ msgstr "%s покинул беседу"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1988
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2013
#, c-format
msgid "%s has joined the room"
msgstr "%s присоединился к беседе"
-#: ../libempathy-gtk/empathy-chat.c:1366 ../src/empathy-call-window.c:1295
+#: ../libempathy-gtk/empathy-chat.c:2038
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s теперь известен как %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Отсоединён"
-#: ../libempathy-gtk/empathy-chat.c:1802
+#: ../libempathy-gtk/empathy-chat.c:2695
+msgid "Wrong password; please try again:"
+msgstr "Неправильный пароль. Попробуйте снова:"
+
+#: ../libempathy-gtk/empathy-chat.c:2696
+msgid "Retry"
+msgstr "Повторить"
+
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "This room is protected by a password:"
+msgstr "Эта комната защищена паролем:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Join"
+msgstr "Войти"
+
+#: ../libempathy-gtk/empathy-chat.c:2842
msgid "Connected"
msgstr "Соединён"
-#: ../libempathy-gtk/empathy-chat.c:1852
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Беседа"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Тема:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:789
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Копировать адрес ссылки"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:796
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Открыть ссылку"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:237
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Редактировать информацию о собеседнике"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:288
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Личная информация"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Новый собеседник"
@@ -1078,208 +1399,212 @@ msgstr "Решить _позже"
msgid "Subscription Request"
msgstr "Запрос на подписку"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Вы хотите удалить группу «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Удаляю группу"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1463
-#: ../libempathy-gtk/empathy-contact-list-view.c:1540
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Удалить"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Вы хотите удалить этого собеседника «%s» из вашего списка?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Удаляю собеседника"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
-msgstr "_Добавить собеседника..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Добавить собеседника…"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Разговор"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
-msgstr "_Аудио вызов"
+msgstr "_Аудиовызов"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
-msgstr "_Видео вызов"
+msgstr "_Видеовызов"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "Просмотр предыдущих _бесед"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Предыдущие _беседы"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Послать файл"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
-msgstr "Предоставить доступ у моему рабочему столу"
+msgstr "Предоставить доступ к моему рабочему столу"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Информ_ация"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Правка"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Пригласить в эту беседу"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+msgid "Inviting you to this room"
+msgstr "Приглашение в комнату"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr "_Пригласить"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+msgid "_Invite to chat room"
+msgstr "_Пригласить в комнату"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Выберите контакт"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Сохранить аватар"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Невозможно сохранить аватар"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:235
msgid "Select"
msgstr "Выбрать"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Группа"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:476
msgid "Country ISO Code:"
-msgstr "Код страны по ISO:"
+msgstr "Код ISO страны:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:478
msgid "Country:"
msgstr "Страна:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:480
msgid "State:"
msgstr "Штат:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:482
msgid "City:"
msgstr "Город:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:484
msgid "Area:"
msgstr "Область:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:486
msgid "Postal Code:"
msgstr "Почтовый индекс:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:488
msgid "Street:"
msgstr "Улица:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:490
msgid "Building:"
-msgstr "Строение:"
+msgstr "Здание:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:492
msgid "Floor:"
msgstr "Этаж:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:494
msgid "Room:"
msgstr "Комната:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:496
msgid "Text:"
msgstr "Текст:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:498
msgid "Description:"
msgstr "Описание:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:500
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:502
msgid "Accuracy Level:"
-msgstr "Уровень точности:"
+msgstr "Точность:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Error:"
msgstr "Ошибка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:506
msgid "Vertical Error (meters):"
-msgstr "Вертикальная ошибка (метров)"
+msgstr "Ошибка по вертикали (в метрах):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:508
msgid "Horizontal Error (meters):"
-msgstr "Горизонтальная ошибка (метров)"
+msgstr "Ошибка по горизонтали (в метрах):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:510
msgid "Speed:"
msgstr "Скорость:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:512
msgid "Bearing:"
msgstr "Азимут:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:514
msgid "Climb Speed:"
msgstr "Скорость набора высоты:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:516
msgid "Last Updated on:"
msgstr "Последнее обновление:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:518
msgid "Longitude:"
-msgstr "Долгота"
+msgstr "Долгота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:520
msgid "Latitude:"
-msgstr "Широта"
+msgstr "Широта:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:522
msgid "Altitude:"
-msgstr "Высота"
+msgstr "Высота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Местоположение</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Местоположение"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:601
msgid "<b>Location</b>, "
-msgstr "<b>Местоположение</b>"
+msgstr "<b>Местоположение</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:651
msgid "%B %e, %Y at %R UTC"
msgstr "%e %b %Y в %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+msgid "Save Avatar"
+msgstr "Сохранить аватар"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+msgid "Unable to save avatar"
+msgstr "Невозможно сохранить аватар"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Местоположение</b> от (дата)\t"
@@ -1294,47 +1619,42 @@ msgstr "День рождения:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
-msgstr "Информация об используемой программе"
+msgstr "Информация о клиенте"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
msgid "Client:"
msgstr "Программа:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "Собеседник"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Информация о собеседнике"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Электронная почта:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "Адрес эл. почты:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
msgstr "Полное имя:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Группы"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Идентификатор:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Информация запрошена..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "Информация запрошена&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "Операционная система:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1342,40 +1662,40 @@ msgstr ""
"Выберите группы, в которых должен появиться собеседник. Можно выбрать больше "
"одной группы или не выбирать вообще."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Версия:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
msgstr "Веб-сайт:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "_Добавить группу"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "новый сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
-msgstr "Сервер:"
+msgstr "Сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Порт"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "Шифрование SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:302
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Учётная запись"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Дата"
@@ -1385,7 +1705,7 @@ msgstr "Беседы"
#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Previous Conversations"
-msgstr "Посмотреть предыдущие беседы"
+msgstr "Предыдущие беседы"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
msgid "Search"
@@ -1395,58 +1715,84 @@ msgstr "Поиск"
msgid "_For:"
msgstr "_Для:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Позвонить"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
-msgid "C_hat"
-msgstr "По_беседовать"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "Идентификатор собеседника:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+msgid "C_hat"
+msgstr "_Беседа"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Новая беседа"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "_Передавать видео"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Вызов"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "Новый вызов"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:177
-#: ../libempathy-gtk/empathy-presence-chooser.c:213
-msgid "Custom Message..."
-msgstr "Другие сообщение..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
+msgstr "Другое сообщение…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:230
-#: ../libempathy-gtk/empathy-presence-chooser.c:232
-msgid "Edit Custom Messages..."
-msgstr "Другие сообщения..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
+msgstr "Изменить настраиваемые сообщения…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:331
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
-msgstr "Кликните чтобы убрать предпочтение с этого состояния"
+msgstr "Щёлкните, чтобы удалить этот статус из любимых"
-#: ../libempathy-gtk/empathy-presence-chooser.c:340
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
-msgstr "Кликните чтобы сделать это состояние предпочтительным"
+msgstr "Щёлкните, чтобы сделать этот статус любимым"
-#: ../libempathy-gtk/empathy-presence-chooser.c:374
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
-msgstr "Установить состояние"
+msgstr "Установить статус"
-#: ../libempathy-gtk/empathy-presence-chooser.c:845
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
-msgstr "Установить наличие и текущее состояние"
+msgstr "Установить присутствие и текущее состояние"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1098
-msgid "Custom messages..."
-msgstr "Другие сообщения..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messages…"
+msgstr "Другие сообщения…"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Найти:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Учитывать регистр"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Фраза не найдена"
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
@@ -1478,31 +1824,31 @@ msgstr "Отсоединение от сервера"
#: ../libempathy-gtk/empathy-sound.c:65
msgid "Incoming voice call"
-msgstr "Входящий звонок"
+msgstr "Входящий вызов"
#: ../libempathy-gtk/empathy-sound.c:67
msgid "Outgoing voice call"
-msgstr "Исходящий звонок"
+msgstr "Исходящий вызов"
#: ../libempathy-gtk/empathy-sound.c:69
msgid "Voice call ended"
-msgstr "Звонок завершён"
+msgstr "Вызов завершён"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
-msgstr "Введите другое сообщение..."
+msgstr "Введите своё сообщение"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
-msgstr "Введите другое сообщение..."
+msgstr "Изменить настраиваемые сообщения"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
msgid "Add _New Preset"
-msgstr "Добавить _новые предустановки"
+msgstr "Д_обавить новые предустановки"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
msgid "Saved Presets"
-msgstr "Сохраненные предустановки"
+msgstr "Сохранённые предустановки"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -1520,17 +1866,17 @@ msgstr "Ясная"
msgid "Blue"
msgstr "Голубая"
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
-msgstr "Невозможно открыть URI"
+msgstr "Невозможно открыть URL"
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Выберите файл"
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
-msgstr "Выбрать место назначения"
+msgstr "Выберите назначение"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -1699,108 +2045,47 @@ msgstr "Западный"
msgid "Vietnamese"
msgstr "Вьетнамский"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Собеседник для отображения в апплете. Пустое, если нет отображаемых "
-"собеседников."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "Аватар собеседника. Пусто, если у собеседника нет аватара."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Мегафон"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:522
-msgid "Talk!"
-msgstr "Говорите!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "О_б апплете"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Информация"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Параметры"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Задайте информацию о собеседнике."
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Выберите собеседника..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Выбранный собеседник не может получать файлы."
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:141
-msgid "The contact selected cannot receive files."
-msgstr ""
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:147
-#, fuzzy
-msgid "The contact selected is offline."
-msgstr "Собеседник вышел из сети"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Выбранный собеседник не в сети."
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
-#, fuzzy
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
msgid "No error message"
-msgstr "слишком длинное сообщение"
+msgstr "Сообщение об ошибке отсутствует"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:278
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
-msgstr ""
+msgstr "Мгновенное сообщение (Empathy)"
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Присутствие"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Установить состояние"
-
-#: ../src/empathy.c:835
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Не соединяться при запуске"
-#: ../src/empathy.c:839
-#, fuzzy
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Не показывать список собеседников при запуске"
-
-#: ../src/empathy.c:843
-msgid "Show the accounts dialog"
-msgstr "Показать диалог настройки учётных записей"
+msgstr "Не показывать список собеседников и диалоговые окна при запуске"
-#: ../src/empathy.c:855
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
-msgstr " — Empathy программа обмена мгновенными сообщениями"
+msgstr " - клиент обмена мгновенными сообщениями Empathy"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"Empathy - свободная программа, вы можете распространять и/или модифицировать "
-"её на условиях указанных в GNU General Public License опубликованой Free "
+"Empathy — свободная программа, вы можете распространять и/или модифицировать "
+"её на условиях, указанных в GNU General Public License опубликованой Free "
"Software Foundation; либо в версии 2 или (по вашему выбору) любой более "
"поздней версии."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -1812,7 +2097,7 @@ msgstr ""
"ПОЛЕЗНОСТИ или ПРИГОДНОСТИ ДЛЯ КАКИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public "
"License."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -1823,248 +2108,269 @@ msgstr ""
"Обеспечения: Free Software Foundation, Inc., 51 Franklin Street, Fifth "
"Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Приложение быстрого обмена сообщениями для GNOME"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Grigory Bakunov\n"
"Dan Korostelev\n"
"Mikhail Zabaluev\n"
-"Валёк Филиппов\n"
-"Дмитрий Яценко"
+"Валёк Филиппов"
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
-msgstr "Произошла ошибка при импорте учётных записей."
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "При импортировании учётных записей произошла ошибка."
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
-msgstr "Произошла ошибка при разборе состава учётных записей"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "Во время разбора информации об учётной записи произошла ошибка."
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
-msgstr "Произошла ошибка при создании учетной записи."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "Во время создания учётной записи произошла ошибка."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
msgstr "Произошла ошибка."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Было сообщение об ошибке: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Сообщение об ошибке: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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 ""
-"Вы можете вернуться назад и попробовать ввести ваши идентификационные данные "
-"учетной записи или выйти из этого помощника и добавить учетные данные позже "
-"из меню Правка."
+"Вы можете вернуться назад и попытаться ввести информацию об учётной записи "
+"ещё раз, или закрыть этот мастер и добавить учётные записи позже из меню "
+"«Правка»."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Произошла ошибка"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1429
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
-msgstr "Новая учётная запись %s"
+msgstr "Новая учетная запись %s"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
-msgstr "Какого рода у вас учётная запись чата?"
+msgstr "Какой у вас тип учётной записи?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
-msgstr ""
-"Есть ли у вас другие учетные записи чатов которые вы хотели бы установить?"
+msgstr "У вас есть ещё какие-нибудь учётные записи для настройки?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
-msgstr "Введите параметры вашей учетной записи"
+msgstr "Введите информацию о вашей учётной записи"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
-msgstr "Какого сорта учетную запись чата вы хотели бы создать?"
+msgstr "Какой тип учётной записи вы хотите создать?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
-msgstr "Хотите ли вы создать другую учетную запись чата?"
+msgstr "Хотите создать другие учётные записи?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
-msgstr "Введите параметры новой учетной записи"
+msgstr "Введите информацию о новой учётной записи"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:653
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 ""
-"Empathy позволяет вести онлайн-чат с друзьями и коллегами, которые "
-"используют Google Talk, AIM, Windows Live и многие другие программы. При "
-"помощи микрофона и веб-камеры вы сможете совершать видеозвонки."
+"С помощью Empathy можно общаться с людьми, находящимися поблизости, а также "
+"с друзьями и коллегами, использующими Google Talk, AIM, Windows Live и "
+"многие другие программы. При наличии микрофона и веб-камеры можно совершать "
+"аудио- и видеовызовы."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"У вас уже есть учётная запись, которую вы использовали в другой программе?"
+msgstr "У вас есть учётная запись, которую вы использовали в другой программе?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
-msgstr "Да, импортировать параметры моей учетной записи из "
+msgstr "Да, импортировать информацию о моей учётной записи"
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
-msgstr "Да, я введу сейчас параметры моей учетной записи"
+msgstr "Да, я сейчас введу информацию об учётной записи"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
-msgstr "Нет, я хочу новую учетную запись"
+msgstr "Нет, я хочу новую учётную запись"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
-msgstr "Нет, я просто хочу увидеть людей онлайн неподалеку от меня"
+msgstr "Нет, я только хочу найти поблизости людей в сети"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
-msgstr "Выберите учётную запись, которую вы хотите ипортировать:"
+msgstr "Выберите учётные записи для импортирования:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Да"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
-msgstr "Нет"
+msgstr "Нет, на данный момент это всё"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1117
+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 может автоматически найти людей, подключённых к той же сети, что и "
+"вы. Если вы хотите использовать эту возможность, отметьте, что информация, "
+"представленная ниже является корректной. Вы можете изменить эту информацию "
+"позже или отключить эту возможность, используя диалоговое окно «Учётные "
+"записи»."
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Правка->Учётные записи"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Я не хочу сейчас включать эту возможность"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Вы не можете общаться с людьми, подключёнными к вашей локальной сети, т. к. "
+"telepathy-salut не установлен. Если вы хотите включить эту возможность, "
+"установите пакет telepathy-salut и создайте учётную запись «Люди поблизости» "
+"в диалоговом окне «Учётные записи»"
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut не установлен"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Добро пожаловать в Empathy"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
-msgstr "Импортировать ваши существующие учётные записи"
+msgstr "Импортировать существующие учётные записи"
+
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Введите персональную информацию"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "Существуют несохранённые изменения, касающиеся учётной записи %s."
+msgid "There are unsaved modifications to your %s account."
+msgstr "В учётной записи %s имеются несохранённые изменения."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:235
+#. 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:70
+msgid "Your new account has not been saved yet."
+msgstr "Ваша новая учётная запись ещё не была сохранена."
+
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connecting…"
+msgstr "Соединение…"
+
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s на %2$s"
+msgid "Disconnected — %s"
+msgstr "Отсоединён — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:247
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
-msgid "%s Account"
-msgstr "Учётная запись %s"
+msgid "Offline — %s"
+msgstr "Не в сети — %s"
-#: ../src/empathy-accounts-dialog.c:251
-msgid "New account"
-msgstr "Новая учётная запись"
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Не в сети — подключение к сети отсутствует"
+
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "Неизвестный статус"
-#: ../src/empathy-accounts-dialog.c:515
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Не в сети — учётная запись отключена"
+
+#: ../src/empathy-accounts-dialog.c:768
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:799
-#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr "Вы удаляете свою учётную запись «%s»! Продолжить?"
-
-#. Translators: this is used only when built on a moblin platform
-#: ../src/empathy-accounts-dialog.c:803
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
-msgstr "Вы хотите удалить группу «%s»?"
-
-#: ../src/empathy-accounts-dialog.c:809
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Любые связанные беседы и комнаты НЕ БУДУТ удалены, если вы продолжите.\n"
-"Если вы решите восстановить эту учётную запись позднее, то они снова станут "
-"доступны."
+msgstr "Хотите удалить %s со своего компьютера?"
-#. Translators: this is used only when built on a moblin platform
-#: ../src/empathy-accounts-dialog.c:816
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
-msgstr "Ваша учётная запись не будет удалена с сервера."
+msgstr "Это не приведёт к удалению вашей учётной записи с сервера."
-#: ../src/empathy-accounts-dialog.c:1007
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr "Вы удаляете свою учётную запись «%s»! Продолжить?"
+msgstr ""
+"Вы собираетесь выбрать другую учётную запись, это приведёт\n"
+"к отмене сделанных изменений. Хотите продолжить?"
-#: ../src/empathy-accounts-dialog.c:1518
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr "Вы удаляете свою учётную запись «%s»! Продолжить?"
-
-#.  Translators: this is used only when built on a moblin platform 
-#: ../src/empathy-accounts-dialog.c:1686
-#, fuzzy
-msgid "_Next"
-msgstr "На след_ующую вкладку"
+msgstr ""
+"Вы собираетесь закрыть окно, это приведёт к отмене\n"
+"сделанных изменений. Хотите продолжить?"
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Учётные записи"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "No protocol installed"
+msgstr "Нет установленных протоколов"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr ""
+msgid "Protocol:"
+msgstr "Протокол:"
#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Со_здать"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-#, fuzzy
-msgid "No protocol installed"
-msgstr "<b>Нет установленных протоколов</b>"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2072,121 +2378,238 @@ msgstr ""
"Чтобы добавить новую учётную запись установите поддержку каждого "
"необходимого протокола."
-#: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
-msgid "_Add..."
-msgstr "_Добавить собеседника..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-#, fuzzy
-msgid "_Create a new account"
-msgstr "Создать новую IRC сеть"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-#, fuzzy
-msgid "_Import..."
-msgstr "Импорт"
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-#, fuzzy
-msgid "_Reuse an existing account"
-msgstr "_Показать и редактировать учётные записи"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "_Добавить&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:10
-#, fuzzy
-msgid "account"
-msgstr "Учётная запись"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "_Импортировать&#x2026;"
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Контраст"
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Яркость"
-#: ../src/empathy-call-window.c:433
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Гамма"
-#: ../src/empathy-call-window.c:541
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Громкость"
-#: ../src/empathy-call-window.c:675
-msgid "Connecting..."
-msgstr "Соединение..."
-
-#: ../src/empathy-call-window.c:782
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Боковая панель"
-#: ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Цифровая панель"
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Вход звука"
-#: ../src/empathy-call-window.c:811
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Вход видео"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:874
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
-msgstr ""
+msgstr "Разговор с %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:955
-#, fuzzy
+#: ../src/empathy-call-window.c:1197
msgid "Call"
-msgstr "_Вызов"
+msgstr "Вызов"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1455
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:1694
+#, c-format
msgid "Connected — %d:%02dm"
-msgstr "Соединён -- %d:%02dm"
+msgstr "Соединён — %d:%02dm"
+
+#: ../src/empathy-call-window.c:1755
+msgid "Technical Details"
+msgstr "Информация о собеседнике"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"Программное обеспечение %s не понимает аудиоформаты, поддерживаемые вашим "
+"компьютером"
+
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"Программное обеспечение %s не понимает видеоформаты, поддерживаемые вашим "
+"компьютером"
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Не удалось установить соединение с %s. Один из вас может находиться в сети, "
+"которая не поддерживает прямые подключения."
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Сбой сети"
+
+#: ../src/empathy-call-window.c:1814
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Аудиоформаты, необходимые для этого вызова, не установлены на вашем "
+"компьютере"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Видеоформаты, необходимые для этого вызова, не установлены на вашем "
+"компьютере"
+
+#: ../src/empathy-call-window.c:1827
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Что-то неожиданное случилось с компонентом Telepathy. <a href=\"%s"
+"\">Сообщите об этой ошибке</a> и прикрепите журналы, собранные из окна "
+"отладки в меню «Справка»."
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Сбой в движке вызова"
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr "Не удалось установить аудиопоток"
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr "Не удалось установить видеопоток"
#: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
-msgstr "Сбросить"
+msgid "Call the contact again"
+msgstr "Перезвонить собеседнику"
#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr ""
+msgid "Camera Off"
+msgstr "Камера выключена"
#: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "Передавать звук"
+msgid "Camera On"
+msgstr "Камера включена"
#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Передавать видео"
+msgid "Disable camera and stop sending video"
+msgstr "Выключить камеру и остановить отправку видео"
#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Предварительный просмотр изображения"
+msgid "Enable camera and send video"
+msgstr "Включить камеру и отправить видео"
#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Вызов"
+msgid "Enable camera but don't send video"
+msgstr "Включить камеру, но не отправлять видео"
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "Сбросить"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Завершить текущий вызов"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Предварительный просмотр"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Redial"
+msgstr "Перезвонить"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:11
+msgid "Send Audio"
+msgstr "Передавать звук"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Включить или выключить передачу звука"
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Видео выключено"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Видео включено"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Предварительный просмотр видео"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Вид"
-#: ../src/empathy-chat-window.c:349
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d непрочитанное)"
+msgstr[1] "%s (%d непрочитанных)"
+msgstr[2] "%s (%d непрочитанных)"
+
+#: ../src/empathy-chat-window.c:448
#, c-format
-msgid "Conversations (%d)"
-msgstr "Беседы (%d)"
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (и %u другое)"
+msgstr[1] "%s (и %u других)"
+msgstr[2] "%s (и %u других)"
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d непрочитанное от других)"
+msgstr[1] "%s (%d непрочитанных от других)"
+msgstr[2] "%s (%d непрочитанных от других)"
+
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d непрочитанное ото всех)"
+msgstr[1] "%s (%d непрочитанных ото всех)"
+msgstr[2] "%s (%d непрочитанных ото всех)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Набирает сообщение."
@@ -2195,70 +2618,78 @@ msgid "C_lear"
msgstr "О_чистить"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "Со_беседник"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Разговор"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Вставить _улыбку"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Пригласить _участника…"
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Передвинуть вкладку в_лево"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Передвинуть вкладку в_право"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Собеседники"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Содержание"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Беседа"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Отсоединить вкладку"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
msgstr "_Любимая комната"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Справка"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "На след_ующую вкладку"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "На пред_ыдущую вкладку"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
-msgstr "Показать с_писок собеседников"
+msgstr "_Показывать список собеседников"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "В_кладки"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
-msgstr "Имя:"
+msgstr "Имя"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Комната"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Автоматическое соединение"
@@ -2266,75 +2697,76 @@ msgstr "Автоматическое соединение"
msgid "Manage Favorite Rooms"
msgstr "Управление переговорными комнатами"
-#: ../src/empathy-event-manager.c:329
+#: ../src/empathy-event-manager.c:339
+msgid "Incoming video call"
+msgstr "Входящий видеовызов"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Входящий вызов"
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:343
#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s вызывает вас, хотите ответить?"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s делает видеовызов. Хотите ответить?"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:344
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s вызывает вас. Хотите ответить?"
+
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "_Отказать"
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Ответить"
-#: ../src/empathy-event-manager.c:454
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "Incoming call from %s"
-msgstr "Входящий вызов от %s"
+msgid "Incoming video call from %s"
+msgstr "Входящий видеовызов от %s"
-#: ../src/empathy-event-manager.c:498
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s приглашает вас"
-
-#: ../src/empathy-event-manager.c:504
-msgid "An external application will be started to handle it."
-msgstr "Для обработки приглашения будет запущено соответствующее приложение."
-
-#: ../src/empathy-event-manager.c:509
-msgid "You don't have the needed external application to handle it."
-msgstr "Отсутствует необходимое приложение для обработки приглашения."
+msgid "Incoming call from %s"
+msgstr "Входящий вызов от %s"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Приглашение к беседе"
-#: ../src/empathy-event-manager.c:640
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s предлагает присоединиться к %s"
-#: ../src/empathy-event-manager.c:648
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "_Отклонить"
-#: ../src/empathy-event-manager.c:653
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Войти"
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s предложил присоединиться к %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Входящий файл от %s"
-#: ../src/empathy-event-manager.c:898
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "Запрос на подписку от %s"
-#: ../src/empathy-event-manager.c:902
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2344,120 +2776,119 @@ msgstr ""
"Сообщение: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:939
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
-msgstr ""
+msgstr "%s вышел из сети."
#. someone is logging in
-#: ../src/empathy-event-manager.c:955
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
-msgstr ""
+msgstr "%s в сети."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Неизвестен"
-#: ../src/empathy-ft-manager.c:275
-#, fuzzy, c-format
+#: ../src/empathy-ft-manager.c:274
+#, c-format
msgid "%s of %s at %s/s"
-msgstr "%s из %s"
+msgstr "%s из %s, %s/s"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s из %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Получение «%s» от %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Отправка «%s» %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
-#, fuzzy, c-format
+#: ../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:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
-msgstr ""
+msgstr "Ошибка получения файла"
-#: ../src/empathy-ft-manager.c:348
+#: ../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:351
+#: ../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:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "Получен «%s» от %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "«%s» отправлен %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Передача файла завершена"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
-#, fuzzy
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
-msgstr "Ожидание ответа получателя"
+msgstr "Ожидание ответа от других участников"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
-msgstr ""
+msgstr "Проверка целостности «%s»"
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
-msgstr ""
+msgstr "Хэширование «%s»"
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Файл"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
-msgstr "Остаётся"
+msgstr "Осталось"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
@@ -2481,84 +2912,40 @@ msgid "Import Accounts"
msgstr "Импортировать учётные записи"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:282
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Импорт"
-#: ../src/empathy-import-widget.c:291
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Протокол"
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Источник"
#: ../src/empathy-import-mc4-accounts.c:106
#, c-format
msgid "%s account"
-msgstr "учётная запись %s"
-
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "Правка учётной _записи"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Ошибка не указана"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Ошибка сети"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Аутентификация не удалась"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Ошибка шифрования"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Имя уже занято"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Сертификат недоступен"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Сертификат не является доверенным"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Сертификат устарел"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Сертификат не активирован"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Сертификат с ошибкой в имени узла"
+msgstr "Учётная запись %s"
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Отпечатки сертификатов не совпадают"
+#: ../src/empathy-main-window.c:433
+msgid "Reconnect"
+msgstr "Переподключиться"
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Сертификат подписан самостоятельно"
+#: ../src/empathy-main-window.c:439
+msgid "Edit Account"
+msgstr "Правка учётной записи"
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Ошибка сертификата"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Закрыть"
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Собеседник"
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "_Показать и редактировать учётные записи"
@@ -2568,7 +2955,7 @@ msgstr "Список собеседников"
#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
-msgstr "Контакты на _карте"
+msgstr "Собеседники на _карте"
#: ../src/empathy-main-window.ui.h:3
msgid "Context"
@@ -2576,82 +2963,88 @@ 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"
-msgstr ""
+msgstr "Обычный _размер"
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr ""
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Новый _вызов…"
#: ../src/empathy-main-window.ui.h:8
+msgid "Normal Size With _Avatars"
+msgstr "Обычный размер с _аватарами"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "_Параметры"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "Показывать п_ротоколы"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Упорядочить по _имени"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Упорядочить по с_татусу"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Учётные записи"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Компактный размер"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
-msgstr "_Отладка"
+msgstr "О_тладка"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "Передачи _файлов"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "_Войти..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
+msgstr "_Войти…"
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "_Новый разговор..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "Новая _беседа…"
-#: ../src/empathy-main-window.ui.h:21
-#, fuzzy
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
-msgstr "Показывать _отсутствующих"
+msgstr "Собеседники _не в сети"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Личная информация"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "_Предыдущие беседы"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Комната"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
-msgstr "Комнаты"
+msgstr "Комната"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Участники"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2663,18 +3056,18 @@ msgstr ""
"Требуется пароль: %s\n"
"Участники: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Нет"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
-msgstr ""
+msgstr "Не удалось начать формирование списка комнат"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
-msgstr ""
+msgstr "Не удалось остановить формирование списка комнат"
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "Couldn't load room list"
@@ -2745,7 +3138,7 @@ msgstr "Внешний вид"
#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
-msgstr "Автоматически _соединяться при запуске"
+msgstr "_Автоматически соединяться при запуске"
#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
@@ -2753,25 +3146,23 @@ msgstr "Поведение"
#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
-msgstr "Тема оф_ормления беседы:"
+msgstr "_Тема оформления беседы:"
#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
-msgstr "Выключить уведомления, когда пользователь _отошёл или занят"
+msgstr "Выключить уведомления, когда пользователь отошёл или занят"
#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
-msgstr "Выключить звуки в состоянии _отошёл или «занят»"
+msgstr "В_ыключить звуки в состоянии «отошёл» или «занят»"
#: ../src/empathy-preferences.ui.h:7
-#, fuzzy
msgid "Enable notifications when a contact comes online"
-msgstr "Включить уведомления, когда _беседа не в фокусе"
+msgstr "Включить уведомления, когда собседеник появляется в сети"
#: ../src/empathy-preferences.ui.h:8
-#, fuzzy
msgid "Enable notifications when a contact goes offline"
-msgstr "Включить уведомления, когда _беседа не в фокусе"
+msgstr "Включить уведомления, когда собеседник выходит из сети"
#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
@@ -2785,14 +3176,9 @@ msgstr "Включить проверку орфографии для языко
msgid "General"
msgstr "Общие"
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "Местоположение"
-
#: ../src/empathy-preferences.ui.h:13
-#, fuzzy
msgid "Location sources:"
-msgstr "Местоположение"
+msgstr "Источники местоположений:"
#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
@@ -2800,7 +3186,7 @@ msgstr "Уведомления"
#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
-msgstr "Проигрывать уведомления о событиях"
+msgstr "Воспроизводить звук для событий"
#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
@@ -2808,7 +3194,7 @@ msgstr "Параметры"
#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
-msgstr ""
+msgstr "Приватность"
#: ../src/empathy-preferences.ui.h:18
msgid ""
@@ -2816,15 +3202,17 @@ msgid ""
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
+"Примерное определение местоположения означает, что публикуется только ваш "
+"город, регион и страна. Координаты GPS будут отображаться с точностью до 1 "
+"знака после запятой."
#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
-msgstr "Показывать графические _улыбки"
+msgstr "Показывать _графические улыбки"
#: ../src/empathy-preferences.ui.h:20
-#, fuzzy
msgid "Show contact _list in rooms"
-msgstr "Показать с_писок собеседников"
+msgstr "Показывать _список собеседников в комнатах"
#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
@@ -2839,16 +3227,15 @@ msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-"В этом списке отображены только языки, для которых установлены словари."
+"В этом списке показаны только те языки, для которых установлены словари."
#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Темы"
#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
msgid "_Cellphone"
-msgstr "Мегафон"
+msgstr "С_отовая сеть"
#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
@@ -2856,15 +3243,15 @@ msgstr "Включить _всплывающие уведомления"
#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
-msgstr "Включить _звуковые уведомления"
+msgstr "_Включить звуковые уведомления"
#: ../src/empathy-preferences.ui.h:28
msgid "_GPS"
-msgstr ""
+msgstr "_GPS"
#: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr ""
+msgid "_Network (IP, Wi-Fi)"
+msgstr "С_еть (IP, Wi-Fi)"
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
@@ -2872,105 +3259,143 @@ msgstr "_Открывать новые беседы в отдельном окн
#: ../src/empathy-preferences.ui.h:31
msgid "_Publish location to my contacts"
-msgstr "_Публиковать местоположение для моих контактов"
+msgstr "Пу_бликовать местоположение для собеседников"
#: ../src/empathy-preferences.ui.h:32
msgid "_Reduce location accuracy"
-msgstr "С_низить точность местоположения"
+msgstr "_Снижать точность определения местоположения"
-#: ../src/empathy-status-icon.c:175
+#: ../src/empathy-status-icon.c:176
msgid "Respond"
-msgstr "Ответ"
+msgstr "Ответить"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Состояние"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "В_ыход"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Не удалось запустить приложение для сервиса %s: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Пришло приглашение на сервис %s, но у вас отсутствует необходимое для работы "
-"с этим сервисом приложение."
-
#: ../src/empathy-map-view.ui.h:1
-#, fuzzy
msgid "Contact Map View"
-msgstr "Список собеседников"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1247
-msgid "Error"
-msgstr "Ошибка"
+msgstr "Собеседники на карте"
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1241
-msgid "Critical"
-msgstr "Критично"
+#: ../src/empathy-debug-window.c:1066
+msgid "Save"
+msgstr "Сохранить"
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1235
-msgid "Warning"
-msgstr "Предупреждение"
+#: ../src/empathy-debug-window.c:1219
+msgid "Debug Window"
+msgstr "Окно отладки"
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1229
-#: ../src/empathy-debug-window.c:1277
-msgid "Message"
-msgstr "Сообщение"
+#: ../src/empathy-debug-window.c:1299
+msgid "Pause"
+msgstr "Пауза"
-#: ../src/empathy-debug-window.c:129 ../src/empathy-debug-window.c:1223
-msgid "Info"
-msgstr "Инфо"
+#: ../src/empathy-debug-window.c:1311
+msgid "Level "
+msgstr "Уровень"
-#: ../src/empathy-debug-window.c:132 ../src/empathy-debug-window.c:1217
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "Отладка"
-#: ../src/empathy-debug-window.c:989
-msgid "Save"
-msgstr "Сохранить"
+#: ../src/empathy-debug-window.c:1337
+msgid "Info"
+msgstr "Информация"
-#: ../src/empathy-debug-window.c:1106
-msgid "Debug Window"
-msgstr "Отладочное окно"
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Сообщение"
-#: ../src/empathy-debug-window.c:1185
-msgid "Pause"
-msgstr "Пауза"
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Предупреждение"
-#: ../src/empathy-debug-window.c:1197
-msgid "Level "
-msgstr "Уровень "
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Критическая ошибка"
-#: ../src/empathy-debug-window.c:1266
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Время"
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Домен"
-#: ../src/empathy-debug-window.c:1270
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Категория"
-#: ../src/empathy-debug-window.c:1272
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Уровень"
-#: ../src/empathy-debug-window.c:1304
+#: ../src/empathy-debug-window.c:1424
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
+msgid "Invite Participant"
+msgstr "Пригласить участника"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Выберите собеседника для приглашения к беседе:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Не показывать диалоговые окна; выполнить работу (напр., импортирование) и "
+"выйти"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
+"Не показывать диалоговые окна, если имеются учётные записи, отличные от salut"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Сначала выберите учётную запись (например, gabble/jabber/"
+"foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Учётные записи Empathy"
+
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr "Учётные записи"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Учётная запись Salut создана"
+
+#~| msgid ""
+#~| "Whether or not the Salut account has been created on the first Empathy "
+#~| "run."
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "Создавать ли учётную запись Salut при первом запуске Empathy."
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Обмен сообщениями Empathy"
+
+#~ msgid "Hidden"
+#~ msgstr "Скрытый"
-#~ msgid "Geoclue Settings"
-#~ msgstr "Параметры Geoclue"
+#~ msgid "_View Previous Conversations"
+#~ msgstr "Просмотр предыдущих _бесед"
diff --git a/po/sl.po b/po/sl.po
index af122d973..f0baeab1c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ 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: 2010-03-02 11:39+0000\n"
-"PO-Revision-Date: 2010-03-02 13:53+0100\n"
+"POT-Creation-Date: 2010-03-15 09:52+0000\n"
+"PO-Revision-Date: 2010-03-15 12:41+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -102,105 +102,105 @@ msgid "Empathy has asked about importing accounts"
msgstr "Program Empathy zahteva podrobnosti o uvozu računov"
#: ../data/empathy.schemas.in.h:17
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy je prenesel butterfly dnevniške zapise."
+
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should auto-connect on startup"
msgstr "Program Empathy naj se samodejno poveže ob zagonu"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should reduce the location's accuracy"
msgstr "Program Empathy naj zmanjša natančnost določevanja nahajanja"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable WebKit Developer Tools"
msgstr "Omogoči WebKit razvojna orodja"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable popup notifications for new messages"
msgstr "Omogoči pojavna obvestila ob novih sporočilih"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Enable spell checker"
msgstr "Omogoči črkovalnik"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide main window"
msgstr "Skrij glavno okno"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
msgid "Hide the main window."
msgstr "Skrivanje glavnega okna."
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
msgid "MC 4 accounts have been imported"
msgstr "MC 4 računi so boli uvoženi"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
msgid "MC 4 accounts have been imported."
msgstr "MC 4 računi so bili uvoženi."
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
msgid "Nick completed character"
msgstr "Znak na koncu vzdevka"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
msgid "Open new chats in separate windows"
msgstr "Nov klepet naj se odpre v ločenem oknu"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Pot do želene Adium teme "
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Pot do želene Adium teme, kadar je ta določena za klepet."
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Predvajaj zvok ob prejetju novega sporočila"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for new conversations"
msgstr "Predvajaj zvok ob novem pogovoru"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Predvajaj zvok ob pošiljanju sporočila"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Predvajaj zvok ob prijavi stika"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Predvajaj zvok ob odjavi stika."
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log in"
msgstr "Predvajaj zvok ob prijavi"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
msgid "Play a sound when we log out"
msgstr "Predvajaj zvok ob odjavi"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni dejavno."
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Pokaži pojavna obvestila ob prijavi stikov"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Pokaži pojavna obvestila ob odjavi stikov"
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Ustvarjen je račun Salut"
-
#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Pokaži podobe"
@@ -270,29 +270,29 @@ msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Ali naj program Empathy zahteva podrobnosti o uvozu računov iz drugih programov."
#: ../data/empathy.schemas.in.h:59
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Ali je program Empathy prenesel butterfly dnevniške zapise."
+
+#: ../data/empathy.schemas.in.h:60
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše račune."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natančnost položaja."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Ali naj bodo vključena razvijalna orodja WebKit, npr. Web Inspector."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "Ali je bil ob prvem zagonu programa Empathy ustvarjen račun Salut?"
-
#: ../data/empathy.schemas.in.h:65
msgid "Whether to check words typed against the languages you want to check with."
msgstr "Ali naj se preverja črkovanje besed v želenih jezikih."
@@ -393,9 +393,11 @@ msgstr "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto
msgid "Manage Messaging and VoIP accounts"
msgstr "Upravljanje s sporočanjem in VoIP računi"
+#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:203
-#: ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2066
+#: ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "Sporočanje in VoIP računi"
@@ -416,7 +418,7 @@ msgid "The selected file is empty"
msgstr "Izbrana datoteka je prazna"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Uporabniki v bližini"
@@ -604,21 +606,21 @@ msgstr "v prihodnosti"
msgid "All"
msgstr "Vse"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "Uporabniško ime:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "_Prijava"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -626,15 +628,15 @@ msgstr "_Prijava"
msgid "Account:"
msgstr "Račun:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Omogočeno"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "Ta račun na strežniku že obstaja"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "_Ustvari nov račun na strežniku"
@@ -643,19 +645,19 @@ msgstr "_Ustvari nov račun na strežniku"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s račun"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "Nov račun"
@@ -1088,140 +1090,140 @@ msgstr "Vse datoteke"
msgid "Click to enlarge"
msgstr "Kliknite za povečavo"
-#: ../libempathy-gtk/empathy-chat.c:232
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Ponovna povezava s tem klepetom ni bila uspešna"
-#: ../libempathy-gtk/empathy-chat.c:654
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "Napaka med pridruževanjem v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:672
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:711
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "Vsebina ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje vsebine je treba imeti ustrezna dovoljenja."
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <vsebina>: določi vsebino trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:858
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <vzdevek>: spremeni vzdevek na trenutnem strežniku"
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporočilo>: pošlje sporočilo v trenutni pogovor"
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:871
msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
msgstr "/say <sporočilo>: send <sporočilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporočila, ki se začne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
-#: ../libempathy-gtk/empathy-chat.c:875
+#: ../libempathy-gtk/empathy-chat.c:876
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov način uporabe."
-#: ../libempathy-gtk/empathy-chat.c:885
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:914
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1035
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, več podrobnosti je mogoče najti preko /help argumenta ukaza"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "brez povezave"
-#: ../libempathy-gtk/empathy-chat.c:1176
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "neveljaven stik"
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "ni dovoljenja"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "predolgo sporočilo"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "ni del programa"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1222
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Tema določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(ni predlogov)"
-#: ../libempathy-gtk/empathy-chat.c:1677
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1695
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Pošlji"
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:1954
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
@@ -1229,12 +1231,12 @@ msgstr "%s je prekinil povezavo"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1961
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
@@ -1242,17 +1244,17 @@ msgstr "%s je bil izgnan"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1972
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1975
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:1979
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
@@ -1262,47 +1264,47 @@ msgstr "%s je zapustil klepetalnico"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1988
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2038
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2179
#: ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Prekinjena povezava"
-#: ../libempathy-gtk/empathy-chat.c:2695
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
-#: ../libempathy-gtk/empathy-chat.c:2696
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-chat.c:2901
#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Pogovor"
@@ -1313,20 +1315,20 @@ msgid "Topic:"
msgstr "Tema:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Odpri povezavo"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
@@ -1334,11 +1336,11 @@ msgstr "%A %d %B %Y"
msgid "Edit Contact Information"
msgstr "Uredi podrobnosti stika"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:300
+#: ../libempathy-gtk/empathy-contact-dialogs.c:301
msgid "Personal Information"
msgstr "Osebni podatki"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:406
msgid "New Contact"
msgstr "Nov stik"
@@ -1350,79 +1352,84 @@ msgstr "Odloči se _kasneje"
msgid "Subscription Request"
msgstr "Zahteva po naročilu"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1631
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ali zares želite odstraniti skupino '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1633
msgid "Removing group"
msgstr "Odstranjevanje skupine"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1682
+#: ../libempathy-gtk/empathy-contact-list-view.c:1759
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Odstrani"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1712
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ali zares želite odstraniti stik '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1714
msgid "Removing contact"
msgstr "Odstranjevanje stika"
-#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../libempathy-gtk/empathy-contact-menu.c:206
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Dodaj stik ..."
-#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../libempathy-gtk/empathy-contact-menu.c:233
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Klepet"
-#: ../libempathy-gtk/empathy-contact-menu.c:257
+#: ../libempathy-gtk/empathy-contact-menu.c:264
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Zvočni klic"
-#: ../libempathy-gtk/empathy-contact-menu.c:289
+#: ../libempathy-gtk/empathy-contact-menu.c:296
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video klic"
-#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../libempathy-gtk/empathy-contact-menu.c:347
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Predhodni po_govori"
-#: ../libempathy-gtk/empathy-contact-menu.c:362
+#: ../libempathy-gtk/empathy-contact-menu.c:369
msgid "Send file"
msgstr "Pošlji datoteko"
-#: ../libempathy-gtk/empathy-contact-menu.c:385
+#: ../libempathy-gtk/empathy-contact-menu.c:392
msgid "Share my desktop"
msgstr "Souporaba namizja"
-#: ../libempathy-gtk/empathy-contact-menu.c:413
+#: ../libempathy-gtk/empathy-contact-menu.c:432
+#: ../libempathy-gtk/empathy-contact-widget.c:1379
+msgid "Favorite"
+msgstr "Priljubljeno"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:462
msgid "Infor_mation"
msgstr "_Podrobnosti"
-#: ../libempathy-gtk/empathy-contact-menu.c:459
+#: ../libempathy-gtk/empathy-contact-menu.c:508
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Uredi"
-#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../libempathy-gtk/empathy-contact-menu.c:562
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "Vabila v klepetalnico"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-contact-menu.c:593
msgid "_Invite to chat room"
msgstr "_Povabi v klepetalnico"
@@ -1430,129 +1437,129 @@ msgstr "_Povabi v klepetalnico"
msgid "Select a contact"
msgstr "Izberi stik"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:238
msgid "Select"
msgstr "Izberi"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
-#: ../src/empathy-main-window.c:1045
+#: ../libempathy-gtk/empathy-contact-widget.c:247
+#: ../src/empathy-main-window.c:1049
msgid "Group"
msgstr "Skupina"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:478
msgid "Country ISO Code:"
msgstr "ISO oznaka države:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:480
msgid "Country:"
msgstr "Država:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:482
msgid "State:"
msgstr "Okraj:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:484
msgid "City:"
msgstr "Mesto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:486
msgid "Area:"
msgstr "Področje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:488
msgid "Postal Code:"
msgstr "Poštna številka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:490
msgid "Street:"
msgstr "Ulica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:492
msgid "Building:"
msgstr "Stavba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:494
msgid "Floor:"
msgstr "Nadstropje:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:496
msgid "Room:"
msgstr "Klepetalnica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:498
msgid "Text:"
msgstr "Besedilo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:500
msgid "Description:"
msgstr "Opis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:502
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Accuracy Level:"
msgstr "Raven natančnosti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:506
msgid "Error:"
msgstr "Napaka:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:508
msgid "Vertical Error (meters):"
msgstr "Napaka navpično (v metrih):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:510
msgid "Horizontal Error (meters):"
msgstr "Napaka vodoravno (v metrih):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:512
msgid "Speed:"
msgstr "Hitrost:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:514
msgid "Bearing:"
msgstr "Smer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:516
msgid "Climb Speed:"
msgstr "Hitrost dviganja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:518
msgid "Last Updated on:"
msgstr "Nazadnje posodobljeno:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:520
msgid "Longitude:"
msgstr "Zemljepisna dolžina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:522
msgid "Latitude:"
msgstr "Zemljepisna širina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:524
msgid "Altitude:"
msgstr "Nadmorska višina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:587
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Mesto"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:603
msgid "<b>Location</b>, "
msgstr "<b>Mesto</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-contact-widget.c:653
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B.%Y ob %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-contact-widget.c:736
msgid "Save Avatar"
msgstr "Shrani podobo"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:792
msgid "Unable to save avatar"
msgstr "Ni mogoče shraniti podobe"
@@ -1720,12 +1727,12 @@ msgstr "S klikom se določi oznaka stanja kot priljubljenega"
msgid "Set status"
msgstr "Določitev stanja"
-#: ../libempathy-gtk/empathy-presence-chooser.c:936
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Nastavitev navzočnosti in trenutnega stanja"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "Sporočila po meri ..."
@@ -1813,15 +1820,15 @@ msgstr "_Počisti"
msgid "Blue"
msgstr "Modro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Ni mogoče odpreti naslova URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Izbor datoteke"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1677
msgid "Select a destination"
msgstr "Izbor cilja"
@@ -2066,7 +2073,7 @@ msgid "You can either go back and try to enter your accounts' details again or q
msgstr "Lahko ponovno vnesete podatke računa ali pa končate pomočnika in dodate račune kasneje preko menija urejanja."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1303
msgid "An error occurred"
msgstr "Prišlo je do napake"
@@ -2075,104 +2082,108 @@ msgstr "Prišlo je do napake"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415
-#: ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413
+#: ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Nov %s račun"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Kakšno vrsto klepetalnega računa imate?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ali želite nastaviti še kakšen drug račun?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Vnos podrobnosti računa"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Kateri klepetalni račun naj bo ustvarjen?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Ali želite ustvariti drugi klepetalni račun?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Vnos podrobnosti novega računa"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi možnosti pogovora ali video konference."
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ali imate račun, ki ste ga uporabljali z drugim programom?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Da, uvoziti želim podrobnosti računa iz"
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Da, takoj želim vnesti podrobnosti računa"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Ne, ustvariti želim nov račun"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Ne, želim le videti ljudi, ki so trenutno v mreži"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Izbor računov za uvoz:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Da"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Ne, to je trenutno vse"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podrobnosti. Možnosti je mogoče spreminjati tudi kasneje preko pogovornega okna 'računov'."
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "Uredi->Računi"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "Ne želim omogočiti te možnosti"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "Ni mogoče klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameščen. V primeru, da želite omogočiti to možnost, namestite zahtevani paket in ustvarite račun bližnjih uporabnikov med možnostmi računa."
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ni nameščen"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1227
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Pomočnik sporočanja in VoIP računov"
+
+#: ../src/empathy-account-assistant.c:1261
msgid "Welcome to Empathy"
msgstr "Dobrodošli v program Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1270
msgid "Import your existing accounts"
msgstr "Uvoz obstoječih računov"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1288
msgid "Please enter personal details"
msgstr "Vnesite osebne podrobnosti"
@@ -2189,34 +2200,34 @@ msgstr "Še vedno so odprte spremembe vašega %s računa."
msgid "Your new account has not been saved yet."
msgstr "Novi račun še ni shranjen."
-#: ../src/empathy-accounts-dialog.c:265
+#: ../src/empathy-accounts-dialog.c:263
#: ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "Povezovanje ..."
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "Prekinjena povezava - %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "Brez povezave - %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "Brez povezave - ni omrežne povezave"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "Neznano stanje"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "Brez povezave - račun je onemogočen"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2224,16 +2235,16 @@ msgstr ""
"Ustvarjen bo nov račun, trenutne spremembe pa bodo izgubljene!\n"
"Ali ste prepričani, da želite nadaljevati?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ali želite odstraniti %s iz računalnika?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "S tem bo odstranjen račun s strežnika."
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2241,7 +2252,7 @@ msgstr ""
"Izbran bo nov račun, trenutne spremembe pa bodo izgubljene\n"
"Ali ste prepričani, da želite nadaljevati?"
-#: ../src/empathy-accounts-dialog.c:1862
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2249,11 +2260,6 @@ msgstr ""
"Zaprlo se bo okno, trenutne spremembe pa bodo izgubljene!\n"
"Ali ste prepričani, da želite nadaljevati?"
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1995
-msgid "Accounts"
-msgstr "Računi"
-
#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Ni nameščenih protokolov"
@@ -2801,23 +2807,23 @@ msgstr "Vir"
msgid "%s account"
msgstr "%s račun"
-#: ../src/empathy-main-window.c:433
+#: ../src/empathy-main-window.c:437
msgid "Reconnect"
msgstr "Ponovno poveži"
-#: ../src/empathy-main-window.c:439
+#: ../src/empathy-main-window.c:443
msgid "Edit Account"
msgstr "Uredi račun"
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:449
msgid "Close"
msgstr "Zapri"
-#: ../src/empathy-main-window.c:1028
+#: ../src/empathy-main-window.c:1032
msgid "Contact"
msgstr "Stik"
-#: ../src/empathy-main-window.c:1369
+#: ../src/empathy-main-window.c:1413
msgid "Show and edit accounts"
msgstr "Pokaži in uredi račune"
@@ -3209,30 +3215,42 @@ msgstr "Povabi udeležence"
msgid "Choose a contact to invite into the conversation:"
msgstr "Izbor stika za povabilo v pogovor:"
-#: ../src/empathy-accounts.c:214
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in končaj"
-#: ../src/empathy-accounts.c:218
+#: ../src/empathy-accounts.c:217
msgid "Don't display any dialogs if there are any non-salut accounts"
msgstr "Ne prikaži pogovornega okna, če so na voljo tudi ne-salut računi"
-#: ../src/empathy-accounts.c:222
+#: ../src/empathy-accounts.c:221
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Predhodno izberite račun (na primer: gabble/jabber/foo_40primer_2eorg0)"
-#: ../src/empathy-accounts.c:224
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<id-računa>"
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Empathy računi"
-#: ../src/empathy-accounts.c:248
-msgid " Accounts"
-msgstr "Računi"
-
+#: ../src/empathy-accounts.c:247
+msgid "Empathy Accounts"
+msgstr "Empathy računi"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Empathy razhroščevalnik"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Ustvarjen je račun Salut"
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "Ali je bil ob prvem zagonu programa Empathy ustvarjen račun Salut?"
+#~ msgid "Accounts"
+#~ msgstr "Računi"
+#~ msgid " Accounts"
+#~ msgstr "Računi"
#~ msgid ""
#~ "Try to import any recognized accounts and display an assistant if that "
#~ "fails"
diff --git a/po/sr.po b/po/sr.po
index be9f8e4b6..8f17bc3ea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,15 +11,15 @@
# Nikola Kotur <kotnik@ns-linux.org>, 2006.
# Милош Поповић <gpopac@gmail.com>, 2007, 2008.
#
-# Maintainder: Бранко Кокановић <branko.kokanovic@gmail.com>, 2009.
+# Maintainer: Бранко Кокановић <branko.kokanovic@gmail.com>, 2009.
# Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
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: 2009-09-01 21:15+0000\n"
-"PO-Revision-Date: 2009-08-29 21:12+0200\n"
+"POT-Creation-Date: 2010-03-08 12:19+0000\n"
+"PO-Revision-Date: 2010-03-08 22:11+0100\n"
"Last-Translator: Бранко Кокановић <branko.kokanovic@gmail.com>\n"
"Language-Team: Serbian <gnome@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -62,10 +62,10 @@ msgstr "Тема прозора за ћаскање"
#: ../data/empathy.schemas.in.h:4
msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Листа језика одвојена зарезима коју користи провера правописа (нпр. sr, en, "
-"fr)."
+"Листа језика одвојена зарезима коју користи провера правописа (нпр. „sr, en, "
+"fr“)."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
@@ -76,12 +76,12 @@ msgid "Connection managers should be used"
msgstr "Да ли да се користи управник мрежом"
#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
-msgstr "Критеријум за сортирање пријатеља у списку пријатеља"
+msgid "Contact list sort criterion"
+msgstr "Критеријум за сортирање пријатеља"
#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
-msgstr "Подразумевана фасцикла за одабир слика"
+msgstr "Подразумевана фасцикла за избор слика"
#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
@@ -165,12 +165,13 @@ msgid "Open new chats in separate windows"
msgstr "Отвара нова ћаскања у различитим прозорима"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Путања до Адијум теме"
+msgid "Path of the Adium theme to use"
+msgstr "Путања до Адијум теме за коришћење"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Путања до Адијум теме, која се користи за ћаскање."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Путања до Адијум теме за коришћење, ако се користи Адијум тема за ћаскање."
#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
@@ -201,37 +202,37 @@ msgid "Play a sound when we log out"
msgstr "Пушта звук када се ја одјавим"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr "Исписује обавештење ако ћаскање није у фокусу"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Исписуј обавештења ако ћаскање није у фокусу"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
-msgstr "Исписује обавештење када се пријатељ пријави"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Исписуј обавештења када се пријатељ пријави"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
-msgstr "Исписује обавештење када се пријатељ одјави"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Исписуј обавештења када се пријатељ одјави"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Салут налог је направљен"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Приказује слике"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Приказује списак пријатеља у собама"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Приказује савет у вези затварања главног прозора"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Приказује пријатеље који нису на вези"
+#: ../data/empathy.schemas.in.h:45
+msgid "Show protocols"
+msgstr "Прикажи протоколе"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Језици за проверу писања"
@@ -261,207 +262,198 @@ msgid "Use theme for chat rooms"
msgstr "Користи теме за собе ћаскања"
#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Да ли да се омогуће WebKit алати за програмере, као што је Веб Инспектор."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Да ли да Писмоноша објављује локацију корисника његовим пријатељима."
#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Да ли да Писмоношта објављује локацију корисника његовим пријатељима."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију."
#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију."
#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију."
#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију."
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Да ли вас је Писмоноша питао за увожење налога из других програма."
#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Да ли вас је Писмоноша питао за увожење налога из других програма."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Да ли да се Писмоноша сам пријави на постојеће налоге након покретања."
#: ../data/empathy.schemas.in.h:59
msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Да ли да се Писмоноша сам пријави на постојеће налоге након покретања."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Да ли да Писмоноша умањи прецизност локације због повећане приватности."
#: ../data/empathy.schemas.in.h:60
msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
-"Да ли да Писмоноша умањи прецизност локације због повећане приватности."
+"Да ли да Писмоноша користи слику пријатеља као икону у прозору ћаскања."
#: ../data/empathy.schemas.in.h:61
msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
-"Да ли да Писмоноша користи слику пријатеља као икону у прозору ћаскања."
+"Да ли да се омогуће WebKit алати за програмере, као што је Веб Инспектор."
# Није connect већ disconnect!!! ~Милош
#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
"Да ли треба користити управника мреже за аутоматско прекидање и поновно "
"успостављање везе."
#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr ""
-"Да ли је Салут налог направљен када је Интернет писмоноша први пут покренут."
+"Whether to check words typed against the languages you want to check with."
+msgstr "Да ли да проверава писање речи за изабране језике."
#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "Да ли да проверава писање речи за изабране језике."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Да ли да приказује смешке као сличице унутар разговора."
#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "Да ли да приказује смешке као сличице унутар разговора."
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу."
#: ../data/empathy.schemas.in.h:66
msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу."
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже."
#: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже."
+msgid "Whether to play a sound to notify of events."
+msgstr "Да ли да пусти обавештајни звук за догађаје."
#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "Да ли да пусти обавештајни звук за догађаје."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Да ли да пусти обавештајни звук када вам стигне порука."
#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "Да ли да пусти обавештајни звук када вам стигне порука."
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Да ли да пусти обавештајни звук на нови разговор."
#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "Да ли да пусти обавештајни звук на нови разговор."
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Да ли да пусти обавештајни звук када пошаљете поруку."
#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "Да ли да пусти обавештајни звук када пошаљете поруку."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Да ли да пусти звук када се пријавите на мрежу."
#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "Да ли да пусти звук када се пријавите на мрежу."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Да ли да пусти звук када се одјавите са мреже."
#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "Да ли да пусти звук када се одјављујете са мреже."
-
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+msgid "Whether to play sound notifications when away or busy."
msgstr "Да ли да пусти обавештајни звук када постанете заузети или одсутни."
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Да ли да приказује искачући прозор када се пријатељ одјави са мреже."
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether to show a popup notification when a contact goes online."
msgstr "Да ли да приказује искачући прозор када се пријатељ пријави на мрежу."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:76
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
"Да ли да приказује искачући прозор са пристиглим порукама чак и када је "
"прозор за ћаскање отворен, али није у фокусу."
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether to show a popup notification when receiving a new message."
msgstr "Да ли да приказује искачући прозор када примите нову поруку."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:78
msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether to show contacts that are offline in the contact list."
msgstr "Да ли да приказује неповезане пријатеље у списку пријатеља."
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether to show popup notifications when away or busy."
msgstr "Да ли да приказује искачући прозор када сте заузети или одсутни."
+#: ../data/empathy.schemas.in.h:81
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
+
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
msgstr "Да ли да приказује списак пријатеља у собама за ћаскање."
#: ../data/empathy.schemas.in.h:83
+msgid "Whether to show the contact list in compact mode."
+msgstr "Да ли да приказује списак пријатеља у збијеном режиму."
+
+#: ../data/empathy.schemas.in.h:84
msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Да ли да приказује поруку о затварању главног прозора када га затворите на "
"„x“ дугме."
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Да ли да приказује списак пријатеља у збијеном режиму."
-
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
msgstr "Да ли да користи тему за собе разговора."
#: ../data/empathy.schemas.in.h:86
msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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“, "
"сортирање се врши по стању пријатеља."
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Не могу да поставим празан надимак"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управљај налозима за брзе поруке и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Налози за брзе поруке и VoIP"
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Послата хеш вредност и хеш вредност примљене датотеке се не слажу"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Друга страна не подржава пренос датотека"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
-msgstr "Одабрана датотека није обична датотека"
+msgstr "Изабрана датотека није обична датотека"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Изабрана датотека је празна"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Људи у околини"
@@ -493,39 +485,95 @@ msgstr "Грешка приликом преноса датотеке"
msgid "The other participant is unable to transfer the file"
msgstr "Друга страна није у могућности да пренесе датотеку"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Непознат разлог"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Доступан"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Заузет"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Одсутан"
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "Сакривен"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Невидљив"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Неповезан"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Није наведен разлог"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "Стање је постављено на „неповезан“"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Грешка у мрежи"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Неуспешна пријава"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Грешка при шифровању"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Име је у употреби"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Сертификат није прослеђен"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Сертификат није од поверења"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Сертификат је истекао"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Сертификат није активиран"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Име домаћина сертификата се не поклапа"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Отисак сертификата се не поклапа"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Сертификат је самопотписан"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Грешка у сертификату"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Људи у околини"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Јаху! Јапан"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Фејсбук ћаскање"
@@ -581,23 +629,68 @@ msgstr[2] "Пре %d месеци"
msgid "in the future"
msgstr "у будућности"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Све"
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Корисничко име:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Пријави ме"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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-account-widget.c:1553
msgid "Enabled"
msgstr "Омогућено"
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+msgid "This account already exists on the server"
+msgstr "Овај налог већ постоји на серверу"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "Направи нови налог на серверу"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, 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:2039
+#, c-format
+msgid "%s Account"
+msgstr "%s налог"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Нови налог"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> МојНадимак</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> МојНадимак"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -616,7 +709,7 @@ msgstr "Напредно"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Лозинка"
@@ -636,7 +729,7 @@ msgstr "Који је ваш АИМ надимак?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -645,7 +738,7 @@ msgstr "_Порт:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -654,8 +747,8 @@ msgstr "Се_рвер:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> корисничко_име</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> корисничко_име"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -672,8 +765,8 @@ msgid "What is your GroupWise password?"
msgstr "Која је ваша GroupWise лозинка?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Пример:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -689,15 +782,48 @@ msgstr "Која је ваша ICQ лозинка?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "_Кодни распоред:"
+msgid "_Character set:"
+msgstr "_Скуп знакова:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Нова мрежа"
+#: ../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:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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:222
+msgid "Register"
+msgstr "Региструј"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Опције"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "Ништа"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
msgstr "Кодни распоред:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -729,13 +855,12 @@ msgid "Servers"
msgstr "Сервери"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> korisnik@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> korisnik@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> korisnik@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> korisnik@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -750,58 +875,76 @@ msgid "Reso_urce:"
msgstr "Рес_урс:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Ово је ваше корисничко име, а не обична Фејсбук пријава.\n"
+"Ако вам је адреса facebook.com/<b>пера</b>, унесите <b>пера</b>.\n"
+"Уколико немате корисничко име за Фејсбук, идите на <a href=\"http://www."
+"facebook.com/username/\">ову страну</a> да га изаберете."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Користи стари SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#| msgid "What is your Yahoo! ID?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Која је ваша Фејсбук лозинка?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Које је ваше Фејсбук корисничко име?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Који је ваш Гугл ИД?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#| msgid "What is your Yahoo! password?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Која је ваша Гугл лозинка?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Који је ваш Џабер ИД?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Која је ваша Џабер лозинка?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Који је ваш жељени Џабер ИД?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Која ја ваша жељена Џабер лозинка?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "Захт_ева се шифровање(TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Игнориши грешке SSL сертификата"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> korisnik@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Пример:</b> korisnik@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Која је ваша Windows Live лозинка?"
+msgid "What is your Windows Live ID?"
+msgstr "Која је ваша Windows Live идентификација?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Које је ваше Windows Live корисничко име?"
+msgid "What is your Windows Live password?"
+msgstr "Која је ваша Windows Live лозинка?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "_Е-пошта:"
+msgid "_E-mail address:"
+msgstr "Адреса _е-поште:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
@@ -824,52 +967,132 @@ msgid "_Published Name:"
msgstr "Име за о_бјаву:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>Пример:</b> korisnik@moj.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Пример:</b> korisnik@moj.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Корисничко име за пријаву:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Откривај СТУН"
+msgid "Discover Binding"
+msgstr "Откривај повезивања"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Аутоматски откривај STUN сервер"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "СТУН Сервер:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Име прокси домаћина за одлазеће захтеве."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "СТУН порт:"
+msgid "Interval (seconds)"
+msgstr "Интервал (у секундама)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "Опције за одржавање сталне везе"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "Потражи DNS SRV запис имена домаћина STUN сервера у сервисном домену."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Слабо рутирање"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Механизам:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Разне опције"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "Опције проласка кроз НАТ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Порт проксија за одлазеће захтеве."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Опције проксија"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "СТУН Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"Корисничко име за SIP пријаву, ако је различито од корисничког имена из SIP "
+"адресе."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Транспорт:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Ажурирај регистрацијско повезивање ако се открије да је спољна адреса "
+"клијента различита од локалног повезивања."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Користи слабо рутирање и заглавље рутирања као што препоручује RFC 3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "Која је лозинка за ваш СИП налог?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "Која је идентификација за СИП пријаву?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Корисничко име:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Користи _Јаху Јапан"
+msgid "Use _Yahoo! Japan"
+msgstr "Користи _Јаху! Јапан"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
-msgstr "Који је ваш Јаху! ИД?"
+msgstr "Који је ваш Јаху! ИБ?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! password?"
msgstr "Која је ваша Јаху! лозинка?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Јаху ИД:"
+msgid "Yahoo! I_D:"
+msgstr "Јаху И_Б:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
msgstr "Занемар_и позивнице за причаонице и конференције"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -882,94 +1105,173 @@ msgid "Couldn't convert image"
msgstr "Не могу да претворим слику"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
msgstr "Ниједан од прихваћених формата слика није подржан на вашем систему"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
-msgstr "Одаберите вашу слику"
+msgstr "Изаберите вашу слику"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Без слике"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Слике"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "Све датотеке"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Кликните за увећање"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:232
msgid "Failed to reconnect this chat"
-msgstr "Неуспело поновно повезивање на ово ћаскање"
+msgstr "Није успело поновно повезивање на ово ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:654
+msgid "Failed to join chat room"
+msgstr "Није успело прикључивање соби за ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:672
+msgid "Failed to open private chat"
+msgstr "Није успело отварање приватног ћаскања"
+
+#: ../libempathy-gtk/empathy-chat.c:711
+msgid "Topic not supported on this conversation"
+msgstr "Теме нису подржане у овом разговору"
+
+#: ../libempathy-gtk/empathy-chat.c:717
+msgid "You are not allowed to change the topic"
+msgstr "Није вам дозвољено да промените тему"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: чисти све поруке из овог разговора"
+
+#: ../libempathy-gtk/empathy-chat.c:849
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <тема>: поставља тему тренутног разговора"
+
+#: ../libempathy-gtk/empathy-chat.c:852
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <ИБ собе>: прикључује се новој соби за ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:855
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <ИБ собе>: прикључује се новој соби за ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:858
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:861
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћаскање"
+
+#: ../libempathy-gtk/empathy-chat.c:864
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <надимак>: мења ваш надимак на тренутном серверу"
+
+#: ../libempathy-gtk/empathy-chat.c:867
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <порука>: шаље ACTION поруку на тренутни разговор"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+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:875
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<команда>]: приказује све подржане команде. Ако се да и конкретна "
+"<команда>, приказује њено упутство за употребу."
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Неподржана команда"
+#: ../libempathy-gtk/empathy-chat.c:885
+#, c-format
+msgid "Usage: %s"
+msgstr "Коришћење: %s"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:914
+msgid "Unknown command"
+msgstr "Непозната команда"
+
+#: ../libempathy-gtk/empathy-chat.c:1035
+msgid "Unknown command; see /help for the available commands"
+msgstr "Непозната команда; погледајте /help за доступне команде"
+
+#: ../libempathy-gtk/empathy-chat.c:1173
msgid "offline"
msgstr "неповезан"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "invalid contact"
msgstr "неисправан пријатељ"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "permission denied"
msgstr "приступ је забрањен"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "too long message"
msgstr "порука је предугачка"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "not implemented"
msgstr "није подржано"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "unknown"
msgstr "непознато"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1192
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Грешка при слању поруке „%s“: %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1222
#, c-format
msgid "Topic set to: %s"
msgstr "Тема је постављена на: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1224
msgid "No topic defined"
msgstr "Тема није постављена"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1623
msgid "(No Suggestions)"
msgstr "(Нема предлога)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1677
msgid "Insert Smiley"
msgstr "Убаци смешак"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Пошаљи"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1729
msgid "_Spelling Suggestions"
msgstr "Предлози правопи_са"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1823
+msgid "Failed to retrieve recent logs"
+msgstr "Није успело преузимање скорашњих дневника"
+
+#: ../libempathy-gtk/empathy-chat.c:1954
#, c-format
msgid "%s has disconnected"
msgstr "%s је отишао са везе"
@@ -977,12 +1279,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1961
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s је избацио корисника %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1964
#, c-format
msgid "%s was kicked"
msgstr "%s је избачен"
@@ -990,17 +1292,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1972
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s је забранио приступ кориснику %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1975
#, c-format
msgid "%s was banned"
msgstr "Кориснику %s је забрањен приступ"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1979
#, c-format
msgid "%s has left the room"
msgstr "%s је напустио(ла) причаоницу"
@@ -1010,61 +1312,81 @@ msgstr "%s је напустио(ла) причаоницу"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1988
#, c-format
msgid " (%s)"
msgstr " (%s)с"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2013
#, c-format
msgid "%s has joined the room"
msgstr "%s је ушао(ла) у причаоницу"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:2038
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s је сада познат као %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Веза је прекинута"
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2695
+msgid "Wrong password; please try again:"
+msgstr "Погрешна лозинка, покушајте поново:"
+
+#: ../libempathy-gtk/empathy-chat.c:2696
+msgid "Retry"
+msgstr "Покушај поново"
+
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "This room is protected by a password:"
+msgstr "Ова соба је заштићена лозинком:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Join"
+msgstr "Прикључи се"
+
+#: ../libempathy-gtk/empathy-chat.c:2842
msgid "Connected"
msgstr "Повезан"
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Разговор"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Тема:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Умножи адресу везе"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Отвори везу"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Измени податке о пријатељу"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Подаци о профилу"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Нови пријатељ"
@@ -1076,219 +1398,216 @@ msgstr "Од_лучи касније"
msgid "Subscription Request"
msgstr "Захтев за претплату"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Да ли сте сигурни да желите да уклоните групу „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Уклањам групу"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Уклони"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Да ли сте сигурни да желите да уклоните пријатеља „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Уклањам пријатеља"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
msgstr "Дод_ај пријатеља..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "Ћа_скање"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Аудио позив"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Видео позив"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_Погледај претходне разговоре"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Претходни разговори"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Пошаљи датотеку"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Подели моју радну површину"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "_Подаци"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "Изм_ени"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Позивам у ову собу за ћаскање"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+msgid "Inviting you to this room"
+msgstr "Позивам вас у ову собу"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+msgid "_Invite to chat room"
msgstr "Позов_и у собу за ћаскање"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
-msgstr "Одаберите пријатеља"
+msgstr "Изаберите пријатеља"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Сачувај слику"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Не могу да сачувам слику"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:235
msgid "Select"
msgstr "Изабери"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Група"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:476
msgid "Country ISO Code:"
msgstr "ИСО код државе:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:478
msgid "Country:"
msgstr "Држава:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:480
msgid "State:"
msgstr "Савезна јединица:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:482
msgid "City:"
msgstr "Град:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:484
msgid "Area:"
msgstr "Област:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:486
msgid "Postal Code:"
msgstr "Поштански код:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:488
msgid "Street:"
msgstr "Улица:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:490
msgid "Building:"
msgstr "Зграда:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:492
msgid "Floor:"
msgstr "Спрат:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:494
msgid "Room:"
msgstr "Соба:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:496
msgid "Text:"
msgstr "Текст:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:498
msgid "Description:"
msgstr "Опис:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:500
msgid "URI:"
msgstr "Адреса:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:502
msgid "Accuracy Level:"
msgstr "Ниво тачности:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Error:"
msgstr "Грешка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:506
msgid "Vertical Error (meters):"
msgstr "Вертикална грешка (у метрима):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "Хоризонтална грешка (у метрима):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:510
msgid "Speed:"
msgstr "Брзина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:512
msgid "Bearing:"
msgstr "Правац:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:514
msgid "Climb Speed:"
msgstr "Брзина пењања:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:516
msgid "Last Updated on:"
msgstr "Последњи пут ажурирано:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:518
msgid "Longitude:"
msgstr "Географска дужина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:520
msgid "Latitude:"
msgstr "Географска ширина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:522
msgid "Altitude:"
msgstr "Висина:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Локација</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Локација"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:601
msgid "<b>Location</b>, "
msgstr "<b>Локација</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:651
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%d.%Y у %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+msgid "Save Avatar"
+msgstr "Сачувај слику"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+msgid "Unable to save avatar"
+msgstr "Не могу да сачувам слику"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Локација</b> у (датум)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Налог:"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Надимак:"
@@ -1306,81 +1625,76 @@ msgid "Client:"
msgstr "Програм:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "Пријатељ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Детаљи о пријатељу"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Е-пошта"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "Адреса е-поште:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
msgstr "Пуно име:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Групе"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Идентификатор:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Захтевни су подаци..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "Захтевни су подаци&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "ОС:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
-"Одаберите групе у којима желите да се пријатељ налази. Приметите да можете "
+"Изаберите групе у којима желите да се пријатељ налази. Приметите да можете "
"да одаберете и више група као и ниједну."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Издање:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Веб адреса:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
+msgstr "Веб страница:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "Дод_ај групу"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "нови сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Порт"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Налог"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Датум"
@@ -1400,59 +1714,85 @@ msgstr "Тражи"
msgid "_For:"
msgstr "_За:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Позови"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "ИД пријатеља:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "Ћ_аскај"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "ИД пријатеља:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Нови разговор"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "Пошаљи _видео"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Позови"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "Нови позив"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
msgstr "Произвољна порука..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
msgstr "Уреди произвољне поруке..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
-msgstr "Кликните да уклоните овај статус из омиљених"
+msgstr "Кликните да уклоните ову статусну поруку из омиљених"
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
-msgstr "Кликните да ставите овај статус као омиљени"
+msgstr "Кликните да ставите ову статусну поруку као омиљену"
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
-msgstr "Постави статус"
+msgstr "Постави стање"
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
-msgstr "Постави ваше присуство и тренутни статус"
+msgstr "Постави ваше присуство и тренутно стање"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messages…"
msgstr "Произвољне поруке..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Тражи:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Поклопи велика и мала слова"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Израз није нађен"
+
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "Примљена је брза порука"
@@ -1493,11 +1833,11 @@ msgstr "Одлазећи позив"
msgid "Voice call ended"
msgstr "Позив је завршен"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Унеси произвољну поруку"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Уреди произвољне поруке"
@@ -1525,17 +1865,17 @@ msgstr "Чисто"
msgid "Blue"
msgstr "Плаво"
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Не могу да отворим адресу"
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Изаберите датотеку"
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
-msgstr "Одаберите одредиште"
+msgstr "Изаберите одредиште"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -1704,77 +2044,36 @@ msgstr "западни"
msgid "Vietnamese"
msgstr "вијетнамски"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Пријатељ за приказивање у програмчету. Празно значи да ниједан пријатељ није "
-"приказан."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "Слика пријатеља. Празно значи да пријатељ нема слику."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Мегафон"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "Причај!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_О програму"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "Подац_и"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Поставке"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Подесите пријатеља."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Изабрани пријатељ не може да прими датотеке."
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Изаберите пријатеља..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Изабрани пријатељ није на вези."
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Присуство"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Нема порука са грешком"
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Поставите присуство"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Брза порука (Писмоноша)"
-#: ../src/empathy.c:658
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Не повезуј се по покретању"
-#: ../src/empathy.c:662
-msgid "Don't show the contact list on startup"
-msgstr "Не приказуј списак пријатеља по покретању"
-
-#: ../src/empathy.c:666
-msgid "Show the accounts dialog"
-msgstr "Прикажи дијалог са налозима"
+#: ../src/empathy.c:600
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+"Не приказуј списак пријатеља нити било које друго прозорче по покретању"
-#: ../src/empathy.c:678
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Интернет писмоноша за брзе поруке"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -1786,7 +2085,7 @@ msgstr ""
"Задужбина за Слободни Софтвер (FSF); било верзије 2 те Лиценце, било (по "
"вашем нахођењу) било које новије верзије."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -1798,7 +2097,7 @@ msgstr ""
"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Видите ГНУ Општу Јавну Лиценцу за више "
"детаља."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -1808,11 +2107,11 @@ msgstr ""
"писмоношу; ако нисте, пишите Задужбини за Слободни Софтвер (Free Software "
"Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Гномов програм за брзе поруке"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Данило Шерган <dsegan@gmx.net>\n"
@@ -1824,28 +2123,28 @@ msgstr ""
"\n"
"Превод.орг — превод на српски језик."
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
msgstr "Грешка при увожењу налога."
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
msgstr "Грешка при обради детаља налога."
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
msgstr "Грешка при прављењу налога."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
msgstr "Догодила се грешка."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Порука грешке гласи: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Исписана порука грешке: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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."
@@ -1853,47 +2152,46 @@ msgstr ""
"Можете се или вратити и пробати да поново унесете детаље налога или да "
"затворите асистента и додате налоге касније из менија „Измени“."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Догодила се грешка"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Нови %s налог"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Који тип налога за ћаскање имате?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Да ли имате још неки налог за ћаскање који желите да подесите?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Унесите детаље налога"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Који тип налога за ћаскање желите да направите?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Да ли желите да направите још налога за ћаскање?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Унесите детаље новог налога"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -1905,82 +2203,129 @@ msgstr ""
"програме за ћаскање. Са микрофоном и камером такође можете да обављате и "
"аудио и видео позиве."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Да ли имате налог који сте користили са неким другим програмом за ћаскање?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Да, увези детаље мог налога из "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Да, ја ћу сам унети детаље налога"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Не, желим нови налог"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Не, за сада само желим да видим људе у близини"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
-msgstr "Одаберите налоге које желите да увезете:"
+msgstr "Изаберите налоге које желите да увезете:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Да"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Не, то је све за сада"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1117
+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 ""
+"Писмоноша може аутоматски да открије и ћаска са људима који су повезани на "
+"исту мрежу као и ви. Ако желите да користите ову могућност, проверите да ли "
+"су детаљи испод тачни. Лако их можете изменити касније или искључити ову "
+"могућност из прозорчета „Налози“."
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Измени->Налози"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Не, за сада не желим да користим ову могућност"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Не могу да ћаскам са људима повезаним у вашу локалну мрежу јер telepathy-"
+"salut није инсталиран. Ако желите да омогућите ово, инсталирајте telepathy-"
+"salut пакет и направите налог „Људи у околини“ из прозорчета „Налози“."
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut није инсталиран"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Добродошли у Интернет Писмоношу"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Увезите ваше постојеће налоге"
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Унесите личне податке"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "Неке измене налога %s нису сачуване."
+msgid "There are unsaved modifications to your %s account."
+msgstr "Постоје несачуване измене на вашем налогу %s."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. 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:70
+msgid "Your new account has not been saved yet."
+msgstr "Ваш нови налог још није сачуван."
+
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connecting…"
+msgstr "Повезујем се…"
+
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
-#| msgid "%s on %s"
-msgid "%1$s on %2$s"
-msgstr "%1$s на %2$s"
+msgid "Disconnected — %s"
+msgstr "Веза је прекинута — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
-msgid "%s Account"
-msgstr "%s налог"
+msgid "Offline — %s"
+msgstr "Неповезан — %s"
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "Нови налог"
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Неповезан — Нема мрежне конекције"
+
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "Непознато стање"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Неповезан — Налог је онемогућен"
-#: ../src/empathy-accounts-dialog.c:501
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1988,32 +2333,16 @@ msgstr ""
"Овим ћете направити нови налог, занемаривши унете измене.\n"
"Да ли сигурно желите да наставите?"
-#: ../src/empathy-accounts-dialog.c:786
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"Уклонићете налог %s!\n"
-"Да ли желите да наставите?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "Да ли сте сигурни да желите да уклоните „%s“ са вашег рачунара?"
-#: ../src/empathy-accounts-dialog.c:791
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Сви придружени разговори и собе за ћаскање НЕЋЕ бити уклоњени ако "
-"наставите.\n"
-"\n"
-"Ако икада пожелите да вратите налог, они ће бити доступни."
+#: ../src/empathy-accounts-dialog.c:1119
+msgid "This will not remove your account on the server."
+msgstr "Ово неће уклонити ваш налог на серверу."
-#: ../src/empathy-accounts-dialog.c:979
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2021,10 +2350,7 @@ msgstr ""
"Овим ћете изабрати други налог, занемаривши унете измене.\n"
"Да ли сигурно желите да наставите?"
-#: ../src/empathy-accounts-dialog.c:1474
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2032,23 +2358,20 @@ msgstr ""
"Овим ћете затворити прозор, занемаривши унете измене.\n"
"Да ли сигурно желите да наставите?"
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Налози"
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Додај нови"
-
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Н_аправи"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Ниједан протокол није инсталиран"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "Протокол:"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2056,110 +2379,232 @@ msgstr ""
"Да бисте додали нови налог, прво морате да инсталирате прикључке за све "
"протоколе које желите да користите."
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "Дод_ај..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Направи нови налог"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "Иско_ристи постојећи налог"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "Дод_ај&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "налог"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "Увез_и&#x2026;"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Контраст"
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Осветљеност"
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Гама"
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Јачина звука"
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "Успостављам везу..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Бочна површ"
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Бројчаник"
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Звучни улаз"
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Видео улаз"
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Позив са корисником %s"
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Позив"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Повезан — %d:%02dм"
+#: ../src/empathy-call-window.c:1755
+msgid "Technical Details"
+msgstr "Технички детаљи"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар"
+
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар"
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Не могу да успоставим везу са %s. Можда је неко од вас двоје на мрежи која "
+"не дозвољава директне везе."
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Дошло је до грешке у мрежи"
+
+#: ../src/empathy-call-window.c:1814
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Звучни формати потребни за овај позив нису инсталирани на вашем рачунару"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Видео формати потребни за овај позив нису инсталирани на вашем рачунару"
+
+#: ../src/empathy-call-window.c:1827
+#, 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-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Дошло је до грешке у мотору за позиве"
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr "Не могу да успоставим звучни ток"
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr "Не могу да успоставим видео ток"
+
#: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "Позови пријатеља поново"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Искљ. камеру"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Укљ. камеру"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Онемогући камеру и престани да шаљеш видео"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Омогући камеру и шаљи видео"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Омогући камеру, али не шаљи видео"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Спусти"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Спусти тренутни позив"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Поново зови"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Пошаљи звук"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Пошаљи видео"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Укључи/искључи пренос звука"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Преглед видеа"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "В_идео"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Позови"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Искљ. видео"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Укљ. видео"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Преглед видеа"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Преглед"
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d непрочитана)"
+msgstr[1] "%s (%d непрочитане)"
+msgstr[2] "%s (%d непрочитаних)"
+
+#: ../src/empathy-chat-window.c:448
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (и %u остала)"
+msgstr[1] "%s (и %u остале)"
+msgstr[2] "%s (и %u осталих)"
+
+#: ../src/empathy-chat-window.c:464
#, c-format
-msgid "Conversations (%d)"
-msgstr "Разговори (%d)"
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d непрочитана од осталих)"
+msgstr[1] "%s (%d непрочитане од осталих)"
+msgstr[2] "%s (%d непрочитаних од осталих)"
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d непрочитана од свих)"
+msgstr[1] "%s (%d непрочитане од свих)"
+msgstr[2] "%s (%d непрочитаних од свих)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Куца поруку."
@@ -2168,70 +2613,78 @@ msgid "C_lear"
msgstr "_Очисти"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_Пријатељ"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Ћаскање"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Убаци _смешак"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Позови _учеснике..."
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Премести језичак _лево"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Премести језичак _десно"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Пријатељ"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Садржај"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Разговор"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Откачи лист"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "Изм_ени"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
msgstr "О_миљена соба за ћаскање"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Помоћ"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Следећи лист"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "П_ретходни лист"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Прикажи _списак пријатеља"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Листови"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Име"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Соба"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Аутоматско повезивање"
@@ -2239,75 +2692,76 @@ msgstr "Аутоматско повезивање"
msgid "Manage Favorite Rooms"
msgstr "Уреди омиљене собе"
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:339
+msgid "Incoming video call"
+msgstr "Долазећи видео позив"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Долазни позив"
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:343
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s вас зове видео позивом. Желите ли да се јавите?"
+
+#: ../src/empathy-event-manager.c:344
#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s вас зове, желите ли да се јавите?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s вас зове. Желите ли да се јавите?"
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "_Одбаци"
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Јави се"
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "Incoming call from %s"
-msgstr "Долазни позив од %s"
+msgid "Incoming video call from %s"
+msgstr "Долазни видео позив од %s"
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s вам нуди позивницу"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "Спољни програм ће бити покренут за обраду."
-
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "Немате потребни спољни програм за обраду."
+msgid "Incoming call from %s"
+msgstr "Долазни позив од %s"
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Позивнице за собу"
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s вас позива да се придружите %s"
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "_Одбиј"
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Прикључи се"
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s вас је позвао(ла) да се придружите %s"
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Долазни пренос датотеке од %s"
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "%s вам је упутио(ла) захтев за претплату"
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2317,117 +2771,117 @@ msgstr ""
"Порука: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s није више на вези."
#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s је сада на вези."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Непознато"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s од %s у %s/s"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s од %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Примам „%s“ од %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Шаљем „%s“ за %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Грешка при примању „%s“ од %s"
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Грешка при примању датотеке"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Грешка при слању „%s“ за %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Грешка при слању датотеке"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "„%s“ је примљен од %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr " „%s“ је послат за %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Пренос датотеке завршен"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Чекам на одговор друге стране"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Проверавам интегритет датотеке „%s“"
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Тражим хеш датотеке „%s“"
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Датотека"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Преостало"
@@ -2452,15 +2906,15 @@ msgid "Import Accounts"
msgstr "Увезите налоге"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Увези"
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Протокол"
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Извор"
@@ -2469,67 +2923,23 @@ msgstr "Извор"
msgid "%s account"
msgstr "%s налог"
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "Изм_ени налог"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Није наведена ниједна грешка"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Грешка у мрежи"
+#: ../src/empathy-main-window.c:433
+msgid "Reconnect"
+msgstr "Поново се повежи"
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Неуспешна пријава"
+#: ../src/empathy-main-window.c:439
+msgid "Edit Account"
+msgstr "Измени налог"
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Грешка при шифровању"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Затвори"
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Име је у употреби"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Сертификат није прослеђен"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Сертификат није од поверења"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Сертификат је истекао"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Сертификат није активиран"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Име домаћина сертификата се не поклапа"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Отисак сертификата се не поклапа"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Сертификат је самопотписан"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Грешка у сертификату"
-
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Непозната грешка"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Пријатељ"
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Прикажи и измени налоге"
@@ -2557,71 +2967,78 @@ msgstr "Уреди омиљене"
msgid "N_ormal Size"
msgstr "Н_ормална величина"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Нови по_зив…"
+
+#: ../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:10
+msgid "Show P_rotocols"
+msgstr "Прикажи п_ротоколе"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Сортирај по име_ну"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Сортирај по _стању"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "Н_алози"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Компактна величина"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "Отклањање _грешака"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
-msgstr "_Преноси датотека"
+msgstr "Преноси _датотека"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "_Прикључи се..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
+msgstr "_Прикључи се…"
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "_Нови разговори..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Нови разговор…"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "Неп_овезане пријатељи"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "Лични _подаци"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "_Претходни разговори"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Соба"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Собе за ћаскање"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Чланови"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2633,16 +3050,16 @@ msgstr ""
"Потребна лозинка: %s\n"
"Чланови: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Не"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Не могу да покренем листање списка соба"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Не могу да зауставим листање списка соба"
@@ -2709,86 +3126,70 @@ msgid "Language"
msgstr "Језик"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Дозволи коришћење _ГПС-а"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Дозволи коришћење мобилног _телефона"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Дозволи коришћење _мреже"
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Изглед"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
msgstr "Аутоматски се пове_жи по покретању "
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Понашање"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
msgstr "Тема ћаскања:"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
msgstr "Искључи обавештења када сам одсутан или заузет"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
msgstr "Искључи звукове када сам одсутан или заузет"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Омогући обавештења када пријатељ дође на мрежу"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Омогући обавештења када пријатељ оде са мреже"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Омогући обавештења када ћаскања нису у фокусу"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Омогући проверу правописа за следеће језике:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Опште"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue подешавања"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "Локација"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Извори локација:"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Обавештења"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Пусти звук за догађаје"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Поставке"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Приватност"
-#: ../src/empathy-preferences.ui.h:21
+#: ../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 "
@@ -2797,23 +3198,23 @@ msgstr ""
"Умањена прецизност локације подразумева да ће најпрецизнији подаци о вашој "
"локацији бити град и држава. ГПС координате ће бити тачне до 1. децимале."
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Прикажи слике _смешака"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Прикажи _списак пријатеља у собама"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Звукови"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Провера писања"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -2821,18 +3222,30 @@ msgstr ""
"Овај списак језика представља само оне језике за које имате инсталиране "
"речнике."
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Теме"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Мобилни телефон"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
msgstr "Омогући обав_ештења у облачићима"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
msgstr "Омогући звуковна обав_ештења"
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_ГПС"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (ИП, бежична)"
+
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "_Отварај ћаскања у новим прозорима"
@@ -2845,90 +3258,272 @@ msgstr "Објави локацији мојим _пријатељима"
msgid "_Reduce location accuracy"
msgstr "Умањи _тачност локације"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:176
+msgid "Respond"
+msgstr "Одговори"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Стање"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "_Изађи"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Не могу да покренем програм сервиса %s“: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Позивница је понуђена за сервис %s, али немате потребан програм за обраду."
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Мапа пријатеља"
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "Грешка"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "Критична"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "Упозорење"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "Порука"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "Информација"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "Отклањање грешака"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Сачувај"
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Прозор за отклањање грешака"
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Пауза"
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Ниво"
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1331
+msgid "Debug"
+msgstr "Отклањање грешака"
+
+#: ../src/empathy-debug-window.c:1337
+msgid "Info"
+msgstr "Информација"
+
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Порука"
+
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Упозорење"
+
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Критична"
+
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Грешка"
+
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Време"
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Домен"
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Категорија"
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Ниво"
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
-msgstr "Одабрани управник везе нема проширење за удаљено отклањање грешака."
+msgstr "Изабрани управник везе нема проширење за удаљено отклањање грешака."
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Позови учеснике"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Изаберите пријатеља за позивање у овај разговор:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Не приказуј ниједно прозорче; уради посао који имаш (нпр. увожење) и изађи"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Не приказуј ниједно прозорче уколико постоје не-саулт налози"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Почетно изабирање датог налога (нпр. gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<идентификација налога>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Писмоношини налози"
+
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr " Налози"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Салут налог је направљен"
+
+#~| msgid ""
+#~| "Whether or not the Salut account has been created on the first Empathy "
+#~| "run."
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr ""
+#~ "Да ли је Салут налог направљен када је Интернет писмоноша први пут "
+#~ "покренут."
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr ""
+#~ "Покушај увожење сваког препознатог налога и прикажи асистента ако то не "
+#~ "успе"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "Не могу да поставим празан надимак"
+
+#~ msgid "Hidden"
+#~ msgstr "Сакривен"
+
+#~ msgid "Unsupported command"
+#~ msgstr "Неподржана команда"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "_Погледај претходне разговоре"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>Локација</b>"
+
+#~ msgid "Email:"
+#~ msgstr "Е-пошта"
+
+#~ msgid "C_all"
+#~ msgstr "_Позови"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "Уреди произвољне поруке..."
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr ""
+#~ "Пријатељ за приказивање у програмчету. Празно значи да ниједан пријатељ "
+#~ "није приказан."
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "Слика пријатеља. Празно значи да пријатељ нема слику."
+
+#~ msgid "Talk!"
+#~ msgstr "Причај!"
+
+#~ msgid "_Information"
+#~ msgstr "Подац_и"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Поставке"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "Подесите пријатеља."
+
+#~ msgid "Select contact..."
+#~ msgstr "Изаберите пријатеља..."
+
+#~ msgid "Presence"
+#~ msgstr "Присуство"
+
+#~ msgid "Set your own presence"
+#~ msgstr "Поставите присуство"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "Прикажи дијалог са налозима"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "Порука грешке гласи: <span style=\"italic\">%s</span>"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Уклонићете налог %s!\n"
+#~ "Да ли желите да наставите?"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "Сви придружени разговори и собе за ћаскање НЕЋЕ бити уклоњени ако "
+#~ "наставите.\n"
+#~ "\n"
+#~ "Ако икада пожелите да вратите налог, они ће бити доступни."
+
+#~ msgid "Add new"
+#~ msgstr "Додај нови"
+
+#~ msgid "Cr_eate"
+#~ msgstr "Н_аправи"
+
+#~ msgid "_Add..."
+#~ msgstr "Дод_ај..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "Иско_ристи постојећи налог"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "Разговори (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "_Пријатељ"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s вам нуди позивницу"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "Спољни програм ће бити покренут за обраду."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "Немате потребни спољни програм за обраду."
+
+#~ msgid "No error specified"
+#~ msgstr "Није наведена ниједна грешка"
+
+#~ msgid "Unknown error"
+#~ msgstr "Непозната грешка"
+
+#~ msgid "_Join..."
+#~ msgstr "_Прикључи се..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Нови разговори..."
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "Дозволи коришћење _ГПС-а"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "Дозволи коришћење мобилног _телефона"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "Дозволи коришћење _мреже"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue подешавања"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "Не могу да покренем програм сервиса %s“: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "Позивница је понуђена за сервис %s, али немате потребан програм за обраду."
diff --git a/po/sr@latin.po b/po/sr@latin.po
index f2788c64f..6612603d9 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -11,15 +11,15 @@
# Nikola Kotur <kotnik@ns-linux.org>, 2006.
# Miloš Popović <gpopac@gmail.com>, 2007, 2008.
#
-# Maintainder: Branko Kokanović <branko.kokanovic@gmail.com>, 2009.
+# Maintainer: Branko Kokanović <branko.kokanovic@gmail.com>, 2009.
# Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
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: 2009-09-01 21:15+0000\n"
-"PO-Revision-Date: 2009-08-29 21:12+0200\n"
+"POT-Creation-Date: 2010-03-08 12:19+0000\n"
+"PO-Revision-Date: 2010-03-08 22:11+0100\n"
"Last-Translator: Branko Kokanović <branko.kokanovic@gmail.com>\n"
"Language-Team: Serbian <gnome@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -62,10 +62,10 @@ msgstr "Tema prozora za ćaskanje"
#: ../data/empathy.schemas.in.h:4
msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
-"Lista jezika odvojena zarezima koju koristi provera pravopisa (npr. sr, en, "
-"fr)."
+"Lista jezika odvojena zarezima koju koristi provera pravopisa (npr. „sr, en, "
+"fr“)."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
@@ -76,12 +76,12 @@ msgid "Connection managers should be used"
msgstr "Da li da se koristi upravnik mrežom"
#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
-msgstr "Kriterijum za sortiranje prijatelja u spisku prijatelja"
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za odabir slika"
+msgstr "Podrazumevana fascikla za izbor slika"
#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
@@ -165,12 +165,13 @@ msgid "Open new chats in separate windows"
msgstr "Otvara nova ćaskanja u različitim prozorima"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Putanja do Adijum teme"
+msgid "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za korišćenje"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Putanja do Adijum teme, koja se koristi za ćaskanje."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
@@ -201,37 +202,37 @@ msgid "Play a sound when we log out"
msgstr "Pušta zvuk kada se ja odjavim"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr "Ispisuje obaveštenje ako ćaskanje nije u fokusu"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ispisuj obaveštenja ako ćaskanje nije u fokusu"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
-msgstr "Ispisuje obaveštenje kada se prijatelj prijavi"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ispisuj obaveštenja kada se prijatelj prijavi"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
-msgstr "Ispisuje obaveštenje kada se prijatelj odjavi"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuj obaveštenja kada se prijatelj odjavi"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut nalog je napravljen"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Prikazuje slike"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Prikazuje spisak prijatelja u sobama"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Prikazuje prijatelje koji nisu na vezi"
+#: ../data/empathy.schemas.in.h:45
+msgid "Show protocols"
+msgstr "Prikaži protokole"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Jezici za proveru pisanja"
@@ -261,207 +262,198 @@ msgid "Use theme for chat rooms"
msgstr "Koristi teme za sobe ćaskanja"
#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Da li da se omoguće WebKit alati za programere, kao što je Veb Inspektor."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Da li da Pismonoša objavljuje lokaciju korisnika njegovim prijateljima."
#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Da li da Pismonošta objavljuje lokaciju korisnika njegovim prijateljima."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Da li vas je Pismonoša pitao za uvoženje naloga iz drugih programa."
#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Da li vas je Pismonoša pitao za uvoženje naloga iz drugih programa."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Da li da se Pismonoša sam prijavi na postojeće naloge nakon pokretanja."
#: ../data/empathy.schemas.in.h:59
msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Da li da se Pismonoša sam prijavi na postojeće naloge nakon pokretanja."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Da li da Pismonoša umanji preciznost lokacije zbog povećane privatnosti."
#: ../data/empathy.schemas.in.h:60
msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
-"Da li da Pismonoša umanji preciznost lokacije zbog povećane privatnosti."
+"Da li da Pismonoša koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
#: ../data/empathy.schemas.in.h:61
msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
-"Da li da Pismonoša koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
+"Da li da se omoguće WebKit alati za programere, kao što je Veb Inspektor."
# Nije connect već disconnect!!! ~Miloš
#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
"uspostavljanje veze."
#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr ""
-"Da li je Salut nalog napravljen kada je Internet pismonoša prvi put pokrenut."
+"Whether to check words typed against the languages you want to check with."
+msgstr "Da li da proverava pisanje reči za izabrane jezike."
#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "Da li da proverava pisanje reči za izabrane jezike."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Da li da prikazuje smeške kao sličice unutar razgovora."
#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "Da li da prikazuje smeške kao sličice unutar razgovora."
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
#: ../data/empathy.schemas.in.h:66
msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
#: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
+msgid "Whether to play a sound to notify of events."
+msgstr "Da li da pusti obaveštajni zvuk za događaje."
#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "Da li da pusti obaveštajni zvuk za događaje."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "Da li da pusti zvuk kada se odjavljujete sa mreže."
-
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+msgid "Whether to play sound notifications when away or busy."
msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Da li da prikazuje iskačući prozor kada se prijatelj odjavi sa mreže."
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether to show a popup notification when a contact goes online."
msgstr "Da li da prikazuje iskačući prozor kada se prijatelj prijavi na mrežu."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:76
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
"Da li da prikazuje iskačući prozor sa pristiglim porukama čak i kada je "
"prozor za ćaskanje otvoren, ali nije u fokusu."
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether to show a popup notification when receiving a new message."
msgstr "Da li da prikazuje iskačući prozor kada primite novu poruku."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:78
msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether to show contacts that are offline in the contact list."
msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether to show popup notifications when away or busy."
msgstr "Da li da prikazuje iskačući prozor kada ste zauzeti ili odsutni."
+#: ../data/empathy.schemas.in.h:81
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
#: ../data/empathy.schemas.in.h:83
+msgid "Whether to show the contact list in compact mode."
+msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
+
+#: ../data/empathy.schemas.in.h:84
msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
"„x“ dugme."
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
-
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
msgstr "Da li da koristi temu za sobe razgovora."
#: ../data/empathy.schemas.in.h:86
msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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 ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano je "
-"sortiranje po imenu prijatelja (vrednost „name“). Ako je vrednost „state“, "
+"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
+"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, "
"sortiranje se vrši po stanju prijatelja."
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Ne mogu da postavim prazan nadimak"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljaj nalozima za brze poruke i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za brze poruke i VoIP"
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Poslata heš vrednost i heš vrednost primljene datoteke se ne slažu"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Druga strana ne podržava prenos datoteka"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
-msgstr "Odabrana datoteka nije obična datoteka"
+msgstr "Izabrana datoteka nije obična datoteka"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Izabrana datoteka je prazna"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Ljudi u okolini"
@@ -493,39 +485,95 @@ msgstr "Greška prilikom prenosa datoteke"
msgid "The other participant is unable to transfer the file"
msgstr "Druga strana nije u mogućnosti da prenese datoteku"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Nepoznat razlog"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Dostupan"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Zauzet"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Odsutan"
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "Sakriven"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Nevidljiv"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Nepovezan"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Nije naveden razlog"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "Stanje je postavljeno na „nepovezan“"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Greška u mreži"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Neuspešna prijava"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Greška pri šifrovanju"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Ime je u upotrebi"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Sertifikat nije prosleđen"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Sertifikat nije od poverenja"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Sertifikat je istekao"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Sertifikat nije aktiviran"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Ime domaćina sertifikata se ne poklapa"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Otisak sertifikata se ne poklapa"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Sertifikat je samopotpisan"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Greška u sertifikatu"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Ljudi u okolini"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Jahu! Japan"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Fejsbuk ćaskanje"
@@ -581,23 +629,68 @@ msgstr[2] "Pre %d meseci"
msgid "in the future"
msgstr "u budućnosti"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Sve"
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Korisničko ime:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Prijavi me"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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 "Nalog:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "Omogućeno"
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+msgid "This account already exists on the server"
+msgstr "Ovaj nalog već postoji na serveru"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "Napravi novi nalog na serveru"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, 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:2039
+#, c-format
+msgid "%s Account"
+msgstr "%s nalog"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Novi nalog"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> MojNadimak</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -616,7 +709,7 @@ msgstr "Napredno"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Lozinka"
@@ -636,7 +729,7 @@ msgstr "Koji je vaš AIM nadimak?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -645,7 +738,7 @@ msgstr "_Port:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -654,8 +747,8 @@ msgstr "Se_rver:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> korisničko_ime</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisničko_ime"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -672,8 +765,8 @@ msgid "What is your GroupWise password?"
msgstr "Koja je vaša GroupWise lozinka?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Primer:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -689,15 +782,48 @@ msgstr "Koja je vaša ICQ lozinka?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "_Kodni raspored:"
+msgid "_Character set:"
+msgstr "_Skup znakova:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Nova mreža"
+#: ../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:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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:222
+msgid "Register"
+msgstr "Registruj"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr "Opcije"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "Ništa"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
msgstr "Kodni raspored:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -729,13 +855,12 @@ msgid "Servers"
msgstr "Serveri"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#| msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> korisnik@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> korisnik@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> korisnik@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> korisnik@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -750,58 +875,76 @@ msgid "Reso_urce:"
msgstr "Res_urs:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Ovo je vaše korisničko ime, a ne obična Fejsbuk prijava.\n"
+"Ako vam je adresa facebook.com/<b>pera</b>, unesite <b>pera</b>.\n"
+"Ukoliko nemate korisničko ime za Fejsbuk, idite na <a href=\"http://www."
+"facebook.com/username/\">ovu stranu</a> da ga izaberete."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Koristi stari SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#| msgid "What is your Yahoo! ID?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Koja je vaša Fejsbuk lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Koje je vaše Fejsbuk korisničko ime?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Koji je vaš Gugl ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#| msgid "What is your Yahoo! password?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Koja je vaša Gugl lozinka?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Koji je vaš Džaber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Koja je vaša Džaber lozinka?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Koji je vaš željeni Džaber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Koja ja vaša željena Džaber lozinka?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "Zaht_eva se šifrovanje(TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Ignoriši greške SSL sertifikata"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> korisnik@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Primer:</b> korisnik@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Koja je vaša Windows Live lozinka?"
+msgid "What is your Windows Live ID?"
+msgstr "Koja je vaša Windows Live identifikacija?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Koje je vaše Windows Live korisničko ime?"
+msgid "What is your Windows Live password?"
+msgstr "Koja je vaša Windows Live lozinka?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "_E-pošta:"
+msgid "_E-mail address:"
+msgstr "Adresa _e-pošte:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
@@ -824,52 +967,132 @@ msgid "_Published Name:"
msgstr "Ime za o_bjavu:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>Primer:</b> korisnik@moj.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Primer:</b> korisnik@moj.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Korisničko ime za prijavu:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Otkrivaj STUN"
+msgid "Discover Binding"
+msgstr "Otkrivaj povezivanja"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrivaj STUN server"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN Server:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Ime proksi domaćina za odlazeće zahteve."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN port:"
+msgid "Interval (seconds)"
+msgstr "Interval (u sekundama)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "Opcije za održavanje stalne veze"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "Potraži DNS SRV zapis imena domaćina STUN servera u servisnom domenu."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Mehanizam:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Port proksija za odlazeće zahteve."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Opcije proksija"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "STUN Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"Korisničko ime za SIP prijavu, ako je različito od korisničkog imena iz SIP "
+"adrese."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Ažuriraj registracijsko povezivanje ako se otkrije da je spoljna adresa "
+"klijenta različita od lokalnog povezivanja."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Koristi slabo rutiranje i zaglavlje rutiranja kao što preporučuje RFC 3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "Koja je lozinka za vaš SIP nalog?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "Koja je identifikacija za SIP prijavu?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Korisničko ime:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Koristi _Jahu Japan"
+msgid "Use _Yahoo! Japan"
+msgstr "Koristi _Jahu! Japan"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
-msgstr "Koji je vaš Jahu! ID?"
+msgstr "Koji je vaš Jahu! IB?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! password?"
msgstr "Koja je vaša Jahu! lozinka?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Jahu ID:"
+msgid "Yahoo! I_D:"
+msgstr "Jahu I_B:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
msgstr "Zanemar_i pozivnice za pričaonice i konferencije"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -882,94 +1105,173 @@ msgid "Couldn't convert image"
msgstr "Ne mogu da pretvorim sliku"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
msgstr "Nijedan od prihvaćenih formata slika nije podržan na vašem sistemu"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
-msgstr "Odaberite vašu sliku"
+msgstr "Izaberite vašu sliku"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Bez slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "Sve datoteke"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Kliknite za uvećanje"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:232
msgid "Failed to reconnect this chat"
-msgstr "Neuspelo ponovno povezivanje na ovo ćaskanje"
+msgstr "Nije uspelo ponovno povezivanje na ovo ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:654
+msgid "Failed to join chat room"
+msgstr "Nije uspelo priključivanje sobi za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:672
+msgid "Failed to open private chat"
+msgstr "Nije uspelo otvaranje privatnog ćaskanja"
+
+#: ../libempathy-gtk/empathy-chat.c:711
+msgid "Topic not supported on this conversation"
+msgstr "Teme nisu podržane u ovom razgovoru"
+
+#: ../libempathy-gtk/empathy-chat.c:717
+msgid "You are not allowed to change the topic"
+msgstr "Nije vam dozvoljeno da promenite temu"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: čisti sve poruke iz ovog razgovora"
+
+#: ../libempathy-gtk/empathy-chat.c:849
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
+
+#: ../libempathy-gtk/empathy-chat.c:852
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <IB sobe>: priključuje se novoj sobi za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:855
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <IB sobe>: priključuje se novoj sobi za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:858
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:861
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:864
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
+
+#: ../libempathy-gtk/empathy-chat.c:867
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <poruka>: šalje ACTION poruku na trenutni razgovor"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+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 <poruka>: šalje <poruka> na trenutni razgovor. Ovo se koristi za slanje "
+"poruka koje počinju sa „/“. Na primer: \"/say /join se koristi za "
+"priključivanje u novu sobu za ćaskanje"
+
+#: ../libempathy-gtk/empathy-chat.c:875
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<komanda>]: prikazuje sve podržane komande. Ako se da i konkretna "
+"<komanda>, prikazuje njeno uputstvo za upotrebu."
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Nepodržana komanda"
+#: ../libempathy-gtk/empathy-chat.c:885
+#, c-format
+msgid "Usage: %s"
+msgstr "Korišćenje: %s"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:914
+msgid "Unknown command"
+msgstr "Nepoznata komanda"
+
+#: ../libempathy-gtk/empathy-chat.c:1035
+msgid "Unknown command; see /help for the available commands"
+msgstr "Nepoznata komanda; pogledajte /help za dostupne komande"
+
+#: ../libempathy-gtk/empathy-chat.c:1173
msgid "offline"
msgstr "nepovezan"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1176
msgid "invalid contact"
msgstr "neispravan prijatelj"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1179
msgid "permission denied"
msgstr "pristup je zabranjen"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1182
msgid "too long message"
msgstr "poruka je predugačka"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1185
msgid "not implemented"
msgstr "nije podržano"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1188
msgid "unknown"
msgstr "nepoznato"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1192
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Greška pri slanju poruke „%s“: %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1222
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je postavljena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1224
msgid "No topic defined"
msgstr "Tema nije postavljena"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1623
msgid "(No Suggestions)"
msgstr "(Nema predloga)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1677
msgid "Insert Smiley"
msgstr "Ubaci smešak"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Pošalji"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1729
msgid "_Spelling Suggestions"
msgstr "Predlozi pravopi_sa"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1823
+msgid "Failed to retrieve recent logs"
+msgstr "Nije uspelo preuzimanje skorašnjih dnevnika"
+
+#: ../libempathy-gtk/empathy-chat.c:1954
#, c-format
msgid "%s has disconnected"
msgstr "%s je otišao sa veze"
@@ -977,12 +1279,12 @@ msgstr "%s je otišao sa veze"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1184
+#: ../libempathy-gtk/empathy-chat.c:1961
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izbacio korisnika %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1964
#, c-format
msgid "%s was kicked"
msgstr "%s je izbačen"
@@ -990,17 +1292,17 @@ msgstr "%s je izbačen"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1972
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je zabranio pristup korisniku %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1975
#, c-format
msgid "%s was banned"
msgstr "Korisniku %s je zabranjen pristup"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1979
#, c-format
msgid "%s has left the room"
msgstr "%s je napustio(la) pričaonicu"
@@ -1010,61 +1312,81 @@ msgstr "%s je napustio(la) pričaonicu"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1988
#, c-format
msgid " (%s)"
msgstr " (%s)s"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2013
#, c-format
msgid "%s has joined the room"
msgstr "%s je ušao(la) u pričaonicu"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:2038
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s je sada poznat kao %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Veza je prekinuta"
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2695
+msgid "Wrong password; please try again:"
+msgstr "Pogrešna lozinka, pokušajte ponovo:"
+
+#: ../libempathy-gtk/empathy-chat.c:2696
+msgid "Retry"
+msgstr "Pokušaj ponovo"
+
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "This room is protected by a password:"
+msgstr "Ova soba je zaštićena lozinkom:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Join"
+msgstr "Priključi se"
+
+#: ../libempathy-gtk/empathy-chat.c:2842
msgid "Connected"
msgstr "Povezan"
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2895
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Razgovor"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Tema:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Umnoži adresu veze"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Otvori vezu"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Izmeni podatke o prijatelju"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Podaci o profilu"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Novi prijatelj"
@@ -1076,219 +1398,216 @@ msgstr "Od_luči kasnije"
msgid "Subscription Request"
msgstr "Zahtev za pretplatu"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Uklanjam grupu"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "_Ukloni"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Uklanjam prijatelja"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
msgstr "Dod_aj prijatelja..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "Ća_skanje"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio poziv"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video poziv"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_Pogledaj prethodne razgovore"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Prethodni razgovori"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Pošalji datoteku"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Podeli moju radnu površinu"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "_Podaci"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "Izm_eni"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Pozivam u ovu sobu za ćaskanje"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+msgid "_Invite to chat room"
msgstr "Pozov_i u sobu za ćaskanje"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
-msgstr "Odaberite prijatelja"
+msgstr "Izaberite prijatelja"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Sačuvaj sliku"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Ne mogu da sačuvam sliku"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:235
msgid "Select"
msgstr "Izaberi"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Grupa"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:476
msgid "Country ISO Code:"
msgstr "ISO kod države:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:478
msgid "Country:"
msgstr "Država:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:480
msgid "State:"
msgstr "Savezna jedinica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:482
msgid "City:"
msgstr "Grad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:484
msgid "Area:"
msgstr "Oblast:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:486
msgid "Postal Code:"
msgstr "Poštanski kod:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:488
msgid "Street:"
msgstr "Ulica:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:490
msgid "Building:"
msgstr "Zgrada:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:492
msgid "Floor:"
msgstr "Sprat:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:494
msgid "Room:"
msgstr "Soba:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:496
msgid "Text:"
msgstr "Tekst:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:498
msgid "Description:"
msgstr "Opis:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:500
msgid "URI:"
msgstr "Adresa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:502
msgid "Accuracy Level:"
msgstr "Nivo tačnosti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:504
msgid "Error:"
msgstr "Greška:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:506
msgid "Vertical Error (meters):"
msgstr "Vertikalna greška (u metrima):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "Horizontalna greška (u metrima):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:510
msgid "Speed:"
msgstr "Brzina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:512
msgid "Bearing:"
msgstr "Pravac:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:514
msgid "Climb Speed:"
msgstr "Brzina penjanja:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:516
msgid "Last Updated on:"
msgstr "Poslednji put ažurirano:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:518
msgid "Longitude:"
msgstr "Geografska dužina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:520
msgid "Latitude:"
msgstr "Geografska širina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:522
msgid "Altitude:"
msgstr "Visina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Lokacija</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Lokacija"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:601
msgid "<b>Location</b>, "
msgstr "<b>Lokacija</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:651
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%d.%Y u %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+msgid "Save Avatar"
+msgstr "Sačuvaj sliku"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+msgid "Unable to save avatar"
+msgstr "Ne mogu da sačuvam sliku"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Lokacija</b> u (datum)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Nalog:"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Nadimak:"
@@ -1306,81 +1625,76 @@ msgid "Client:"
msgstr "Program:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "Prijatelj"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Detalji o prijatelju"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "E-pošta"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "Adresa e-pošte:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
msgstr "Puno ime:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Groups"
msgstr "Grupe"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Identifikator:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Zahtevni su podaci..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "Zahtevni su podaci&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "OS:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
-"Odaberite grupe u kojima želite da se prijatelj nalazi. Primetite da možete "
+"Izaberite grupe u kojima želite da se prijatelj nalazi. Primetite da možete "
"da odaberete i više grupa kao i nijednu."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Izdanje:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Veb adresa:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
+msgstr "Veb stranica:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "Dod_aj grupu"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "novi server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Nalog"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Datum"
@@ -1400,59 +1714,85 @@ msgstr "Traži"
msgid "_For:"
msgstr "_Za:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Pozovi"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "ID prijatelja:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "Ć_askaj"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "ID prijatelja:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Novi razgovor"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "Pošalji _video"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Pozovi"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "Novi poziv"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
msgstr "Proizvoljna poruka..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
msgstr "Uredi proizvoljne poruke..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
-msgstr "Kliknite da uklonite ovaj status iz omiljenih"
+msgstr "Kliknite da uklonite ovu statusnu poruku iz omiljenih"
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
-msgstr "Kliknite da stavite ovaj status kao omiljeni"
+msgstr "Kliknite da stavite ovu statusnu poruku kao omiljenu"
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
-msgstr "Postavi status"
+msgstr "Postavi stanje"
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
-msgstr "Postavi vaše prisustvo i trenutni status"
+msgstr "Postavi vaše prisustvo i trenutno stanje"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messages…"
msgstr "Proizvoljne poruke..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Traži:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Poklopi velika i mala slova"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Izraz nije nađen"
+
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "Primljena je brza poruka"
@@ -1493,11 +1833,11 @@ msgstr "Odlazeći poziv"
msgid "Voice call ended"
msgstr "Poziv je završen"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Unesi proizvoljnu poruku"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Uredi proizvoljne poruke"
@@ -1525,17 +1865,17 @@ msgstr "Čisto"
msgid "Blue"
msgstr "Plavo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Ne mogu da otvorim adresu"
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Izaberite datoteku"
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
-msgstr "Odaberite odredište"
+msgstr "Izaberite odredište"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -1704,77 +2044,36 @@ msgstr "zapadni"
msgid "Vietnamese"
msgstr "vijetnamski"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Prijatelj za prikazivanje u programčetu. Prazno znači da nijedan prijatelj nije "
-"prikazan."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "Slika prijatelja. Prazno znači da prijatelj nema sliku."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megafon"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "Pričaj!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_O programu"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "Podac_i"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Postavke"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Podesite prijatelja."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Izabrani prijatelj ne može da primi datoteke."
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Izaberite prijatelja..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Izabrani prijatelj nije na vezi."
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Prisustvo"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Nema poruka sa greškom"
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Postavite prisustvo"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Brza poruka (Pismonoša)"
-#: ../src/empathy.c:658
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Ne povezuj se po pokretanju"
-#: ../src/empathy.c:662
-msgid "Don't show the contact list on startup"
-msgstr "Ne prikazuj spisak prijatelja po pokretanju"
-
-#: ../src/empathy.c:666
-msgid "Show the accounts dialog"
-msgstr "Prikaži dijalog sa nalozima"
+#: ../src/empathy.c:600
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+"Ne prikazuj spisak prijatelja niti bilo koje drugo prozorče po pokretanju"
-#: ../src/empathy.c:678
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Internet pismonoša za brze poruke"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -1786,7 +2085,7 @@ msgstr ""
"Zadužbina za Slobodni Softver (FSF); bilo verzije 2 te Licence, bilo (po "
"vašem nahođenju) bilo koje novije verzije."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -1798,7 +2097,7 @@ msgstr ""
"PRILAGOĐENOSTI ODREĐENOJ NAMENI. Vidite GNU Opštu Javnu Licencu za više "
"detalja."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -1808,11 +2107,11 @@ msgstr ""
"pismonošu; ako niste, pišite Zadužbini za Slobodni Softver (Free Software "
"Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Gnomov program za brze poruke"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Danilo Šergan <dsegan@gmx.net>\n"
@@ -1824,28 +2123,28 @@ msgstr ""
"\n"
"Prevod.org — prevod na srpski jezik."
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
msgstr "Greška pri uvoženju naloga."
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
msgstr "Greška pri obradi detalja naloga."
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
msgstr "Greška pri pravljenju naloga."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
msgstr "Dogodila se greška."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Poruka greške glasi: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Ispisana poruka greške: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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."
@@ -1853,47 +2152,46 @@ msgstr ""
"Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
"zatvorite asistenta i dodate naloge kasnije iz menija „Izmeni“."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Dogodila se greška"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Novi %s nalog"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Koji tip naloga za ćaskanje imate?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Unesite detalje naloga"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Koji tip naloga za ćaskanje želite da napravite?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Da li želite da napravite još naloga za ćaskanje?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Unesite detalje novog naloga"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -1905,82 +2203,129 @@ msgstr ""
"programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
"audio i video pozive."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Da, uvezi detalje mog naloga iz "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Da, ja ću sam uneti detalje naloga"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Ne, želim novi nalog"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Ne, za sada samo želim da vidim ljude u blizini"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
-msgstr "Odaberite naloge koje želite da uvezete:"
+msgstr "Izaberite naloge koje želite da uvezete:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Da"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Ne, to je sve za sada"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1117
+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 ""
+"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
+"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
+"su detalji ispod tačni. Lako ih možete izmeniti kasnije ili isključiti ovu "
+"mogućnost iz prozorčeta „Nalozi“."
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Izmeni->Nalozi"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Ne, za sada ne želim da koristim ovu mogućnost"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Ne mogu da ćaskam sa ljudima povezanim u vašu lokalnu mrežu jer telepathy-"
+"salut nije instaliran. Ako želite da omogućite ovo, instalirajte telepathy-"
+"salut paket i napravite nalog „Ljudi u okolini“ iz prozorčeta „Nalozi“."
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut nije instaliran"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Dobrodošli u Internet Pismonošu"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Uvezite vaše postojeće naloge"
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Unesite lične podatke"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "Neke izmene naloga %s nisu sačuvane."
+msgid "There are unsaved modifications to your %s account."
+msgstr "Postoje nesačuvane izmene na vašem nalogu %s."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. 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:70
+msgid "Your new account has not been saved yet."
+msgstr "Vaš novi nalog još nije sačuvan."
+
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connecting…"
+msgstr "Povezujem se…"
+
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
-#| msgid "%s on %s"
-msgid "%1$s on %2$s"
-msgstr "%1$s na %2$s"
+msgid "Disconnected — %s"
+msgstr "Veza je prekinuta — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
-msgid "%s Account"
-msgstr "%s nalog"
+msgid "Offline — %s"
+msgstr "Nepovezan — %s"
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "Novi nalog"
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Nepovezan — Nema mrežne konekcije"
+
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "Nepoznato stanje"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Nepovezan — Nalog je onemogućen"
-#: ../src/empathy-accounts-dialog.c:501
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1988,32 +2333,16 @@ msgstr ""
"Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
"Da li sigurno želite da nastavite?"
-#: ../src/empathy-accounts-dialog.c:786
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"Uklonićete nalog %s!\n"
-"Da li želite da nastavite?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg računara?"
-#: ../src/empathy-accounts-dialog.c:791
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Svi pridruženi razgovori i sobe za ćaskanje NEĆE biti uklonjeni ako "
-"nastavite.\n"
-"\n"
-"Ako ikada poželite da vratite nalog, oni će biti dostupni."
+#: ../src/empathy-accounts-dialog.c:1119
+msgid "This will not remove your account on the server."
+msgstr "Ovo neće ukloniti vaš nalog na serveru."
-#: ../src/empathy-accounts-dialog.c:979
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2021,10 +2350,7 @@ msgstr ""
"Ovim ćete izabrati drugi nalog, zanemarivši unete izmene.\n"
"Da li sigurno želite da nastavite?"
-#: ../src/empathy-accounts-dialog.c:1474
-#| msgid ""
-#| "You are about to remove your %s account!\n"
-#| "Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2032,23 +2358,20 @@ msgstr ""
"Ovim ćete zatvoriti prozor, zanemarivši unete izmene.\n"
"Da li sigurno želite da nastavite?"
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "Nalozi"
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Dodaj novi"
-
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "N_apravi"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
msgid "No protocol installed"
msgstr "Nijedan protokol nije instaliran"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2056,110 +2379,232 @@ msgstr ""
"Da biste dodali novi nalog, prvo morate da instalirate priključke za sve "
"protokole koje želite da koristite."
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "Dod_aj..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Napravi novi nalog"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "Isko_risti postojeći nalog"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "Dod_aj&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "nalog"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "Uvez_i&#x2026;"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Osvetljenost"
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Gama"
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Jačina zvuka"
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "Uspostavljam vezu..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Bočna površ"
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Brojčanik"
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Zvučni ulaz"
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Video ulaz"
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Poziv sa korisnikom %s"
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "Poziv"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Povezan — %d:%02dm"
+#: ../src/empathy-call-window.c:1755
+msgid "Technical Details"
+msgstr "Tehnički detalji"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "Program %s ne razume nijedan zvučni format koji podržava vaš računar"
+
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "Program %s ne razume nijedan video format koji podržava vaš računar"
+
+#: ../src/empathy-call-window.c:1804
+#, 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 ""
+"Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
+"ne dozvoljava direktne veze."
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Došlo je do greške u mreži"
+
+#: ../src/empathy-call-window.c:1814
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Zvučni formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Video formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
+
+#: ../src/empathy-call-window.c:1827
+#, 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 ""
+"Nešto neočekivano se desilo u komponenti Telepatije. Prijavite <a href=\"%s"
+"\">ovu grešku</a> i prikačite dnevnike pokupljene iz prozora „Otklanjanje "
+"grešaka“ u meniju „Pomoć“."
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Došlo je do greške u motoru za pozive"
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr "Ne mogu da uspostavim zvučni tok"
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr "Ne mogu da uspostavim video tok"
+
#: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Isklj. kameru"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Uklj. kameru"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Spusti"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Spusti trenutni poziv"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Pregled"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Ponovo zovi"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Pošalji zvuk"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Pošalji video"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Uključi/isključi prenos zvuka"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Pregled videa"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "V_ideo"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Pozovi"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Isklj. video"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Uklj. video"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Pregled videa"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Pregled"
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d nepročitana)"
+msgstr[1] "%s (%d nepročitane)"
+msgstr[2] "%s (%d nepročitanih)"
+
+#: ../src/empathy-chat-window.c:448
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (i %u ostala)"
+msgstr[1] "%s (i %u ostale)"
+msgstr[2] "%s (i %u ostalih)"
+
+#: ../src/empathy-chat-window.c:464
#, c-format
-msgid "Conversations (%d)"
-msgstr "Razgovori (%d)"
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d nepročitana od ostalih)"
+msgstr[1] "%s (%d nepročitane od ostalih)"
+msgstr[2] "%s (%d nepročitanih od ostalih)"
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d nepročitana od svih)"
+msgstr[1] "%s (%d nepročitane od svih)"
+msgstr[2] "%s (%d nepročitanih od svih)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Kuca poruku."
@@ -2168,70 +2613,78 @@ msgid "C_lear"
msgstr "_Očisti"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_Prijatelj"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Ćaskanje"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Ubaci _smešak"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Pozovi _učesnike..."
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Premesti jezičak _levo"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Premesti jezičak _desno"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Prijatelj"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Sadržaj"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Razgovor"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Otkači list"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "Izm_eni"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
msgstr "O_miljena soba za ćaskanje"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Pomoć"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Sledeći list"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "P_rethodni list"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Prikaži _spisak prijatelja"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Listovi"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Ime"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Soba"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Automatsko povezivanje"
@@ -2239,75 +2692,76 @@ msgstr "Automatsko povezivanje"
msgid "Manage Favorite Rooms"
msgstr "Uredi omiljene sobe"
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:339
+msgid "Incoming video call"
+msgstr "Dolazeći video poziv"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Dolazni poziv"
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:343
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s vas zove video pozivom. Želite li da se javite?"
+
+#: ../src/empathy-event-manager.c:344
#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s vas zove, želite li da se javite?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s vas zove. Želite li da se javite?"
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "_Odbaci"
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Javi se"
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "Incoming call from %s"
-msgstr "Dolazni poziv od %s"
+msgid "Incoming video call from %s"
+msgstr "Dolazni video poziv od %s"
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s vam nudi pozivnicu"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "Spoljni program će biti pokrenut za obradu."
-
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "Nemate potrebni spoljni program za obradu."
+msgid "Incoming call from %s"
+msgstr "Dolazni poziv od %s"
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Pozivnice za sobu"
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vas poziva da se pridružite %s"
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "_Odbij"
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Priključi se"
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vas je pozvao(la) da se pridružite %s"
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Dolazni prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "%s vam je uputio(la) zahtev za pretplatu"
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2317,117 +2771,117 @@ msgstr ""
"Poruka: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s nije više na vezi."
#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s je sada na vezi."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Nepoznato"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s od %s u %s/s"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s od %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Primam „%s“ od %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Šaljem „%s“ za %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Greška pri primanju „%s“ od %s"
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Greška pri primanju datoteke"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Greška pri slanju „%s“ za %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Greška pri slanju datoteke"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "„%s“ je primljen od %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr " „%s“ je poslat za %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Prenos datoteke završen"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Čekam na odgovor druge strane"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Proveravam integritet datoteke „%s“"
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Tražim heš datoteke „%s“"
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Datoteka"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Preostalo"
@@ -2452,15 +2906,15 @@ msgid "Import Accounts"
msgstr "Uvezite naloge"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Uvezi"
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Protokol"
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Izvor"
@@ -2469,67 +2923,23 @@ msgstr "Izvor"
msgid "%s account"
msgstr "%s nalog"
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "Izm_eni nalog"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Nije navedena nijedna greška"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Greška u mreži"
+#: ../src/empathy-main-window.c:433
+msgid "Reconnect"
+msgstr "Ponovo se poveži"
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Neuspešna prijava"
+#: ../src/empathy-main-window.c:439
+msgid "Edit Account"
+msgstr "Izmeni nalog"
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Greška pri šifrovanju"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Zatvori"
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Ime je u upotrebi"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Sertifikat nije prosleđen"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Sertifikat nije od poverenja"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Sertifikat je istekao"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Sertifikat nije aktiviran"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Ime domaćina sertifikata se ne poklapa"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Otisak sertifikata se ne poklapa"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Sertifikat je samopotpisan"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Greška u sertifikatu"
-
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Nepoznata greška"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Prijatelj"
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Prikaži i izmeni naloge"
@@ -2557,71 +2967,78 @@ msgstr "Uredi omiljene"
msgid "N_ormal Size"
msgstr "N_ormalna veličina"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Novi po_ziv…"
+
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normalna veličina sa _avatarima"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "_Postavke"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "Prikaži p_rotokole"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sortiraj po ime_nu"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Sortiraj po _stanju"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "N_alozi"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Kompaktna veličina"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "Otklanjanje _grešaka"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
-msgstr "_Prenosi datoteka"
+msgstr "Prenosi _datoteka"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "_Priključi se..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
+msgstr "_Priključi se…"
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "_Novi razgovori..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "Nep_ovezane prijatelji"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "Lični _podaci"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "_Prethodni razgovori"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Soba"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Sobe za ćaskanje"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Članovi"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2633,16 +3050,16 @@ msgstr ""
"Potrebna lozinka: %s\n"
"Članovi: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Ne mogu da pokrenem listanje spiska soba"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Ne mogu da zaustavim listanje spiska soba"
@@ -2709,86 +3126,70 @@ msgid "Language"
msgstr "Jezik"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Dozvoli korišćenje _GPS-a"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Dozvoli korišćenje mobilnog _telefona"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Dozvoli korišćenje _mreže"
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Izgled"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
msgstr "Automatski se pove_ži po pokretanju "
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Ponašanje"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
msgstr "Tema ćaskanja:"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
msgstr "Isključi obaveštenja kada sam odsutan ili zauzet"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
msgstr "Isključi zvukove kada sam odsutan ili zauzet"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Omogući obaveštenja kada ćaskanja nisu u fokusu"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Omogući proveru pravopisa za sledeće jezike:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Opšte"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue podešavanja"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "Lokacija"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Obaveštenja"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Pusti zvuk za događaje"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Postavke"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Privatnost"
-#: ../src/empathy-preferences.ui.h:21
+#: ../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 "
@@ -2797,23 +3198,23 @@ msgstr ""
"Umanjena preciznost lokacije podrazumeva da će najprecizniji podaci o vašoj "
"lokaciji biti grad i država. GPS koordinate će biti tačne do 1. decimale."
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Prikaži slike _smešaka"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Prikaži _spisak prijatelja u sobama"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Zvukovi"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Provera pisanja"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -2821,18 +3222,30 @@ msgstr ""
"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
"rečnike."
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Teme"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Mobilni telefon"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
msgstr "Omogući obav_eštenja u oblačićima"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
msgstr "Omogući zvukovna obav_eštenja"
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Mreža (IP, bežična)"
+
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "_Otvaraj ćaskanja u novim prozorima"
@@ -2845,90 +3258,272 @@ msgstr "Objavi lokaciji mojim _prijateljima"
msgid "_Reduce location accuracy"
msgstr "Umanji _tačnost lokacije"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:176
+msgid "Respond"
+msgstr "Odgovori"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stanje"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "_Izađi"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Ne mogu da pokrenem program servisa %s“: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Pozivnica je ponuđena za servis %s, ali nemate potreban program za obradu."
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Mapa prijatelja"
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "Greška"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "Kritična"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "Poruka"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "Informacija"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "Otklanjanje grešaka"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Sačuvaj"
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Prozor za otklanjanje grešaka"
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Pauza"
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Nivo"
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1331
+msgid "Debug"
+msgstr "Otklanjanje grešaka"
+
+#: ../src/empathy-debug-window.c:1337
+msgid "Info"
+msgstr "Informacija"
+
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Poruka"
+
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Kritična"
+
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Greška"
+
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Vreme"
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Domen"
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Kategorija"
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Nivo"
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
-msgstr "Odabrani upravnik veze nema proširenje za udaljeno otklanjanje grešaka."
+msgstr "Izabrani upravnik veze nema proširenje za udaljeno otklanjanje grešaka."
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Pozovi učesnike"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Ne prikazuj nijedno prozorče; uradi posao koji imaš (npr. uvoženje) i izađi"
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Ne prikazuj nijedno prozorče ukoliko postoje ne-sault nalozi"
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Početno izabiranje datog naloga (npr. gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<identifikacija naloga>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Pismonošini nalozi"
+
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr " Nalozi"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Salut nalog je napravljen"
+
+#~| msgid ""
+#~| "Whether or not the Salut account has been created on the first Empathy "
+#~| "run."
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr ""
+#~ "Da li je Salut nalog napravljen kada je Internet pismonoša prvi put "
+#~ "pokrenut."
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr ""
+#~ "Pokušaj uvoženje svakog prepoznatog naloga i prikaži asistenta ako to ne "
+#~ "uspe"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "Ne mogu da postavim prazan nadimak"
+
+#~ msgid "Hidden"
+#~ msgstr "Sakriven"
+
+#~ msgid "Unsupported command"
+#~ msgstr "Nepodržana komanda"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "_Pogledaj prethodne razgovore"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>Lokacija</b>"
+
+#~ msgid "Email:"
+#~ msgstr "E-pošta"
+
+#~ msgid "C_all"
+#~ msgstr "_Pozovi"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "Uredi proizvoljne poruke..."
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr ""
+#~ "Prijatelj za prikazivanje u programčetu. Prazno znači da nijedan prijatelj "
+#~ "nije prikazan."
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "Slika prijatelja. Prazno znači da prijatelj nema sliku."
+
+#~ msgid "Talk!"
+#~ msgstr "Pričaj!"
+
+#~ msgid "_Information"
+#~ msgstr "Podac_i"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Postavke"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "Podesite prijatelja."
+
+#~ msgid "Select contact..."
+#~ msgstr "Izaberite prijatelja..."
+
+#~ msgid "Presence"
+#~ msgstr "Prisustvo"
+
+#~ msgid "Set your own presence"
+#~ msgstr "Postavite prisustvo"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "Prikaži dijalog sa nalozima"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "Poruka greške glasi: <span style=\"italic\">%s</span>"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Uklonićete nalog %s!\n"
+#~ "Da li želite da nastavite?"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "Svi pridruženi razgovori i sobe za ćaskanje NEĆE biti uklonjeni ako "
+#~ "nastavite.\n"
+#~ "\n"
+#~ "Ako ikada poželite da vratite nalog, oni će biti dostupni."
+
+#~ msgid "Add new"
+#~ msgstr "Dodaj novi"
+
+#~ msgid "Cr_eate"
+#~ msgstr "N_apravi"
+
+#~ msgid "_Add..."
+#~ msgstr "Dod_aj..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "Isko_risti postojeći nalog"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "Razgovori (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "_Prijatelj"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s vam nudi pozivnicu"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "Spoljni program će biti pokrenut za obradu."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "Nemate potrebni spoljni program za obradu."
+
+#~ msgid "No error specified"
+#~ msgstr "Nije navedena nijedna greška"
+
+#~ msgid "Unknown error"
+#~ msgstr "Nepoznata greška"
+
+#~ msgid "_Join..."
+#~ msgstr "_Priključi se..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Novi razgovori..."
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "Dozvoli korišćenje _GPS-a"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "Dozvoli korišćenje mobilnog _telefona"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "Dozvoli korišćenje _mreže"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue podešavanja"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "Ne mogu da pokrenem program servisa %s“: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "Pozivnica je ponuđena za servis %s, ali nemate potreban program za obradu."
diff --git a/po/uk.po b/po/uk.po
index fde8b4da0..6f9a8dea0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-18 06:57+0300\n"
-"PO-Revision-Date: 2009-08-05 06:12+0300\n"
-"Last-Translator: Maxim Dziumanenko <dziumanenko@gmail.com>\n"
+"POT-Creation-Date: 2010-03-11 10:55+0200\n"
+"PO-Revision-Date: 2010-01-30 20:59+0300\n"
+"Last-Translator: Ivan Petruk <petruk.ivan@gmail.com>\n"
"Language-Team: Ukrainian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,7 @@ msgstr "Тема вікна бесіди"
#: ../data/empathy.schemas.in.h:4
msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Список мов, що використовуються при перевірці орфографії, розділених комами "
"(наприклад «en, ru, uk»)."
@@ -66,7 +66,7 @@ msgid "Connection managers should be used"
msgstr "Не слід використовувати менеджери з'єднань"
#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+msgid "Contact list sort criterion"
msgstr "Критерій сортування списку контактів"
#: ../data/empathy.schemas.in.h:8
@@ -158,11 +158,11 @@ msgid "Open new chats in separate windows"
msgstr "Відкривати нові бесіди у новому вікні"
#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Тека для додаткових тем"
+msgid "Path of the Adium theme to use"
+msgstr "Шлях до теми Adium"
#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Шлях до теми Adium для використання у чаті Adium."
#: ../data/empathy.schemas.in.h:31
@@ -194,37 +194,37 @@ msgid "Play a sound when we log out"
msgstr "Відтворити звук при виході"
#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
msgstr "Контекстні сповіщення, коли чат не в фокусі"
#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
msgstr "Контекстні сповіщення, коли контакт реєструється"
#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
msgstr "Контекстні сповіщення, коли контакт відреєструється"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Обліковий рахунок Salut створено"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Показувати аватари"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "Показати список співрозмовників у кімнаті"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "Показувати підтвердження про закриття головного вікна"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "Показувати відсутніх співрозмовників"
+#: ../data/empathy.schemas.in.h:45
+msgid "Show protocols"
+msgstr "Показати протокол:"
+
#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Перевірка правопису для мов"
@@ -254,204 +254,196 @@ msgid "Use theme for chat rooms"
msgstr "Використовувати тему для бесід"
#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Чи вмикати інструменти розробки WebKit, такі як Web Inspector."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Чи показувати місцезнаходження вашим співрозмовникам."
#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Чи показувати місцезнаходження вашим співрозмовникам."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Чи використовувати GPS для визначення місцезнаходження."
#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Чи використовувати GPS для визначення місцезнаходження."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Чи використовувати мобільну мережу для визначення місцезнаходження."
#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Чи використовувати стільникову мережу для визначення місцезнаходження."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Чи використовувати комп'ютерну мережу для визначення місцезнаходження."
#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Чи використовувати мережу для визначення місцезнаходження."
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Чи запитувати про імпорт облікових рахунків з інших програм."
#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Чи запитувати про імпорт облікових рахунків з інших програм."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Автоматично підключати облікові записи при запуску."
#: ../data/empathy.schemas.in.h:59
msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Автоматично підключати облікові записи при запуску."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Чи слід зменшити точність визначення місцезнаходження задля конфіденційності."
#: ../data/empathy.schemas.in.h:60
msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr ""
-"Чи слід зменшити точність визначення місцезнаходження з причини "
-"конфіденційності."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Чи використовувати аватари співрозмовників як значки вікон із бесідами"
#: ../data/empathy.schemas.in.h:61
msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "Чи використовувати атавари співрозмовників як значки вікон із бесідами"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Чи вмикати інструменти розробки WebKit, такі як Web Inspector."
#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
"Чи використовувати менеджер з'єднань для автоматичного встановлення/розриву "
"зв'язку."
#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Створювати обліковий запис Salut під час першого запуску."
-
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
msgstr "Перевіряти набрані слова за списком мов для перевірки орфографії."
-#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#: ../data/empathy.schemas.in.h:64
+msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Перетворювати текстові смайли на графічне представлення."
-#: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/empathy.schemas.in.h:65
+msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Чи відтворювати звуковий сигнал при вході співрозмовника у мережу."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:66
msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
msgstr "Чи відтворювати звуковий сигнал при виході співрозмовника з мережі."
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether to play a sound to notify of events."
msgstr "Чи відтворювати звукові сигнали при подіях."
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether to play a sound to notify of incoming messages."
msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення."
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether to play a sound to notify of new conversations."
msgstr "Чи відтворювати звуковий сигнал для нової бесіди."
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Чи відтворювати звуковий сигнал при відправленні повідомлення."
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether to play a sound when logging into a network."
msgstr "Чи відтворювати звуковий сигнал при вході у мережу."
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether to play a sound when logging out of a network."
msgstr "Чи відтворювати звуковий сигнал при виході з мережі."
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether to play sound notifications when away or busy."
msgstr "Чи відтворювати звукові сигнали у станах «відійшов» або «зайнятий»."
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі."
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether to show a popup notification when a contact goes online."
msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:76
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
msgstr ""
"Чи показувати контекстні сповіщення при надходженні нового повідомлення, "
"коли чат вже відкрито, але він не в фокусі."
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
"Чи показувати контекстні сповіщення при надходженні нового повідомлення."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:78
msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Чи показувати аватари для співрозмовників у списку та вікні чату."
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether to show contacts that are offline in the contact list."
msgstr "Чи показувати недоступних у мережі користувачів у списку контактів."
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether to show popup notifications when away or busy."
msgstr "Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»."
+#: ../data/empathy.schemas.in.h:81
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Чи показувати аватари для співрозмовників у списку та вікні чату."
+
#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+msgid "Whether to show the contact list in chat rooms."
msgstr "Чи показувати список контактів у кімнаті."
#: ../data/empathy.schemas.in.h:83
+msgid "Whether to show the contact list in compact mode."
+msgstr "Показувати список контактів стисненим або ні."
+
+#: ../data/empathy.schemas.in.h:84
msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
msgstr ""
"Чи показувати повідомлення про закриття головного вікна кнопкою 'х' у "
"заголовку."
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Показувати список контактів стисненим або ні."
-
#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Whether to use the theme for chat rooms."
msgstr "Використовувати теми для вікон бесід чи ні."
#: ../data/empathy.schemas.in.h:86
msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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» список буде "
"впорядковано на статусом."
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "Не можна встановлювати порожню назву дисплею"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Керування обліковими записами повідомлень та VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
+msgid "Messaging and VoIP Accounts"
+msgstr "Облікові записи повідомлень та VoIP"
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "Хеш отриманого файлу та надісланий хеш оригіналу не збігаються"
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "Передача файлів не працює для віддалених співрозмовників"
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "Обраний файл не є звичайним файлом"
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "Обраний файл пустий"
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "Люди поблизу"
@@ -483,39 +475,95 @@ msgstr "Помилка при спробі передати файл"
msgid "The other participant is unable to transfer the file"
msgstr "Інший учасник не може передати файл"
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
msgid "Unknown reason"
msgstr "Невідома причина"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
msgid "Available"
msgstr "Доступний"
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
msgid "Busy"
msgstr "Зайнятий"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
msgid "Away"
msgstr "Відійшов"
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "Прихований"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Невидимий"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
msgid "Offline"
msgstr "Не у мережі"
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "Причину не вказано"
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "Встановлено статус «не у мережі»"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "Помилка мережі"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "Аутентифікація завершилась невдало"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "Помилка шифрування"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "Ім'я вже використовується"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "Сертифікат недоступний"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "Сертифікат не має довіри"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "Сертифіката застарів"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "Сертифікат не активовано"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "Сертифікат з помилкою у назві вузла"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "Відбитки сертифікатів не збігаються"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "Самопідписаний сертифікат"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "Помилка сертифікату"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
msgid "People Nearby"
msgstr "Люди поблизу"
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:434
msgid "Yahoo! Japan"
msgstr "Yahoo японія"
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:435
msgid "Facebook Chat"
msgstr "Час Facebook"
@@ -571,23 +619,68 @@ msgstr[2] "%d місяців тому"
msgid "in the future"
msgstr "в майбутньому"
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:462
msgid "All"
msgstr "Усі"
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "Ім'я користувача:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
+msgid "L_og in"
+msgstr "_Увійти"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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-account-widget.c:1553
msgid "Enabled"
msgstr "Увімкнено"
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+msgid "This account already exists on the server"
+msgstr "Цей обліковий запис вже існує на сервері"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "Створити новий обліковий запис на сервері"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * 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:2013
+#, 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:2039
+#, c-format
+msgid "%s Account"
+msgstr "Обліковий запис %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2043
+msgid "New account"
+msgstr "Новий обліковий запис"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> MyScreenName</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Приклад:</b> MyScreenName"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -606,7 +699,7 @@ msgstr "Додатково"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "_Пароль:"
@@ -626,7 +719,7 @@ msgstr "Пароль облікового запису AIM?"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
@@ -635,7 +728,7 @@ msgstr "П_орт:"
#: ../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:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -644,8 +737,8 @@ msgstr "_Сервер:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> username</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>Приклад:</b> username"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -662,8 +755,8 @@ msgid "What is your GroupWise password?"
msgstr "Пароль вашого GroupWise?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Приклад:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
@@ -679,15 +772,48 @@ msgstr "Пароль у ICQ?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+msgid "_Character set:"
msgstr "_Кодування:"
#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Нова мережа"
+#: ../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:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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: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:227
+msgid "Options"
+msgstr "Параметри"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "Немає"
+
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
msgstr "Кодування:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -719,12 +845,12 @@ msgid "Servers"
msgstr "Сервери"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> user@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Приклад:</b> user@gmail.com"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> user@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Приклад:</b> user@jabber.org"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "Override server settings"
@@ -739,55 +865,75 @@ msgid "Reso_urce:"
msgstr "Ре_сурс:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+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 ""
+"Це ваше облікове ім'я, а не обліковий запис Facebook.\n"
+"Якщо ви facebook.com/<b>badger</b>, введіть <b>badger</b>.\n"
+"Використовуйте <a href=\"http://www.facebook.com/username/\">цю сторінку</a> для вибору імені "
+"Facebook, якщо у вас його немає."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Use old SS_L"
msgstr "Використовувати старе _шифрування (SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "Пароль у Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "Ім'я користувача у Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "What is your Google ID?"
msgstr "Ваш ідентифікатор уGoogle?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Google password?"
msgstr "Пароль у Google"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Jabber ID?"
msgstr "Ідентифікатор Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Jabber password?"
msgstr "Пароль у Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your desired Jabber ID?"
msgstr "Бажаний ідентифікатор у Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your desired Jabber password?"
msgstr "Бажаний пароль у Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "_Encryption required (TLS/SSL)"
msgstr "_Шифрування обов'язкове (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "_Ignore SSL certificate errors"
msgstr "_Ігнорувати помилки сертифікатів SSL"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> user@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Приклад:</b> user@hotmail.com"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "Пароль у Windows Live?"
+msgid "What is your Windows Live ID?"
+msgstr "Ідетифікатор у Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Ім'я користувача у Windows Live?"
+msgid "What is your Windows Live password?"
+msgstr "Пароль у Windows Live?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
+msgid "_E-mail address:"
msgstr "_Електронна пошта:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
@@ -811,37 +957,118 @@ msgid "_Published Name:"
msgstr "_Ім'я (для співрозмовників):"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>Приклад:</b> user@my.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Приклад:</b> user@my.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "Ім'я для аутентифікації:"
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "Знайти STUN"
+msgid "Discover Binding"
+msgstr "Виявляти з'єднання"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "Відкрийте для себе сервер STUN автоматично"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Hostname of the proxy for outbound requests."
+msgstr "Хост та проксі для вихідних запитів."
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "Порт STUN:"
+msgid "Interval (seconds)"
+msgstr "Інтервал (у секундах)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Опції"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr "Подивіться записи DNS SRV в домені служби на ім'я хоста сервера STUN."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Loose Routing"
+msgstr "Вільна маршрутизація"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Mechanism:"
+msgstr "Механізм:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "Інші опції"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "Опції NAT Traversal"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Port of the proxy for outbound requests."
+msgstr "Порт проксі для вихідних запитів."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Опції проксі"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+"Ім'я користувача для аутентифікації SIP, якщо вони відрізняються від SIP "
+"користувача"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "Transport:"
+msgstr "Транспорт"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+"Оновити реєстрації обов'язковим, якщо зовнішній адреса клієнта виявлено, "
+"будуть відрізнятися від місцевих обов'язковим."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+"Використовувати вільну маршрутизацію та заголовок маршруту, як рекомендується "
+"у RFC 3261."
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
msgid "What is your SIP account password?"
msgstr "Пароль до облікового запису у SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
msgid "What is your SIP login ID?"
msgstr "Ідентифікатор облікового запису у SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
msgid "_Username:"
msgstr "_Ім'я користувача:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Використовувати _Yahoo японія"
+msgid "Use _Yahoo! Japan"
+msgstr "Використовувати _Yahoo! Japan"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "What is your Yahoo! ID?"
@@ -852,11 +1079,11 @@ msgid "What is your Yahoo! password?"
msgstr "Пароль у Yahoo!?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
msgstr "_Ігнорувати запрошення до бесід та конференцій"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -869,94 +1096,171 @@ msgid "Couldn't convert image"
msgstr "Не можу конвертувати зображення"
#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+msgid "None of the accepted image formats are supported on your system"
msgstr "Ваша система не підтримує жодного відомого формату зображень"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
msgid "Select Your Avatar Image"
msgstr "Виберіть зображення Вашого аватару"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
msgid "No Image"
msgstr "Немає зображення"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
msgid "Images"
msgstr "Зображення"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
msgid "All Files"
msgstr "Усі файли"
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
msgid "Click to enlarge"
msgstr "Клацніть для збільшення"
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "Провалилися спроби знов підключитися до цього чату"
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "Команда не підтримується"
+#: ../libempathy-gtk/empathy-chat.c:655
+msgid "Failed to join chat room"
+msgstr "Не вдається приєднатися до кімнати розмов"
+
+#: ../libempathy-gtk/empathy-chat.c:673
+msgid "Failed to open private chat"
+msgstr "Не вдається відкрити приватну кумнату"
+
+#: ../libempathy-gtk/empathy-chat.c:712
+msgid "Topic not supported on this conversation"
+msgstr "Тема не підтримується у цій бесіді"
+
+#: ../libempathy-gtk/empathy-chat.c:718
+msgid "You are not allowed to change the topic"
+msgstr "У вас немає прав змінювати тему"
+
+#: ../libempathy-gtk/empathy-chat.c:847
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: очистити всі повідомлення з поточної бесіди"
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:850
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>: встановити тему поточної бесіди"
+
+#: ../libempathy-gtk/empathy-chat.c:853
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chat room ID>: приєднатися до нової кімнати розмов"
+
+#: ../libempathy-gtk/empathy-chat.c:856
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chat room ID>: приєднатися до нової кімнати розмов"
+
+#: ../libempathy-gtk/empathy-chat.c:859
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact ID> [<message>]: відкрити приватну бесіду"
+
+#: ../libempathy-gtk/empathy-chat.c:862
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact ID> <message>: відкрити приватну бесіду"
+
+#: ../libempathy-gtk/empathy-chat.c:865
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>: змінити назву на поточному сервері"
+
+#: ../libempathy-gtk/empathy-chat.c:868
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>: відправити повідомлення ACTION до поточної бесіди"
+
+#: ../libempathy-gtk/empathy-chat.c:871
+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>: надіслати <message> до поточної бесіди. це використовується для надсилання "
+"нового повідомлення, що починається з '/'. Наприклад: \"/скажіть /join щоб приєднатись до нової кімнати розмов\""
+
+#: ../libempathy-gtk/empathy-chat.c:876
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<command>]: показати довідку.Якщо визначено <command>, показати синтакси команди."
+
+#: ../libempathy-gtk/empathy-chat.c:886
+#, c-format
+msgid "Usage: %s"
+msgstr "Використання: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:915
+msgid "Unknown command"
+msgstr "Невідома команда"
+
+#: ../libempathy-gtk/empathy-chat.c:1036
+msgid "Unknown command; see /help for the available commands"
+msgstr "Невідома команда; для виводу списку доступних команд введіть /help"
+
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "не у мережі"
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "неправильний контакт"
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "відмовлено у доступі"
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "надто довге повідомлення"
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "не реалізовано"
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "невідомо"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Помилка при надсиланні повідмолення «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "Тема: %s"
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "Тему не встановлено"
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(Нема пропозицій)"
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "Вставити посмішку"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "_Надіслати"
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "_Пропозиції з правопису"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "Не вдається отримати останні журнали"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s від'єднано"
@@ -964,12 +1268,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s був викинутий користувачем %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s був викинутий"
@@ -977,17 +1281,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s був заблокований користувачем %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s вуб заблокований"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s покинув бесіду"
@@ -997,61 +1301,81 @@ msgstr "%s покинув бесіду"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s приєднався до бесіди"
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1285
+#: ../libempathy-gtk/empathy-chat.c:2044
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s тепер відомий як %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "Від'єднаний"
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2701
+msgid "Wrong password; please try again:"
+msgstr "Неправильний пароль; введіть пароль ще раз:"
+
+#: ../libempathy-gtk/empathy-chat.c:2702
+msgid "Retry"
+msgstr "Повторити"
+
+#: ../libempathy-gtk/empathy-chat.c:2707
+msgid "This room is protected by a password:"
+msgstr "Цю кімнату захищено паролем:"
+
+#: ../libempathy-gtk/empathy-chat.c:2708
+msgid "Join"
+msgstr "Увійти"
+
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "З'єднаний"
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "Бесіда"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
msgid "Topic:"
msgstr "Тема:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "_Копіювати адресу посилання"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "_Відкрити посилання"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
msgid "Edit Contact Information"
msgstr "Редагувати інформацію про співрозмовника"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
msgid "Personal Information"
msgstr "Особиста інформація"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
msgid "New Contact"
msgstr "Новий контакт"
@@ -1063,219 +1387,216 @@ msgstr "_Вирішити пізніше"
msgid "Subscription Request"
msgstr "Запис на підписку"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Хочете видалити групу «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
msgid "Removing group"
msgstr "Видалення групи"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1463
-#: ../libempathy-gtk/empathy-contact-list-view.c:1540
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "В_идалити"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Хочете видалити контакт «%s» з вашого списку?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
msgid "Removing contact"
msgstr "Видалення контакту"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
-msgstr "_Додати контакт..."
+#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Додати контакт…"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Розмова"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Голосовий виклик"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Відео виклик"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "Перегляд попередніх _бесід"
+#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Переглянути _попередні бесіди"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "Надіслати файл"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "Спільний доступ до мого робочого столу"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "Інфор_мація"
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:459
+msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Правка"
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:513
+#: ../src/empathy-chat-window.c:865
+msgid "Inviting you to this room"
msgstr "Запрошення до цієї кімнати"
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+msgid "_Invite to chat room"
msgstr "_Запросити до кімнати"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Обрати контакт"
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Зберегти аватар"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Неможливо зберегти аватар"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "Вибрати"
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:245
+#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "Група"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "ISO код країни:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "Країна:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "Регіон:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "Місто:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "Район:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "Індекс:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "Вулиця:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "Дім:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "Квартира:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "Кімната:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "Текст:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "Опис:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "Адреса (URI):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "Рівень точності:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "Помилка:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Вертикальна помилка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Горизонтальна помилка (метри):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "Швидкість:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "Азимут:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "Швидкість підйому:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "Останнє оновлення о:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "Довгота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "Широта:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "Висота:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Місцезнаходження</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Місцезнаходження"
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>Місцезнаходження</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y у %R UTC"
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+msgid "Save Avatar"
+msgstr "Зберегти аватар"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+msgid "Unable to save avatar"
+msgstr "Неможливо зберегти аватар"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>Місцезнаходження</b> у (дата)\t"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Обліковий запис:"
-
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "Псевдонім:"
@@ -1293,40 +1614,35 @@ msgid "Client:"
msgstr "Програма:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "Співрозмовник"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
msgid "Contact Details"
msgstr "Підробиці про співрозмовника"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "Адреса ел. пошти:"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Електронна пошта:"
+msgid "Full name:"
+msgstr "Повне ім'я:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "Повна назва:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "Groups"
msgstr "Група"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid "Identifier:"
msgstr "Ідентифікатор:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Інформацію запрошено..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "Інформацію запитано&#x2026;"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "OS:"
msgstr "ОС:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
@@ -1334,40 +1650,40 @@ msgstr ""
"Виберіть групи, у яких має з'явитися контакт. Можна обрати більше ніж одну "
"групу або не обирати зовсім."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
msgid "Version:"
msgstr "Версія:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Сайт:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
+msgstr "Веб-сайт:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "_Add Group"
msgstr "_Додати групу"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "новий сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Сервер"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Порт"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "Шифрування SSL"
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:302
+#: ../libempathy-gtk/empathy-log-window.c:700
+#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "Обліковий запис"
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "Дата"
@@ -1387,58 +1703,84 @@ msgstr "Пошук"
msgid "_For:"
msgstr "_Для:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Подзвонити"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "Ідентифікатор контакту:"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
msgid "C_hat"
msgstr "_Розмова"
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "Ідентифікатор контакту:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
msgid "New Conversation"
msgstr "Нова бесіда"
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "Надіслати _відео"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "_Виклик"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "Новий Виклик"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
-msgstr "Типові повідомлення..."
-
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
-msgstr "Редагувати типові повідомлення..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
+msgstr "Інше повідомлення…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
+msgstr "Редагувати інші повідомлення…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "Клацніть, щоб прибрати статут \"улюблений\""
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "Клацніть, щоб встановити статут \"улюблений\""
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "Встановити стан"
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "Встановіть Вашу наявність та поточний стан"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
-msgstr "Типові повідомлення..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messages…"
+msgstr "Власні повідомлення…"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Знайти:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Збігається регістр"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Фразу не знайдено"
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
@@ -1480,11 +1822,11 @@ msgstr "Вихідний голосовий виклик"
msgid "Voice call ended"
msgstr "Голосовий виклик закінчено"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
msgstr "Вставити типове повідомлення"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
msgstr "Редагувати типові повідомлення..."
@@ -1512,15 +1854,15 @@ msgstr "Ясна"
msgid "Blue"
msgstr "Блакитна"
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "Неможливо відкрити URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "Обрати файл"
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "Обрати призначення"
@@ -1691,78 +2033,35 @@ msgstr "Західна"
msgid "Vietnamese"
msgstr "В'єтнамська"
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Співрозмовник для показу у аплеті. Відсутність значення означає - не "
-"відображати контакт."
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr ""
-"Аватар співрозмовника. Відсутність значення означає - не відображати аватар."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "Обраний контакт не отримує файли."
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megaphone"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "Обраний файл не у мережі"
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:522
-msgid "Talk!"
-msgstr "Talk!"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Немає повідомлення про помилку"
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_Про аплет"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "Миттєєві повідомлення (Empathy)"
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Інформація"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Параметри"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "Налаштуйте контакт, будь ласка."
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "Вибрати контакт..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Присутність"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "Встановити стан"
-
-#: ../src/empathy.c:742
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "Не з'єднуватися під час запуску"
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
-msgstr "Не показувати список співрозмовників під час запуску"
-
-#: ../src/empathy.c:750
-msgid "Show the accounts dialog"
-msgstr "Показати діалог налаштовування облікових записів"
+#: ../src/empathy.c:600
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Не показувати список співрозмовників чи інші вікна під час запуску"
-#: ../src/empathy.c:762
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- клієнт миттєвих повідомлень Empathy"
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
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 "
@@ -1774,7 +2073,7 @@ msgstr ""
"вільного програмного забезпечення, або версії 2 Ліцензії, або (на ваш "
"розсуд) будь-якої старшої версії."
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
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 "
@@ -1785,7 +2084,7 @@ msgstr ""
"БУДЬ-ЯКИХ ГАРАНТІЙ; навіть не гарантується ПРИДАТНІСТЬ та ВІДПОВІДНІСТЬ БУДЬ-"
"ЯКИМ ВИМОГАМ. Докладніше про це дивіться GNU General Public License."
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
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 "
@@ -1795,194 +2094,240 @@ msgstr ""
"якщо це не так, напишіть до Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
msgid "An Instant Messaging client for GNOME"
msgstr "Програма для швидкого обміну повідомленнями для GNOME"
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
"Сергій Довгополов <virgo@gnome.org.ua>\n"
"Максим Дзюманенко <dziumanenko@gmail.com>\n"
"Сергій Панасенко <nitay@users.sourceforge.net>"
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
msgstr "Помилка при імпорті облікових рахунків"
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
msgstr "Помилка при розборі даних облікових рахунків."
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
msgstr "Помилка при створенні облікових рахунків."
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
msgstr "Виникла помилка."
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Повідомлення про помилку: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Повідомлення про помилку: %s"
-#: ../src/empathy-account-assistant.c:149
+#: ../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 ""
-"ВИ можете або повернутись назад та спробувати ввести дані вашого облікового рахунку або "
-"завершити помічника та додати облікові рахунки потім у меню Правка."
+"ВИ можете або повернутись назад та спробувати ввести дані вашого облікового "
+"рахунку або завершити помічника та додати облікові рахунки потім у меню "
+"Правка."
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "Виникла помилка"
-#. Create account
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "Новий обліковий рахунок %s"
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "Який тип облікового рахунку для чату ви маєте?"
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Маєте будь-який інший обліковий рахунок чату, який треба налаштувати?"
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "Введіть параметри облікового рахунку"
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "Який тип облікового рахунку для чату створити?"
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "Маєте будь-які інші облікові рахунки чату?"
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "Введіть параметри нового облікового рахунку"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:653
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 ""
-"Empathy підтримує чат зі іншими особами у онлайн та з брузями і колегами "
-"які користуються Google Talk, AIM, Windows Live та багатьма іншими програмами для чату. "
-"Якщо у вас є мікрофон чи веб-камера, ви також можете робити голосові та відео дзвінки."
+"Empathy підтримує чат зі іншими особами у онлайн та з брузями і колегами які "
+"користуються Google Talk, AIM, Windows Live та багатьма іншими програмами "
+"для чату. Якщо у вас є мікрофон чи веб-камера, ви також можете робити "
+"голосові та відео дзвінки."
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
-msgstr "У вас є обліковий рахунок, яки ви використовувати з іншою чат-програмою?"
+msgstr ""
+"У вас є обліковий рахунок, яки ви використовувати з іншою чат-програмою?"
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "Так, імпортувати параметри облікового рахунку з "
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "Так, я введу параметри рахунку вручну"
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "Ні, я хочу створити новий рахунок"
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "Ні, я просто хочу бачити людей, які у онлайні поблизу"
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "Виберіть обліковий запис для імпорту:"
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:851
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "Так"
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "Ні, наразі досить"
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1117
+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 може автоматично знайти людей, приєднаних до тієї ж мережі, що й "
+"ви. Якщо ви хочете використовувати цю можливість, відмітьте, що наведена нижче інформація є "
+"коректною. Ви можете змінити цю інформацію "
+"пізніше або вимкнути цю можливість, використовуючи діалогове вікно «Облікові "
+"записи»."
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "Правка->Облікові записи"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "Ні, я не хочу зараз вмикати цю функцію"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+"Ви не можете спілкуватися з людьми, приєднаними до вашої локальної мережі, оскільки "
+"не встановлено telepathy-salut. Якщо вам потрібна ця можливість, "
+"встановіть пакет telepathy-salut та створіть обліковий запис «Люди поблизу» "
+"у діалоговому вікні «Облікові записи»"
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "не встановлено telepathy-salut"
+
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "Ласкаво просило до Empathy"
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "Імпортувати існуючі редагувати облікові записи"
+#: ../src/empathy-account-assistant.c:1285
+msgid "Please enter personal details"
+msgstr "Введіть персональну інформацію"
+
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "Є незбережені зміни у вашому обліковому рахункув %s."
+msgid "There are unsaved modifications to your %s account."
+msgstr "Є незбережені зміни у вашому обліковому рахунку %s."
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. 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:70
+msgid "Your new account has not been saved yet."
+msgstr "Новий обліковий рахунок ще не було збережено."
+
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connecting…"
+msgstr "З'єднання…"
+
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s на %2$s"
+msgid "Disconnected — %s"
+msgstr "Від'єднаний — %s"
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
-msgid "%s Account"
-msgstr "Обліковий запис %s"
+msgid "Offline — %s"
+msgstr "Не у мережі — %s"
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "Новий обліковий запис"
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline — No Network Connection"
+msgstr "Не у мережі — Немає з'єднання з мережею"
+
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "Невідомий статус"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline — Account Disabled"
+msgstr "Не у мережі — Обліковий запис вимкнено"
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-msgstr "Ви намагаєтесь створити новий обліковий рахунок, що призведе до\n"
+msgstr ""
+"Ви намагаєтесь створити новий обліковий рахунок, що призведе до\n"
"відкидання змін. Дійсно хочете продовжити?"
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr "Ви знищуете свій обліковий запис «%s»! Продовжити?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "Хочете видалити «%s» з комп'ютера'?"
-#: ../src/empathy-accounts-dialog.c:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Будь-які пов'язані бесіди та кімнати НЕ БУДУТЬ знищені, якщо ви продовжите.\n"
-"Якщо ви вирішите відновити цей обліковий запис пізніше, вони знову стануть "
-"доступні."
+#: ../src/empathy-accounts-dialog.c:1119
+msgid "This will not remove your account on the server."
+msgstr "Це не призведе до видалення облікового запису на сервері."
-#: ../src/empathy-accounts-dialog.c:980
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1990,7 +2335,7 @@ msgstr ""
"Ви намагаєтесь обрати інший обліковий запис, що призведе до \n"
"відкидання змін. Ви дійсно хочете продовжити?"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -1999,22 +2344,14 @@ msgstr ""
"відкидання змін. Ви дійсно хочете продовжити?"
#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Облікові записи"
+msgid "No protocol installed"
+msgstr "Немає встановлених протоколів"
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "Додати новий"
+msgid "Protocol:"
+msgstr "Протокол:"
#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "_Створити"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "Немає встановлених протоколів"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -2022,111 +2359,238 @@ msgstr ""
"Щоб додати новий обліковий запис, встановіть підтримку кожного необхідного "
"протоколу."
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "_Додати ..."
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "_Створити новий обліковий запис"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "_Показати та редагувати облікові записи"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add&#x2026;"
+msgstr "_Додати&#x2026;"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "обліковий разхунок"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import&#x2026;"
+msgstr "_Імпортувати&#x2026;"
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-call-window.c:453
msgid "Contrast"
msgstr "Контраст"
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-call-window.c:456
msgid "Brightness"
msgstr "Яскравість"
-#: ../src/empathy-call-window.c:433
+#: ../src/empathy-call-window.c:459
msgid "Gamma"
msgstr "Гамма"
-#: ../src/empathy-call-window.c:541
+#: ../src/empathy-call-window.c:567
msgid "Volume"
msgstr "Гучність"
-#: ../src/empathy-call-window.c:674
-msgid "Connecting..."
-msgstr "З'єднання..."
-
-#: ../src/empathy-call-window.c:781
+#: ../src/empathy-call-window.c:1022
msgid "_Sidebar"
msgstr "_Контур"
-#: ../src/empathy-call-window.c:800
+#: ../src/empathy-call-window.c:1041
msgid "Dialpad"
msgstr "Табло набору номеру"
-#: ../src/empathy-call-window.c:806
+#: ../src/empathy-call-window.c:1047
msgid "Audio input"
msgstr "Звуковий вхід"
-#: ../src/empathy-call-window.c:810
+#: ../src/empathy-call-window.c:1051
msgid "Video input"
msgstr "Відеовхід"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:873
+#: ../src/empathy-call-window.c:1116
#, c-format
msgid "Call with %s"
msgstr "Дзвонити з %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:944
+#: ../src/empathy-call-window.c:1197
msgid "Call"
msgstr "_Виклик"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1445
+#: ../src/empathy-call-window.c:1694
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Підключений — %d:%02d мин"
+#: ../src/empathy-call-window.c:1755
+msgid "Technical Details"
+msgstr "Технічні подробиці"
+
+#: ../src/empathy-call-window.c:1793
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"Програмне забезпечення %s не розуміє формати звуку, що підтримуються вашим "
+"комп'ютером"
+
+#: ../src/empathy-call-window.c:1798
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"Програмне забезпечення %s не розуміє відеоформати, що підтримуються вашим "
+"комп'ютером"
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Не вдається встановити з'єднання з %s. Один з вас може знаходитися у мережі, "
+"яка не підтримує прямі з'єднання."
+
+#: ../src/empathy-call-window.c:1810
+msgid "There was a failure on the network"
+msgstr "Помилка мережі"
+
+#: ../src/empathy-call-window.c:1814
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Формати аудіо, що потрібні для цього виклику, не встановлено на вашому "
+"комп'ютері"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Видеоформати, що потрібні для цього виклику, не встановлено на вашому "
+"комп'ютері"
+
+#: ../src/empathy-call-window.c:1827
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Щось трапилось з компонентом Telepathy. <a href=\"%s"
+"\">Повідомте про цю помилку</a> та прикріпіть журнали, зібрані з вікна "
+"налагодження у меню «Довідка»."
+
+#: ../src/empathy-call-window.c:1835
+msgid "There was a failure in the call engine"
+msgstr "Помилка у механізмі виклику"
+
+#: ../src/empathy-call-window.c:1874
+msgid "Can't establish audio stream"
+msgstr "Не вдається встановити аудіопотік"
+
+#: ../src/empathy-call-window.c:1884
+msgid "Can't establish video stream"
+msgstr "Не вдається встановити відеопотік"
+
#: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "Викликати контакт знову"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "Вимкнути камеру"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "Увімкнути камеру"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "Вимкнути камеру та зупинити передачу відео"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "Увімкнути камеру та передавати відео"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "Увімкнути камеру але не передавати відео"
+
+#: ../src/empathy-call-window.ui.h:7
msgid "Hang up"
msgstr "Розірвати зв'язок"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "Завершити поточний дзвінок"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "Попередній перегляд"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Redial"
msgstr "Повторно набрати номер"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
msgid "Send Audio"
msgstr "Надіслати звук"
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Надіслати відео"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Вимкнути передачу звуку"
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Перегляд власного відео"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "_Відео"
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Виклик"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "Вимкнути відео"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "Увімкнути відео"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
+msgstr "Попередній перегляд відео"
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Перегляд"
-#: ../src/empathy-chat-window.c:349
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d непрочитане)"
+msgstr[1] "%s (%d непрочитаних)"
+msgstr[2] "%s (%d непрочитані)"
+
+#: ../src/empathy-chat-window.c:448
#, c-format
-msgid "Conversations (%d)"
-msgstr "Бесіди (%d)"
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (та %u інше)"
+msgstr[1] "%s (та %u інших)"
+msgstr[2] "%s (та %u інших)"
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d непрочитане від інших)"
+msgstr[1] "%s (%d непрочитаних від інших)"
+msgstr[2] "%s (%d непрочитаний від інших)"
+
+#: ../src/empathy-chat-window.c:473
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d непрочитане від усіх)"
+msgstr[1] "%s (%d непрочитаних від усіх)"
+msgstr[2] "%s (%d непрочитаний від усіх)"
+
+#: ../src/empathy-chat-window.c:684
msgid "Typing a message."
msgstr "Набирає повідомлення."
@@ -2135,70 +2599,78 @@ msgid "C_lear"
msgstr "О_чистити"
#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "_Співрозмовник"
+
+#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
msgstr "Розмова"
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "Вставити _посмішку"
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Запросити _учасника…"
+
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Перемістити закладку _ліворуч"
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Перемістити закладку _праворуч"
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Співрозмовники"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Зміст"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Conversation"
msgstr "_Бесіда"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Detach Tab"
msgstr "_Відокремити закладку"
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
msgstr "_Улюблена кімната"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Довідка"
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Next Tab"
msgstr "_Наступна закладка"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Previous Tab"
msgstr "_Попередня закладка"
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "Показати _список співрозмовників"
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
msgid "_Tabs"
msgstr "_Закладки"
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
msgid "Name"
msgstr "Ім'я:"
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
msgid "Room"
msgstr "Кімната"
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
msgid "Auto-Connect"
msgstr "Автоматичне з'єднання"
@@ -2206,75 +2678,76 @@ msgstr "Автоматичне з'єднання"
msgid "Manage Favorite Rooms"
msgstr "Керування улюбленими кімнатами"
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:339
+msgid "Incoming video call"
+msgstr "Вхідний відео виклик"
+
+#: ../src/empathy-event-manager.c:339
msgid "Incoming call"
msgstr "Вхідний виклик"
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:343
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "Відеодзвінок від %s, хочете відповісти?"
+
+#: ../src/empathy-event-manager.c:344
#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s викликає вас, хочете відповісти?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "Дзвінок від %s, хочете відповісти?"
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:366
msgid "_Reject"
msgstr "Від_хилити"
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:372
msgid "_Answer"
msgstr "_Відповісти"
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "Incoming call from %s"
-msgstr "Вхідний виклик від %s"
+msgid "Incoming video call from %s"
+msgstr "Вхідний відеовиклик від %s"
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:489
#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s прислав Вам запрошення"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "Щоб його прийняти буде запущено зовнішню програму."
-
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "У Вас відсутня програма, щоб його обробити."
+msgid "Incoming call from %s"
+msgstr "Вхідний виклик від %s"
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:579
msgid "Room invitation"
msgstr "Кімната запрошення"
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:582
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s запрошує Вас ввійти у %s"
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:590
msgid "_Decline"
msgstr "Від_хилити"
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:595
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Увійти"
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:634
#, c-format
msgid "%s invited you to join %s"
msgstr "%s запросив Вас ввійти у %s"
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:660
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Вхідний передача файлу від %s"
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:818
#, c-format
msgid "Subscription requested by %s"
msgstr "Запит на підписку від %s"
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:822
#, c-format
msgid ""
"\n"
@@ -2284,117 +2757,117 @@ msgstr ""
"Повідомлення: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:862
#, c-format
msgid "%s is now offline."
msgstr "%s не у мережі."
#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:878
#, c-format
msgid "%s is now online."
msgstr "%s у мережі."
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../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:104
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Невідомо"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
msgstr "%s з %s у %s/с"
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s з %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Приймається \"%s\" від %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Відправляється \"%s\" до %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "Помилка приймання \"%s\" від %s"
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "Помилка прийому файлу"
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "Помилка відправлення \"%s\" до %s"
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr "Помилка відправлення файлу"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr "\"%s\" надійшов від %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "\"%s\" надіслано до %s"
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "Передачу файлу завершено"
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
msgid "Waiting for the other participant's response"
msgstr "Почекати, поки інший учасник відповість"
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "Перевірка цілісності \"%s\""
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "Хешування \"%s\""
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
msgid "File"
msgstr "Файл"
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
msgid "Remaining"
msgstr "Лишаємось"
@@ -2419,15 +2892,15 @@ msgid "Import Accounts"
msgstr "Імпорт облікових записів"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:282
+#: ../src/empathy-import-widget.c:290
msgid "Import"
msgstr "Імпорт:"
-#: ../src/empathy-import-widget.c:291
+#: ../src/empathy-import-widget.c:299
msgid "Protocol"
msgstr "Протокол:"
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:323
msgid "Source"
msgstr "Джерело"
@@ -2436,67 +2909,23 @@ msgstr "Джерело"
msgid "%s account"
msgstr "обліковий рахунок %s"
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "Редагування облікового _запису"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "Помилку не вказано"
+#: ../src/empathy-main-window.c:433
+msgid "Reconnect"
+msgstr "Перез'єднати"
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "Помилка мережі"
+#: ../src/empathy-main-window.c:439
+msgid "Edit Account"
+msgstr "Редагування облікового запису"
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "Аутентифікація завершилась невдало"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "Помилка шифрування"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "Ім'я вже використовується"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "Сертифікат недоступний"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "Сертифікат не має довіри"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "Сертифіката застарів"
+#: ../src/empathy-main-window.c:445
+msgid "Close"
+msgstr "Закрити"
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "Сертифікат не активовано"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "Сертифікат з помилкою у назві вузла"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "Відбитки сертифікатів не збігаються"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "Самопідписаний сертифікат"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "Помилка сертифікату"
-
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "Невідома помилка"
+#: ../src/empathy-main-window.c:1028
+msgid "Contact"
+msgstr "Співрозмовник"
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1369
msgid "Show and edit accounts"
msgstr "Показати та редагувати облікові записи"
@@ -2524,71 +2953,78 @@ msgstr "Налаштувати _близьких"
msgid "N_ormal Size"
msgstr "З_вичайний розмір"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Новий _виклик…"
+
+#: ../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:10
+msgid "Show P_rotocols"
+msgstr "Показати _протокол:"
+
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Сортувати за _іменем"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Впорядкувати за с_татусом"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Облікові записи"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Компактний розмір"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Налагодження"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "Передача _файлів"
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "Приєднатися _до..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
+msgstr "_Увійти…"
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "_Нова розмова..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Нова бесіда…"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Показувати відсутніх"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Особиста інформація"
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "Переглянути _попередні бесіди"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Кімната"
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
msgid "Chat Room"
msgstr "Кімната спілкування"
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
msgid "Members"
msgstr "Члени"
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:539
#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
msgid ""
"<b>%s</b>\n"
"Invite required: %s\n"
@@ -2598,18 +3034,18 @@ msgstr ""
"<b>%s</b>\n"
"Обов'язкова вимога: %s\n"
"Потрібен пароль: %s\n"
-"Члени: %s"
+"Учасники: %s"
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
msgid "No"
msgstr "Ні"
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
msgid "Could not start room listing"
msgstr "Не можу почати лістинг кімнати"
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
msgid "Could not stop room listing"
msgstr "Не можу зупинити лістинг кімнати"
@@ -2677,86 +3113,70 @@ msgid "Language"
msgstr "Мова"
#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Дозволити використання _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Дозволити використання _мобільного телефону"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Дозволити використання _мережі"
-
-#: ../src/empathy-preferences.ui.h:4
msgid "Appearance"
msgstr "Вигляд"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
msgid "Automatically _connect on startup "
msgstr "Автоматично _з'єднуватися під час запуску"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "Поведінка"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
msgid "Chat Th_eme:"
msgstr "Тема оф_ормлення бесіди:"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable notifications when _away or busy"
msgstr "Вимкнути сповіщення у стані «_відійшов». або «зайнятий»"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable sounds when _away or busy"
msgstr "Вимкнути звуки у стані «_відійшов». або «зайнятий»"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Показувати сповіщення коли контакт входить в мережу"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Показувати сповіщення коли контакт залишає мережу"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Показувати сповіщення коли вікно _чату не активне"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Увімкнути перевірку орфографії для мов:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Загальні"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Налаштування Geoclue"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "Місцезнаходження"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Джерела місцезнаходження:"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Сповіщення"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Звукові сигнали при подіях"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "Preferences"
msgstr "Параметри"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "Приватність"
-#: ../src/empathy-preferences.ui.h:21
+#: ../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 "
@@ -2766,23 +3186,23 @@ msgstr ""
"місто,регіон та країну. Точність GPS координат визначається 1 десятковою "
"позицією."
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Show _smileys as images"
msgstr "Показувати графічні _посмішки"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Show contact _list in rooms"
msgstr "Показати _список співрозмовників у кімнаті"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Sounds"
msgstr "Звуки"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Перевірка орфографії"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -2790,18 +3210,30 @@ msgstr ""
"<small>У цьому списку показані лише мови, для яких встановлені словники.</"
"small>"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Теми"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Мобільний телефон"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Enable bubble notifications"
-msgstr "_Ввімкнути спливаючі сповіщення"
+msgstr "_Ввімкнути контекстні сповіщення"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable sound notifications"
msgstr "_Ввімкнути звукові сповіщення"
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мережа (IP, Wi-Fi)"
+
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "_Відкривати нові бесіди у окремому вікні"
@@ -2814,313 +3246,121 @@ msgstr "_Публікувати місцезнаходження моїм спі
msgid "_Reduce location accuracy"
msgstr "По_низити точність визначення місцезнаходження"
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:176
+msgid "Respond"
+msgstr "Відповісти"
+
+#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Стан"
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
msgstr "Ви_йти"
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Не можу стартувати програму для служби %s: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "%s прислав запрошення, але у вас відсутня програма, щоб його обробити."
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Карта співрозмовників"
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "Помилка"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "Критична"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "Попередження"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "Повідомлення"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "Інформація"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "Відлагодження"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1066
msgid "Save"
msgstr "Зберегти"
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "Вікно відлагодження"
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "Пауза"
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "Рівень"
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1331
+msgid "Debug"
+msgstr "Відлагодження"
+
+#: ../src/empathy-debug-window.c:1337
+msgid "Info"
+msgstr "Інформація"
+
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+msgid "Message"
+msgstr "Повідомлення"
+
+#: ../src/empathy-debug-window.c:1349
+msgid "Warning"
+msgstr "Попередження"
+
+#: ../src/empathy-debug-window.c:1355
+msgid "Critical"
+msgstr "Критична"
+
+#: ../src/empathy-debug-window.c:1361
+msgid "Error"
+msgstr "Помилка"
+
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "Час"
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "Домен"
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "Категорія"
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "Рівень"
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr ""
"Обраний менеджер з'єднань не підтримує розширення віддаленого відлагодження "
-#~ msgid "gtk-add"
-#~ msgstr "gtk-додати"
-
-#~ msgid "gtk-remove"
-#~ msgstr "gtk-видалити"
-
-#~ msgid "Add Account"
-#~ msgstr "Додати обліковий запис"
-
-#~ msgid "Gmail"
-#~ msgstr "Gmail"
-
-#~ msgid "Import Accounts..."
-#~ msgstr "Імпорт облікових записів..."
-
-#~ msgid "Settings"
-#~ msgstr "Налаштування"
-
-#~ msgid "Type:"
-#~ msgstr "Тип:"
-
-#~ msgid "gtk-leave-fullscreen"
-#~ msgstr "gtk-leave-fullscreen"
-
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Обмін повідомленнями Empathy"
-
-#~ msgid "Adium"
-#~ msgstr "Адіум"
-
-#~ msgid "- Empathy Instant Messenger"
-#~ msgstr " — Empathy обмін миттєвими повідомленнями"
-
-#~| msgid ""
-#~| "New message from %s:\n"
-#~| "%s"
-#~ msgid "New message from %s"
-#~ msgstr "Нове повідомлення від %s"
-
-#~ msgid "Adium theme to use:"
-#~ msgstr "Тема Адиум використовується:"
-
-#~ msgid "Avatars are user chosen images shown in the contact list"
-#~ msgstr ""
-#~ "Аватари - вибрані користувачем зображення, що показані у списку контактів"
-
-#~ msgid "Not a valid adium theme"
-#~ msgstr "Не дійсна тема Адіум"
-
-#~ msgid "Show _avatars"
-#~ msgstr "Показати _аватари"
-
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Показати _стиснений список контактів"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "Показувати контекстне вікно, коли співрозмовник доступний"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "Увімкнути звуки у стані «зайнятий»"
-
-#~ msgid "Forget password and clear the entry."
-#~ msgstr "Забути пароль та очистити рядок."
-
-#~ msgid "<b>Network</b>"
-#~ msgstr "<b>Мережа</b>"
-
-#~ msgid "<b>Servers</b>"
-#~ msgstr "<b>Сервери</b>"
-
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "Редагувати обрану мережу IRC"
-
-#~ msgid "Remove the selected IRC network"
-#~ msgstr "Видалити обрану мережу IRC"
-
-#~ msgid "_Check Word Spelling..."
-#~ msgstr "Пе_ревірити написання слова..."
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Запросити учасника"
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Тема:</b>"
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Виберіть співрозмовника для запрошення до бесіди:"
-#~ msgid "Group Chat"
-#~ msgstr "Розмова"
-
-#~ msgid "Contact Information"
-#~ msgstr "Інформація про співрозмовника"
-
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "Я хотів би додати Вас у свій список контактів."
-
-#~ msgid "Sorry, I don't want you in my contact list anymore."
-#~ msgstr "Вибачте, я не хочу додавати вас до свого списку."
-
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>Групи</b>"
-
-#~ msgid "Contact information"
-#~ msgstr "Інформація про співрозмовника"
-
-#~ msgid "Word"
-#~ msgstr "Слово"
-
-#~ msgid "Suggestions for the word"
-#~ msgstr "Пропозиція, щодо заміни"
-
-#~ msgid "Spell Checker"
-#~ msgstr "Перевірка орфографії"
-
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Запропонувати слово:"
-
-#~ msgid "<b>New Account</b>"
-#~ msgstr "<b>Новий обліковий рахунок</b>"
-
-#~ msgid "Closed"
-#~ msgstr "Закрито"
-
-#~ msgid "End this call?"
-#~ msgstr "Завершити виклик?"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "Закриття вікна призведе до закінчення виклику."
-
-#~ msgid "Readying"
-#~ msgstr "Підготовка"
-
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "Виклик відхилено %s, тому що вже запущено інший виклик."
-
-#~ msgid "#"
-#~ msgstr "#"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "9"
-#~ msgstr "9"
-
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>Розкладка</b>"
-
-#~ msgid "Invitation _message:"
-#~ msgstr "Повідомлення _запрошення:"
-
-#~ msgid "Invite"
-#~ msgstr "Запросити"
-
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "Вас запросили прийняти участь у конференції."
-
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Редагувати кімнату"
-
-#~ msgid "Join room on start_up"
-#~ msgstr "Входити під час _запуску"
-
-#~ msgid "Join this chat room when Empathy starts and you are connected"
-#~ msgstr ""
-#~ "Входити до цієї кімнати після запуску Empathy та встановлення з'єднання."
-
-#~ msgid "N_ame:"
-#~ msgstr "_Назва:"
-
-#~ msgid "S_erver:"
-#~ msgstr "_Сервер:"
-
-#~ msgid "Invitation Error"
-#~ msgstr "Помилка при запрошенні"
-
-#~ msgid "Browse:"
-#~ msgstr "Огляд:"
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"Не показувати діалогові вікна; виконати роботу (напр., імпорт) та "
+"вийти"
-#~ msgid "Join New"
-#~ msgstr "Приєднатися до..."
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
+"Не показувати діалогові вікна, якщо є облікові записи, відмінні від salut"
-#~ msgid "Re_fresh"
-#~ msgstr "_Оновити"
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Спочатку виберіть обліковий запис (наприклад, gabble/jabber/"
+"foo_40example_2eorg0)"
-#~ msgid ""
-#~ "This list represents all chat rooms hosted on the server you have entered."
-#~ msgstr "У списку показано всі бесіди сервера"
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<account-id>"
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>Звук</b>"
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- облікові записи Empathy"
-#~ msgid "<b>Contact List</b>"
-#~ msgstr "<b>Список контактів</b>"
+#: ../src/empathy-accounts.c:247
+msgid " Accounts"
+msgstr "Облікові записи"
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>Вигляд</b>"
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "Увімкнути звуки у стані «_зайнятий»"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4115a223c..2d376bb29 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.29.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 22:38+0800\n"
-"PO-Revision-Date: 2010-02-24 22:38+0800\n"
+"POT-Creation-Date: 2010-03-06 19:21+0800\n"
+"PO-Revision-Date: 2010-03-06 19:21+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"MIME-Version: 1.0\n"
@@ -198,206 +198,198 @@ msgid "Pop up notifications when a contact logs out"
msgstr "當聯絡人登出時彈出通知"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "已建立 Salut 帳號"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "在聊天室顯示聯絡人清單"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "關閉主視窗時顯示提示"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "顯示離線聯絡人"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "上次選擇大頭貼圖片的目錄。"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "在聊天室使用佈景主題"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy 是否要將使用者的位置發佈給他的聯絡人。"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy 是否使用 GPS 來推測位置。"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy 是否使用流動電話網絡來推測位置。"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy 是否使用網絡來推測位置。"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Empathy 是否應詢問你要不要從其他程式匯入帳號。"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Empathy 是否基於私隱的理由減低位置的準確度。"
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用連線管理程式自動斷線/重新連線。"
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否以你設定的語言檢查輸入有無錯字。"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "是否將談話中的表情符號轉換為圖片形式。"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否播放音效來通知有聯絡人登入網絡。"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否播放音效來通知有聯絡人登出網絡。"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "是否播放音效來通知有事件發生。"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否播放音效來通知有收到訊息。"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否播放音效來通知新的談話。"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否播放音效來通知有送出訊息。"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "當登入某網絡時是否播放音效。"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr "當登出某網絡時是否播放音效。"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "當聯絡人離線時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr "當聯絡人上線時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "收到新訊息時是否顯示彈出式通知(即使已開啟聊天視窗,但沒有獲得焦點)。"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr "當收到新訊息時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室中顯示聯絡人清單。"
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "是否以精簡模式顯示聯絡人清單。"
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "是否在使用標題列的「x」按鈕關閉主視窗時,顯示訊息對話窗。"
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "是否為聊天室使用佈景主題。"
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -409,28 +401,28 @@ msgid "Manage Messaging and VoIP accounts"
msgstr "管理訊息與 VoIP 帳號"
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "已接收檔案的雜湊值與送出的不符"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "遠端聯絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "附近的人"
@@ -598,21 +590,21 @@ msgstr "未來"
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "登入(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -620,15 +612,15 @@ msgstr "登入(_O)"
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "已啟用"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
@@ -637,19 +629,19 @@ msgstr "在這個伺服器上建立新的帳號"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "新增帳號"
@@ -1089,141 +1081,145 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裏放大"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "無法重連這個聊天會議"
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "加入聊天室失敗"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>: 設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>: 加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>: 加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]: 開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>: 開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>: 更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>: 送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:871
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:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]: 顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "用法: %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1148
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1664
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1813
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "無法取得最近的日誌"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1231,12 +1227,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:1820
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出去了"
@@ -1244,17 +1240,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:1831
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:1838
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1264,47 +1260,47 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1897
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2567
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2573
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:2713
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:2766
-#: ../libempathy-gtk/empathy-log-window.c:548
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "談話"
@@ -1313,20 +1309,20 @@ msgid "Topic:"
msgstr "主題:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
@@ -1375,54 +1371,54 @@ msgstr "是否想要移除聯絡人「%s」?"
msgid "Removing contact"
msgstr "正在移除聯絡人"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:459
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:513
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "邀請到聊天室(_I)"
@@ -1430,129 +1426,129 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇聯絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "選擇"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "羣組"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "垂直誤差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "水平誤差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>位置<b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1639,12 +1635,12 @@ msgstr "連接埠"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:541
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-log-window.c:558
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "日期"
@@ -1700,34 +1696,34 @@ msgstr "新通話"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "自選訊息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "編輯自選訊息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "按這裏將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "按這裏將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "設定你的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "自選訊息..."
@@ -1815,15 +1811,15 @@ msgstr "清除"
msgid "Blue"
msgstr "藍色"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "選取目的地"
@@ -2010,15 +2006,15 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:569
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:573
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
-#: ../src/empathy.c:585
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通客戶端"
@@ -2088,7 +2084,7 @@ msgid ""
msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理,稍後再從「編輯」選單加入帳號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2097,36 +2093,36 @@ msgstr "發生錯誤"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "新增 %s 帳號"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "你的聊天帳號是哪一種?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "你還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "請輸入你的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "你想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2134,41 +2130,41 @@ msgid ""
"calls."
msgstr "使用 Empathy 可以在網上跟附近的人聊天,或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "你是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2176,16 +2172,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr "Empathy 可以自動探索並和與你連線到相同網絡上的人們聊天。如果你想要使用此功能,請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節,或是是用「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2193,19 +2189,19 @@ msgid ""
"the Accounts dialog"
msgstr "你無法與連線到你本機網絡的人們聊天,因為 telepathy-salut 尚未安裝。如果你想要啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳號"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1285
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2222,33 +2218,33 @@ msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "連線中..."
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "離線 — 無網絡連線"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2256,16 +2252,16 @@ msgstr ""
"你即將建立新的帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從你的電腦上移除羣組 %s?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的你的帳號。"
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2273,7 +2269,7 @@ msgstr ""
"你即將建立另一個帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1863
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2282,7 +2278,7 @@ msgstr ""
"你所做的更改。確定要繼續?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1996
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "帳號"
@@ -3175,59 +3171,59 @@ msgstr "聯絡人地圖檢視"
msgid "Save"
msgstr "儲存"
-#: ../src/empathy-debug-window.c:1188
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "偵錯視窗"
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "暫停"
-#: ../src/empathy-debug-window.c:1280
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "等級"
-#: ../src/empathy-debug-window.c:1300
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "偵錯"
-#: ../src/empathy-debug-window.c:1306
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "資訊"
-#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "訊息"
-#: ../src/empathy-debug-window.c:1318
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "嚴重"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "錯誤"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "時刻"
-#: ../src/empathy-debug-window.c:1352
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "網域"
-#: ../src/empathy-debug-window.c:1354
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "分類"
-#: ../src/empathy-debug-window.c:1356
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "等級"
-#: ../src/empathy-debug-window.c:1388
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3242,32 +3238,42 @@ msgstr "邀請參與"
msgid "Choose a contact to invite into the conversation:"
msgstr "選擇想要邀請進入談話的聯絡人:"
-#: ../src/empathy-accounts.c:196
-msgid ""
-"Try to import any recognized accounts and display an assistant if that fails"
-msgstr "嘗試匯入任何認識的帳號,若失敗時則顯示協助"
-
-#: ../src/empathy-accounts.c:201
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業(例:匯入)並離開"
-#: ../src/empathy-accounts.c:205
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "如果有任何非 salut 的帳號,就不要顯示任何對話窗"
+
+#: ../src/empathy-accounts.c:221
#, fuzzy
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始化選取給予的帳號(例:gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:207
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:215
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
msgstr "帳號"
+#~ msgid "Salut account is created"
+#~ msgstr "已建立 Salut 帳號"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr "嘗試匯入任何認識的帳號,若失敗時則顯示協助"
+
#~ msgid "Show the accounts dialog"
#~ msgstr "顯示帳號對話盒"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 61865026a..b7c61c2ed 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.29.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 22:38+0800\n"
-"PO-Revision-Date: 2010-02-21 22:23+0800\n"
+"POT-Creation-Date: 2010-03-06 19:21+0800\n"
+"PO-Revision-Date: 2010-03-02 21:43+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
"MIME-Version: 1.0\n"
@@ -198,206 +198,198 @@ msgid "Pop up notifications when a contact logs out"
msgstr "當連絡人登出時彈出通知"
#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "已建立 Salut 帳號"
-
-#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "顯示大頭貼"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:42
msgid "Show contact list in rooms"
msgstr "在聊天室顯示連絡人清單"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:43
msgid "Show hint about closing the main window"
msgstr "關閉主視窗時顯示提示"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:44
msgid "Show offline contacts"
msgstr "顯示離線連絡人"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:45
msgid "Show protocols"
msgstr "顯示協定"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "拼字檢查的語言"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "上次選擇大頭貼圖片的目錄。"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "使用圖片式表情符號"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "使用通知音效"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "在聊天室使用佈景主題"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:53
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:54
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Empathy 是否使用 GPS 來推測位置。"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:55
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Empathy 是否使用行動電話網路來推測位置。"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:56
msgid "Whether Empathy can use the network to guess the location."
msgstr "Empathy 是否使用網路來推測位置。"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:57
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:58
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "是否啟用 WebKit 開發者工具,例如 Web Inspector。"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用連線管理程式自動斷線/重新連線。"
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether the Salut account has been created on the first Empathy run."
-msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
-
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否以您設定的語言檢查輸入有無錯字。"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:64
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "是否將談話中的表情符號轉換為圖片形式。"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:65
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否播放音效來通知有連絡人登入網路。"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否播放音效來通知有連絡人登出網路。"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:67
msgid "Whether to play a sound to notify of events."
msgstr "是否播放音效來通知有事件發生。"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:68
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否播放音效來通知有收到訊息。"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:69
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否播放音效來通知新的談話。"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:70
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否播放音效來通知有送出訊息。"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:71
msgid "Whether to play a sound when logging into a network."
msgstr "當登入某網路時是否播放音效。"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:72
msgid "Whether to play a sound when logging out of a network."
msgstr "當登出某網路時是否播放音效。"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:73
msgid "Whether to play sound notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否播放音效通知。"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:74
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "當連絡人離線時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:75
msgid "Whether to show a popup notification when a contact goes online."
msgstr "當連絡人上線時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:76
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "收到新訊息時是否顯示彈出式通知(即使已開啟聊天視窗,但沒有獲得焦點)。"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:77
msgid "Whether to show a popup notification when receiving a new message."
msgstr "當收到新訊息時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:79
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否在連絡人清單中顯示離線的連絡人。"
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:80
msgid "Whether to show popup notifications when away or busy."
msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:81
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:82
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室中顯示連絡人清單。"
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:83
msgid "Whether to show the contact list in compact mode."
msgstr "是否以精簡模式顯示連絡人清單。"
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:84
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "是否在使用標題列的「x」按鈕關閉主視窗時,顯示訊息對話窗。"
-#: ../data/empathy.schemas.in.h:87
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms."
msgstr "是否為聊天室使用佈景主題。"
-#: ../data/empathy.schemas.in.h:88
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -411,28 +403,28 @@ msgid "Manage Messaging and VoIP accounts"
msgstr "管理訊息與 VoIP 帳號"
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:840
+#: ../libempathy/empathy-ft-handler.c:842
msgid "The hash of the received file and the sent one do not match"
msgstr "已接收檔案的雜湊值與送出的不符"
-#: ../libempathy/empathy-ft-handler.c:1100
+#: ../libempathy/empathy-ft-handler.c:1102
msgid "File transfer not supported by remote contact"
msgstr "遠端連絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1158
+#: ../libempathy/empathy-ft-handler.c:1160
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:96
+#: ../src/empathy-auto-salut-account-helper.c:77
msgid "People nearby"
msgstr "附近的人"
@@ -600,21 +592,21 @@ msgstr "未來"
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:527
-#: ../libempathy-gtk/empathy-account-widget.c:583
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1117
+#: ../libempathy-gtk/empathy-account-widget.c:1126
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1474
msgid "L_og in"
msgstr "登入(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1542
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -622,15 +614,15 @@ msgstr "登入(_O)"
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1553
msgid "Enabled"
msgstr "已啟用"
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1618
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1621
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
@@ -639,19 +631,19 @@ msgstr "在這個伺服器上建立新的帳號"
#. * like: "MyUserName on chat.freenode.net".
#. * 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:1968
+#: ../libempathy-gtk/empathy-account-widget.c:2013
#, 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:1994
+#: ../libempathy-gtk/empathy-account-widget.c:2039
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "New account"
msgstr "新增帳號"
@@ -1095,59 +1087,59 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裡放大"
-#: ../libempathy-gtk/empathy-chat.c:201
+#: ../libempathy-gtk/empathy-chat.c:233
msgid "Failed to reconnect this chat"
msgstr "無法重連這個聊天會議"
-#: ../libempathy-gtk/empathy-chat.c:623
+#: ../libempathy-gtk/empathy-chat.c:655
msgid "Failed to join chat room"
msgstr "加入聊天室失敗"
-#: ../libempathy-gtk/empathy-chat.c:641
+#: ../libempathy-gtk/empathy-chat.c:673
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:680
+#: ../libempathy-gtk/empathy-chat.c:712
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:686
+#: ../libempathy-gtk/empathy-chat.c:718
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:815
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:818
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>: 設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:821
+#: ../libempathy-gtk/empathy-chat.c:853
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>: 加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>: 加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:859
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]: 開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:862
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>: 開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:865
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>: 變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:868
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>: 送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:871
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 "
@@ -1156,7 +1148,7 @@ msgstr ""
"/say <訊息>: 送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說:「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:876
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1164,76 +1156,80 @@ msgstr ""
"/help [<命令>]: 顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:886
#, c-format
msgid "Usage: %s"
msgstr "用法: %s"
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:915
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1004
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1174
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1177
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1148
+#: ../libempathy-gtk/empathy-chat.c:1180
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1183
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1186
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1189
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1193
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1228
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1230
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1629
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1683
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1664
-#: ../libempathy-gtk/empathy-ui-utils.c:1658
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1621
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-chat.c:1735
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1813
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "無法取得最近的日誌"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1241,12 +1237,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:1820
+#: ../libempathy-gtk/empathy-chat.c:1967
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1970
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出去了"
@@ -1254,17 +1250,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:1831
+#: ../libempathy-gtk/empathy-chat.c:1978
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1981
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:1838
+#: ../libempathy-gtk/empathy-chat.c:1985
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1274,47 +1270,47 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2019
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1897
+#: ../libempathy-gtk/empathy-chat.c:2044
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2701
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2567
+#: ../libempathy-gtk/empathy-chat.c:2702
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2707
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2573
+#: ../libempathy-gtk/empathy-chat.c:2708
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:2713
+#: ../libempathy-gtk/empathy-chat.c:2848
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:2766
-#: ../libempathy-gtk/empathy-log-window.c:548
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
msgid "Conversation"
msgstr "談話"
@@ -1323,20 +1319,20 @@ msgid "Topic:"
msgstr "主題:"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:823
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:830
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
@@ -1385,54 +1381,54 @@ msgstr "是否想要移除連絡人「%s」?"
msgid "Removing contact"
msgstr "正在移除連絡人"
-#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../libempathy-gtk/empathy-contact-menu.c:199
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:226
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:257
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:289
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:324
+#: ../libempathy-gtk/empathy-contact-menu.c:340
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:362
msgid "Send file"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:385
msgid "Share my desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:413
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:459
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:513
#: ../src/empathy-chat-window.c:865
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:544
msgid "_Invite to chat room"
msgstr "邀請到聊天室(_I)"
@@ -1440,129 +1436,129 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇連絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:235
+#: ../libempathy-gtk/empathy-contact-widget.c:236
msgid "Select"
msgstr "選擇"
-#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../libempathy-gtk/empathy-contact-widget.c:245
#: ../src/empathy-main-window.c:1045
msgid "Group"
msgstr "群組"
-#: ../libempathy-gtk/empathy-contact-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:477
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:479
msgid "Country:"
msgstr "國家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:481
msgid "State:"
msgstr "州:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:483
msgid "City:"
msgstr "市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:485
msgid "Area:"
msgstr "區域:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:487
msgid "Postal Code:"
msgstr "郵遞區號:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:489
msgid "Street:"
msgstr "街:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:491
msgid "Building:"
msgstr "建築:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:493
msgid "Floor:"
msgstr "樓層:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:495
msgid "Room:"
msgstr "室:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:497
msgid "Text:"
msgstr "文字:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:499
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Accuracy Level:"
msgstr "準確度等級:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:505
msgid "Error:"
msgstr "錯誤:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:507
msgid "Vertical Error (meters):"
msgstr "垂直誤差(公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "水平誤差(公尺):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:511
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:513
msgid "Bearing:"
msgstr "方位:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:515
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:517
msgid "Last Updated on:"
msgstr "上次更新於:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:519
msgid "Longitude:"
msgstr "經度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:521
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:523
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../libempathy-gtk/empathy-contact-widget.c:586
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:602
msgid "<b>Location</b>, "
msgstr "<b>位置<b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:652
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:721
+#: ../libempathy-gtk/empathy-contact-widget.c:735
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:791
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1650,12 +1646,12 @@ msgstr "連接埠"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:541
+#: ../libempathy-gtk/empathy-log-window.c:700
#: ../src/empathy-import-widget.c:310
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-log-window.c:558
+#: ../libempathy-gtk/empathy-log-window.c:717
msgid "Date"
msgstr "日期"
@@ -1711,34 +1707,34 @@ msgstr "新通話"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
msgid "Custom Message…"
msgstr "自訂訊息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
msgstr "編輯自訂訊息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
msgstr "按這裡將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
msgid "Click to make this status a favorite"
msgstr "按這裡將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:896
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
msgid "Set your presence and current status"
msgstr "設定您的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1083
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
msgid "Custom messages…"
msgstr "自訂訊息..."
@@ -1826,15 +1822,15 @@ msgstr "清除"
msgid "Blue"
msgstr "藍色"
-#: ../libempathy-gtk/empathy-ui-utils.c:1520
+#: ../libempathy-gtk/empathy-ui-utils.c:1496
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1650
+#: ../libempathy-gtk/empathy-ui-utils.c:1613
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1710
+#: ../libempathy-gtk/empathy-ui-utils.c:1673
msgid "Select a destination"
msgstr "選取目的地"
@@ -2021,15 +2017,15 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:569
+#: ../src/empathy.c:596
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:573
+#: ../src/empathy.c:600
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
-#: ../src/empathy.c:585
+#: ../src/empathy.c:612
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通客戶端"
@@ -2109,7 +2105,7 @@ msgstr ""
"號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:1300
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2118,36 +2114,36 @@ msgstr "發生錯誤"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
#, c-format
msgid "New %s account"
msgstr "新增 %s 帳號"
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:508
msgid "What kind of chat account do you have?"
msgstr "您的聊天帳號是哪一種?"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:514
msgid "Do you have any other chat accounts you want to set up?"
msgstr "您還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:520
msgid "Enter your account details"
msgstr "請輸入您的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:525
msgid "What kind of chat account do you want to create?"
msgstr "您想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:531
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:538
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:653
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 "
@@ -2158,41 +2154,41 @@ msgstr ""
"Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
"訊通話。"
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:670
msgid "Do you have an account you've been using with another chat program?"
msgstr "您是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:693
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:714
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:736
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:746
msgid "No, I just want to see people online nearby for now"
msgstr "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:767
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:851
#: ../src/empathy-new-chatroom-dialog.c:541
#: ../src/empathy-new-chatroom-dialog.c:542
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:858
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1117
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 "
@@ -2203,16 +2199,16 @@ msgstr ""
"能,請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節,或是是用"
"「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1139
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1175
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 "
@@ -2223,19 +2219,19 @@ msgstr ""
"啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳"
"號"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1181
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1258
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1267
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1285
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2252,33 +2248,33 @@ msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
msgid "Connecting…"
msgstr "連線中..."
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:290
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:295
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:308
msgid "Offline — No Network Connection"
msgstr "離線 — 無網路連線"
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:316
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:327
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:768
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2286,16 +2282,16 @@ msgstr ""
"您即將建立新的帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1115
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從您的電腦上移除群組 %s?"
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1119
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的您的帳號。"
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1356
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2303,7 +2299,7 @@ msgstr ""
"您即將建立另一個帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1863
+#: ../src/empathy-accounts-dialog.c:1933
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2312,7 +2308,7 @@ msgstr ""
"您所做的變更。確定要繼續?"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1996
+#: ../src/empathy-accounts-dialog.c:2066
msgid "Accounts"
msgstr "帳號"
@@ -3210,59 +3206,59 @@ msgstr "連絡人地圖檢視"
msgid "Save"
msgstr "儲存"
-#: ../src/empathy-debug-window.c:1188
+#: ../src/empathy-debug-window.c:1219
msgid "Debug Window"
msgstr "偵錯視窗"
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1299
msgid "Pause"
msgstr "暫停"
-#: ../src/empathy-debug-window.c:1280
+#: ../src/empathy-debug-window.c:1311
msgid "Level "
msgstr "等級"
-#: ../src/empathy-debug-window.c:1300
+#: ../src/empathy-debug-window.c:1331
msgid "Debug"
msgstr "偵錯"
-#: ../src/empathy-debug-window.c:1306
+#: ../src/empathy-debug-window.c:1337
msgid "Info"
msgstr "資訊"
-#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
msgid "Message"
msgstr "訊息"
-#: ../src/empathy-debug-window.c:1318
+#: ../src/empathy-debug-window.c:1349
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1355
msgid "Critical"
msgstr "嚴重"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1361
msgid "Error"
msgstr "錯誤"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1380
msgid "Time"
msgstr "時刻"
-#: ../src/empathy-debug-window.c:1352
+#: ../src/empathy-debug-window.c:1383
msgid "Domain"
msgstr "網域"
-#: ../src/empathy-debug-window.c:1354
+#: ../src/empathy-debug-window.c:1385
msgid "Category"
msgstr "分類"
-#: ../src/empathy-debug-window.c:1356
+#: ../src/empathy-debug-window.c:1387
msgid "Level"
msgstr "等級"
-#: ../src/empathy-debug-window.c:1388
+#: ../src/empathy-debug-window.c:1424
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3277,32 +3273,42 @@ msgstr "邀請參與"
msgid "Choose a contact to invite into the conversation:"
msgstr "選擇想要邀請進入談話的聯絡人:"
-#: ../src/empathy-accounts.c:196
-msgid ""
-"Try to import any recognized accounts and display an assistant if that fails"
-msgstr "嘗試匯入任何認識的帳號,若失敗時則顯示協助"
-
-#: ../src/empathy-accounts.c:201
+#: ../src/empathy-accounts.c:213
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業(例:匯入)並離開"
-#: ../src/empathy-accounts.c:205
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "如果有任何非 salut 的帳號,就不要顯示任何對話窗"
+
+#: ../src/empathy-accounts.c:221
#, fuzzy
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始化選取給予的帳號(例:gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:207
+#: ../src/empathy-accounts.c:223
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:215
+#: ../src/empathy-accounts.c:231
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:247
msgid " Accounts"
msgstr "帳號"
+#~ msgid "Salut account is created"
+#~ msgstr "已建立 Salut 帳號"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr "嘗試匯入任何認識的帳號,若失敗時則顯示協助"
+
#~ msgid "Show the accounts dialog"
#~ msgstr "顯示帳號對話盒"
diff --git a/src/.gitignore b/src/.gitignore
index 082f7cdd4..cf52a9c68 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,3 +2,4 @@ empathy
empathy-accounts
empathy-chat-chandler
empathy-call-chandler
+empathy-debugger
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f8d15733..a01b759a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,7 @@ endif
bin_PROGRAMS = \
empathy \
empathy-accounts \
+ empathy-debugger \
$(NULL)
BUILT_SOURCES=
@@ -94,17 +95,22 @@ empathy_accounts_LDADD = \
libempathy-accounts-common.la \
$(NULL)
+empathy_debugger_SOURCES = \
+ empathy-debug-window.c empathy-debug-window.h \
+ empathy-debugger.c \
+ $(NULL)
+
empathy_handwritten_source = \
empathy-about-dialog.c empathy-about-dialog.h \
empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \
empathy-call-window.c empathy-call-window.h \
empathy-chat-window.c empathy-chat-window.h \
empathy-chatrooms-window.c empathy-chatrooms-window.h \
- empathy-debug-window.c empathy-debug-window.h \
empathy-event-manager.c empathy-event-manager.h \
empathy-ft-manager.c empathy-ft-manager.h \
empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
empathy-main-window.c empathy-main-window.h \
+ empathy-migrate-butterfly-logs.c empathy-migrate-butterfly-logs.h \
empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \
empathy-preferences.c empathy-preferences.h \
empathy-sidebar.c empathy-sidebar.h \
diff --git a/src/cc-empathy-accounts-page.c b/src/cc-empathy-accounts-page.c
index 383e20d41..48330f6f0 100644
--- a/src/cc-empathy-accounts-page.c
+++ b/src/cc-empathy-accounts-page.c
@@ -32,6 +32,9 @@
#include <libempathy/empathy-connection-managers.h>
#include <libempathy-gtk/empathy-ui-utils.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
#include "cc-empathy-accounts-page.h"
#include "empathy-accounts-common.h"
#include "empathy-account-assistant.h"
@@ -45,6 +48,8 @@ struct CcEmpathyAccountsPagePrivate
* destroyed in our finalize(), since it invalidates its children (even if
* they've already been reparented by the time it is destroyed) */
GtkWidget *accounts_window;
+
+ GtkWidget *assistant;
};
G_DEFINE_TYPE (CcEmpathyAccountsPage, cc_empathy_accounts_page, CC_TYPE_PAGE)
@@ -87,6 +92,9 @@ account_assistant_closed_cb (GtkWidget *widget,
empathy_account_dialog_cancel (
EMPATHY_ACCOUNTS_DIALOG (page->priv->accounts_window));
}
+
+ gtk_widget_set_sensitive (GTK_WIDGET (page), TRUE);
+ page->priv->assistant = NULL;
}
static void
@@ -112,10 +120,14 @@ connection_managers_prepare (GObject *source,
if (!empathy_accounts_has_non_salut_accounts (account_mgr))
{
- GtkWidget *w;
- w = empathy_account_assistant_show (NULL, cm_mgr);
+ GtkWindow *parent;
- empathy_signal_connect_weak (w, "hide",
+ parent = empathy_get_toplevel_window (GTK_WIDGET (page));
+ page->priv->assistant = empathy_account_assistant_show (parent, cm_mgr);
+
+ gtk_widget_set_sensitive (GTK_WIDGET (page), FALSE);
+
+ empathy_signal_connect_weak (page->priv->assistant, "hide",
G_CALLBACK (account_assistant_closed_cb),
G_OBJECT (page));
}
@@ -172,6 +184,8 @@ active_changed (CcPage *base_page,
CcEmpathyAccountsPage *page = CC_EMPATHY_ACCOUNTS_PAGE (base_page);
TpAccountManager *account_manager;
+ DEBUG ("%s: active = %i", G_STRLOC, is_active);
+
if (is_active)
{
/* unref'd in final endpoint callbacks */
@@ -232,3 +246,18 @@ cc_empathy_accounts_page_new (void)
return CC_PAGE (object);
}
+
+void
+cc_empathy_accounts_page_destroy_dialogs (CcEmpathyAccountsPage *self)
+{
+ /* This function is really kludgey, it is called by the AccountPanel to
+ * remove any child dialogs (i.e. this assistant). I personally feel this
+ * would be better in active_changed, but the Page doesn't seem to receive
+ * that signal when the panel does. */
+
+ if (self->priv->assistant != NULL)
+ {
+ DEBUG ("Destroying assistant");
+ gtk_widget_destroy (self->priv->assistant);
+ }
+}
diff --git a/src/cc-empathy-accounts-page.h b/src/cc-empathy-accounts-page.h
index 7c360874e..4139a33f8 100644
--- a/src/cc-empathy-accounts-page.h
+++ b/src/cc-empathy-accounts-page.h
@@ -48,6 +48,7 @@ typedef struct
GType cc_empathy_accounts_page_get_type (void);
CcPage* cc_empathy_accounts_page_new (void);
+void cc_empathy_accounts_page_destroy_dialogs (CcEmpathyAccountsPage *self);
G_END_DECLS
diff --git a/src/cc-empathy-accounts-panel.c b/src/cc-empathy-accounts-panel.c
index 63500e66c..d69325b7b 100644
--- a/src/cc-empathy-accounts-panel.c
+++ b/src/cc-empathy-accounts-panel.c
@@ -28,6 +28,9 @@
#include <gconf/gconf-client.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
#include "cc-empathy-accounts-panel.h"
#include "cc-empathy-accounts-page.h"
@@ -55,6 +58,24 @@ setup_panel (CcEmpathyAccountsPanel *panel)
NULL);
}
+static void
+cc_empathy_accounts_panel_active_changed (CcPanel *self,
+ gboolean is_active)
+{
+ DEBUG ("%s: active = %i", G_STRLOC, is_active);
+
+ if (!is_active)
+ {
+ /* why doesn't control-center call active-changed on the Page? */
+ cc_empathy_accounts_page_destroy_dialogs (
+ CC_EMPATHY_ACCOUNTS_PAGE (
+ CC_EMPATHY_ACCOUNTS_PANEL (self)->priv->empathy_accounts_page));
+ }
+
+ CC_PANEL_CLASS (cc_empathy_accounts_panel_parent_class)->active_changed (
+ self, is_active);
+}
+
static GObject *
cc_empathy_accounts_panel_constructor (GType type,
guint n_construct_properties,
@@ -96,7 +117,10 @@ cc_empathy_accounts_panel_finalize (GObject *object)
static void
cc_empathy_accounts_panel_class_init (CcEmpathyAccountsPanelClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ panel_class->active_changed = cc_empathy_accounts_panel_active_changed;
object_class->constructor = cc_empathy_accounts_panel_constructor;
object_class->finalize = cc_empathy_accounts_panel_finalize;
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index e5c5e80c2..9860259fa 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -1223,6 +1223,9 @@ empathy_account_assistant_init (EmpathyAccountAssistant *self)
EmpathyAccountAssistantPriv);
self->priv = priv;
+ gtk_window_set_title (GTK_WINDOW (self),
+ _("Messaging and VoIP Accounts Assistant"));
+
priv->account_mgr = tp_account_manager_dup ();
}
@@ -1320,7 +1323,7 @@ empathy_account_assistant_show (GtkWindow *window,
if (dialog == NULL)
{
- dialog = g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT,
+ dialog = g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT,
"parent-window", window,
"connection-managers", connection_mgrs,
NULL);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 5162e0b8e..8e85a3653 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2063,7 +2063,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
gtk_box_pack_start (GTK_BOX (hbox), priv->label_status, TRUE, TRUE, 0);
/* Tweak the dialog */
- gtk_window_set_title (GTK_WINDOW (dialog), _("Accounts"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Messaging and VoIP Accounts"));
gtk_window_set_role (GTK_WINDOW (dialog), "accounts");
gtk_window_set_default_size (GTK_WINDOW (dialog), 640, -1);
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 187bdf56b..0eaa8553e 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -244,7 +244,7 @@ main (int argc, char *argv[])
empathy_gtk_init ();
- g_set_application_name (_(PACKAGE_NAME " Accounts"));
+ g_set_application_name (_("Empathy Accounts"));
gtk_window_set_default_icon_name ("empathy");
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 8b7af2dcf..d67fc3770 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1037,12 +1037,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
"show", G_CALLBACK (empathy_call_window_sidebar_shown_cb), self);
gtk_paned_pack2 (GTK_PANED (priv->pane), priv->sidebar, FALSE, FALSE);
- priv->dtmf_panel = empathy_call_window_create_dtmf (self);
- empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Dialpad"),
- priv->dtmf_panel);
-
- gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
-
page = empathy_call_window_create_audio_input (self);
empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Audio input"),
page);
@@ -1051,6 +1045,13 @@ empathy_call_window_init (EmpathyCallWindow *self)
empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Video input"),
page);
+ priv->dtmf_panel = empathy_call_window_create_dtmf (self);
+ empathy_sidebar_add_page (EMPATHY_SIDEBAR (priv->sidebar), _("Dialpad"),
+ priv->dtmf_panel);
+
+ gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
+
+
gtk_widget_show_all (top_vbox);
gtk_widget_hide (priv->sidebar);
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 7419a720b..29d574a3e 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -879,6 +879,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action,
EmpathyTpChat *tp_chat;
TpChannel *channel;
int response;
+ TpAccount *account;
priv = GET_PRIV (window);
@@ -886,9 +887,10 @@ chat_window_invite_participant_activate_cb (GtkAction *action,
tp_chat = empathy_chat_get_tp_chat (priv->current_chat);
channel = empathy_tp_chat_get_channel (tp_chat);
+ account = empathy_chat_get_account (priv->current_chat);
dialog = empathy_invite_participant_dialog_new (
- GTK_WINDOW (priv->dialog));
+ GTK_WINDOW (priv->dialog), account);
gtk_widget_show (dialog);
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -2244,7 +2246,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat)
priv = GET_PRIV (window);
empathy_chat_window_switch_to_chat (window, chat);
- empathy_window_present (GTK_WINDOW (priv->dialog), TRUE);
+ empathy_window_present (GTK_WINDOW (priv->dialog));
gtk_widget_grab_focus (chat->input_text_view);
}
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
new file mode 100644
index 000000000..a4e6a9ca2
--- /dev/null
+++ b/src/empathy-debugger.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2005-2007 Imendio AB
+ * Copyright (C) 2007-2010 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
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include <libempathy/empathy-utils.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+
+#include "empathy-debug-window.h"
+
+int
+main (int argc,
+ char **argv)
+{
+ GtkWidget *window;
+
+ g_thread_init (NULL);
+ gtk_init (&argc, &argv);
+ empathy_gtk_init ();
+
+ g_set_application_name (_("Empathy Debugger"));
+
+ gtk_window_set_default_icon_name ("empathy");
+
+ window = empathy_debug_window_new (NULL);
+ g_signal_connect (window, "destroy", gtk_main_quit, NULL);
+
+ gtk_main ();
+
+ return EXIT_SUCCESS;
+}
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 70332d1ff..77fb93738 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -52,9 +52,12 @@ empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self)
}
GtkWidget *
-empathy_invite_participant_dialog_new (GtkWindow *parent)
+empathy_invite_participant_dialog_new (GtkWindow *parent,
+ TpAccount *account)
{
- GtkWidget *self = g_object_new (EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, NULL);
+ GtkWidget *self = g_object_new (EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG,
+ "filter-account", account,
+ NULL);
if (parent != NULL)
{
diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 561e10738..daacf5192 100644
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -39,7 +39,8 @@ struct _EmpathyInviteParticipantDialogClass
};
GType empathy_invite_participant_dialog_get_type (void);
-GtkWidget *empathy_invite_participant_dialog_new (GtkWindow *parent);
+GtkWidget *empathy_invite_participant_dialog_new (GtkWindow *parent,
+ TpAccount *account);
G_END_DECLS
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 240f4b18b..fe9af9c4d 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2002-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2010 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -63,6 +63,7 @@
#include "empathy-chatrooms-window.h"
#include "empathy-event-manager.h"
#include "empathy-ft-manager.h"
+#include "empathy-migrate-butterfly-logs.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
@@ -119,6 +120,9 @@ typedef struct {
/* Actions that are enabled when there are connected accounts */
GList *actions_connected;
+
+ /* The idle event source to migrate butterfly's logs */
+ guint butterfly_log_migration_contact_added_id;
} EmpathyMainWindow;
static EmpathyMainWindow *main_window = NULL;
@@ -652,6 +656,7 @@ main_window_destroy_cb (GtkWidget *widget,
window);
g_object_unref (window->event_manager);
g_object_unref (window->ui_manager);
+ g_object_unref (window->chatroom_manager);
g_free (window);
}
@@ -1091,7 +1096,35 @@ static void
main_window_help_debug_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- empathy_debug_window_new (NULL);
+ GdkScreen *screen = gdk_screen_get_default ();
+ GError *error = NULL;
+ gchar *argv[2] = { NULL, };
+ gint i = 0;
+ gchar *path;
+
+ g_return_if_fail (GDK_IS_SCREEN (screen));
+
+ /* 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);
+ }
+
+ argv[i++] = path;
+
+ gdk_spawn_on_screen (screen, NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, NULL, &error);
+
+ if (error) {
+ g_warning ("Failed to open debug window: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_free (path);
}
static void
@@ -1243,6 +1276,18 @@ account_manager_prepared_cb (GObject *source_object,
g_list_free (accounts);
}
+static void
+main_window_contact_added_cb (EmpathyContactMonitor *monitor,
+ EmpathyContact *contact,
+ EmpathyMainWindow *window)
+{
+ if (!empathy_migrate_butterfly_logs (contact)) {
+ g_signal_handler_disconnect (monitor,
+ window->butterfly_log_migration_contact_added_id);
+ window->butterfly_log_migration_contact_added_id = 0;
+ }
+}
+
GtkWidget *
empathy_main_window_show (void)
{
@@ -1261,7 +1306,7 @@ empathy_main_window_show (void)
GSList *l;
if (main_window) {
- empathy_window_present (GTK_WINDOW (main_window->window), TRUE);
+ empathy_window_present (GTK_WINDOW (main_window->window));
return main_window->window;
}
@@ -1391,6 +1436,8 @@ empathy_main_window_show (void)
EMPATHY_CONTACT_FEATURE_ALL);
g_signal_connect (monitor, "contact-presence-changed",
G_CALLBACK (main_window_contact_presence_changed_cb), window);
+ window->butterfly_log_migration_contact_added_id = g_signal_connect (monitor, "contact-added",
+ G_CALLBACK (main_window_contact_added_cb), window);
g_object_unref (list_iface);
gtk_widget_show (GTK_WIDGET (window->list_view));
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index fd6106c95..287d9b6ff 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -351,7 +351,7 @@ empathy_map_view_show (void)
if (window)
{
- empathy_window_present (GTK_WINDOW (window->window), TRUE);
+ empathy_window_present (GTK_WINDOW (window->window));
return window->window;
}
@@ -415,7 +415,7 @@ empathy_map_view_show (void)
model = GTK_TREE_MODEL (window->list_store);
gtk_tree_model_foreach (model, map_view_contacts_foreach, window);
- empathy_window_present (GTK_WINDOW (window->window), TRUE);
+ empathy_window_present (GTK_WINDOW (window->window));
/* Set up time updating loop */
window->timeout_id = g_timeout_add_seconds (5,
diff --git a/src/empathy-migrate-butterfly-logs.c b/src/empathy-migrate-butterfly-logs.c
new file mode 100644
index 000000000..50d7b8e7b
--- /dev/null
+++ b/src/empathy-migrate-butterfly-logs.c
@@ -0,0 +1,213 @@
+/*
+* Copyright (C) 2010 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
+*/
+
+#include <string.h>
+
+#include <gio/gio.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-log-store-empathy.h>
+
+#include <libempathy-gtk/empathy-conf.h>
+
+#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/util.h>
+
+#include "empathy-migrate-butterfly-logs.h"
+
+static guint butterfly_log_migration_id = 0;
+
+static void
+migrate_log_files_in_dir (const gchar *dirname)
+{
+ GDir *dir;
+ const gchar *subdir;
+ gchar *new_name;
+ gchar *full_path;
+ GError *error = NULL;
+
+ dir = g_dir_open (dirname, 0, &error);
+
+ if (dir == NULL)
+ {
+ DEBUG ("Failed to open dir: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ while ((subdir = g_dir_read_name (dir)) != NULL)
+ {
+ GFile *old_gfile, *new_gfile;
+
+ if (!tp_strdiff (subdir, "chatrooms"))
+ continue;
+
+ if (g_str_has_suffix (subdir, "#1"))
+ {
+ new_name = g_strndup (subdir, (strlen (subdir) - 2));
+ }
+ else if (g_str_has_suffix (subdir, "#32"))
+ {
+ gchar *tmp;
+ tmp = g_strndup (subdir, (strlen (subdir) - 3));
+ new_name = g_strdup_printf ("%s#yahoo", tmp);
+ g_free (tmp);
+ }
+ else
+ {
+ continue;
+ }
+
+ full_path = g_build_filename (dirname, subdir, NULL);
+ old_gfile = g_file_new_for_path (full_path);
+ g_free (full_path);
+
+ full_path = g_build_filename (dirname, new_name, NULL);
+ new_gfile = g_file_new_for_path (full_path);
+ g_free (full_path);
+
+ if (!g_file_move (old_gfile, new_gfile, G_FILE_COPY_NONE,
+ NULL, NULL, NULL, &error))
+ {
+ DEBUG ("Failed to move file: %s", error->message);
+ g_clear_error (&error);
+ }
+ else
+ {
+ DEBUG ("Successfully migrated logs for %s", new_name);
+ }
+
+ g_free (new_name);
+ g_object_unref (old_gfile);
+ g_object_unref (new_gfile);
+ }
+
+ g_dir_close (dir);
+}
+
+static void
+migration_account_manager_prepared_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ TpAccountManager *am = TP_ACCOUNT_MANAGER (source_object);
+ GError *error = NULL;
+ GList *accounts, *l;
+ EmpathyLogStoreEmpathy *log_store;
+ EmpathyConf *conf;
+
+ if (!tp_account_manager_prepare_finish (am, result, &error))
+ {
+ DEBUG ("Failed to prepare the account manager: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ log_store = g_object_new (EMPATHY_TYPE_LOG_STORE_EMPATHY, NULL);
+ accounts = tp_account_manager_get_valid_accounts (am);
+
+ for (l = accounts; l != NULL; l = l->next)
+ {
+ TpAccount *account = TP_ACCOUNT (l->data);
+ gchar *dir, *cm;
+
+ tp_account_parse_object_path (tp_proxy_get_object_path (account),
+ &cm, NULL, NULL, NULL);
+
+ if (tp_strdiff (cm, "butterfly"))
+ {
+ g_free (cm);
+ continue;
+ }
+
+ dir = empathy_log_store_empathy_get_dir (log_store, account);
+ DEBUG ("Migrating all logs from dir: %s", dir);
+
+ migrate_log_files_in_dir (dir);
+
+ g_free (cm);
+ g_free (dir);
+ }
+
+ DEBUG ("Finished all migrating");
+
+ conf = empathy_conf_get ();
+ empathy_conf_set_bool (conf, EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED, TRUE);
+
+ g_list_free (accounts);
+ g_object_unref (log_store);
+}
+
+static gboolean
+migrate_logs (gpointer data)
+{
+ TpAccountManager *account_manager;
+
+ account_manager = tp_account_manager_dup ();
+
+ tp_account_manager_prepare_async (account_manager, NULL,
+ migration_account_manager_prepared_cb, NULL);
+
+ g_object_unref (account_manager);
+
+ return FALSE;
+}
+
+gboolean
+empathy_migrate_butterfly_logs (EmpathyContact *contact)
+{
+ EmpathyConf *conf;
+ gboolean logs_migrated;
+ gchar *cm;
+
+ conf = empathy_conf_get ();
+
+ /* Already in progress. */
+ if (butterfly_log_migration_id != 0)
+ return FALSE;
+
+ /* Already done. */
+ if (!empathy_conf_get_bool (conf, EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED,
+ &logs_migrated))
+ return FALSE;
+
+ if (logs_migrated)
+ return FALSE;
+
+ tp_account_parse_object_path (
+ tp_proxy_get_object_path (empathy_contact_get_account (contact)),
+ &cm, NULL, NULL, NULL);
+
+ if (tp_strdiff (cm, "butterfly"))
+ {
+ g_free (cm);
+ return TRUE;
+ }
+ g_free (cm);
+
+ if (g_str_has_suffix (empathy_contact_get_id (contact), "#32")
+ || g_str_has_suffix (empathy_contact_get_id (contact), "#1"))
+ return TRUE;
+
+ /* Okay, we know a new butterfly is being used, so we should migrate its logs */
+ butterfly_log_migration_id = g_idle_add_full (G_PRIORITY_LOW,
+ migrate_logs, NULL, NULL);
+
+ return FALSE;
+}
diff --git a/src/empathy-migrate-butterfly-logs.h b/src/empathy-migrate-butterfly-logs.h
new file mode 100644
index 000000000..a06c1b488
--- /dev/null
+++ b/src/empathy-migrate-butterfly-logs.h
@@ -0,0 +1,32 @@
+/*
+* Copyright (C) 2010 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
+*/
+
+#include <glib.h>
+
+#include <libempathy/empathy-contact.h>
+
+#ifndef __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__
+#define __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__
+
+G_BEGIN_DECLS
+
+gboolean empathy_migrate_butterfly_logs (EmpathyContact *contact);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__ */
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index d0cdac314..d1ea96c98 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -362,7 +362,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
if (!visible) {
empathy_window_iconify (priv->window, priv->icon);
} else {
- empathy_window_present (GTK_WINDOW (priv->window), TRUE);
+ empathy_window_present (GTK_WINDOW (priv->window));
}
}