Mercurial > pidgin
changeset 21462:31fc6a0769ce
merge of 'aa714a29059f790cb003a8fe1bec9c8873d09e33'
and 'd92a21a7dca2f2c4abb6371abea83d5ab4f28b10'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 12 Nov 2007 23:10:08 +0000 |
| parents | da75dd6c41fb (current diff) a34204321321 (diff) |
| children | 2b6553584385 |
| files | |
| diffstat | 20 files changed, 402 insertions(+), 185 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.win32 Mon Nov 12 05:09:17 2007 +0000 +++ b/ChangeLog.win32 Mon Nov 12 23:10:08 2007 +0000 @@ -1,7 +1,7 @@ version 2.2.3: * Updated GTK+ to 2.12.1 (This was actually included in 2.2.2, but didn't get into the Changelog.) - * Upgrade SILC to use the 1.1.2 toolkit + * Upgrade SILC to use the 1.1.5 toolkit version 2.2.2 (10/23/2007): * Updated gtkspell to include a patch to share Aspell dictionaries
--- a/Doxyfile.in Mon Nov 12 05:09:17 2007 +0000 +++ b/Doxyfile.in Mon Nov 12 23:10:08 2007 +0000 @@ -1,4 +1,4 @@ -# Doxyfile 1.4.4 +# Doxyfile 1.5.3 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,6 +14,14 @@ # Project related configuration options #--------------------------------------------------------------------------- +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. @@ -45,23 +53,14 @@ # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en -# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, -# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -76,16 +75,28 @@ REPEAT_BRIEF = YES +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then # Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of -# the base classes will not be shown. +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO @@ -98,10 +109,21 @@ # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag # can be used to strip a user-defined part of the path. Stripping is # only done if one of the specified strings matches the left-hand part of -# the path. It is allowed to use relative paths in the argument list. +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. STRIP_FROM_PATH = +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. @@ -111,11 +133,19 @@ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explict @brief command for a brief description. +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// # comments) as a brief description. This used to be the default behaviour. @@ -133,17 +163,10 @@ # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented # member inherits the documentation from any documented member that it -# reimplements. +# re-implements. INHERIT_DOCS = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce # a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. @@ -162,30 +185,51 @@ # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = "signal=- @ref" \ - "signaldef=@section" \ - "endsignaldef=" \ - "signalproto=@code" \ - "endsignalproto=@endcode" \ - "signaldesc=@par Description:" \ - "signals=@b Signals:" \ - "endsignals=" \ - "constreturn=@note The return value of this function must not be modified or freed. @return" +ALIASES = "signal=- @ref " \ + "signaldef=@section " \ + "endsignaldef= " \ + "signalproto=@code " \ + "endsignalproto=@endcode " \ + "signaldesc=@par Description: " \ + "signals=@b Signals: " \ + "endsignals= " \ + "constreturn=@note The return value of this function must not be modified or freed. @return " -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. # For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. # For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + # Set the SUBGROUPING tag to YES (the default) to allow class member groups of # the same type (for instance a group of public functions) to be put as a # subgroup of that type (e.g. under the Public Functions section). Set it to @@ -228,6 +272,13 @@ EXTRACT_LOCAL_METHODS = YES +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous +# namespace. By default anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # undocumented members of documented classes, files or namespaces. # If set to NO (the default) these members will be included in the @@ -268,7 +319,7 @@ # file names in lower-case letters. If set to YES upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows -# users are advised to set this option to NO. +# and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES @@ -360,7 +411,7 @@ # If the sources in your project are distributed over multiple directories # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is YES. +# in the documentation. The default is NO. SHOW_DIRECTORIES = YES @@ -369,7 +420,7 @@ # version control system). Doxygen will invoke the program by executing (via # popen()) the command <command> <input-file>, where <command> is the value of # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. FILE_VERSION_FILTER = @@ -413,9 +464,11 @@ # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text # tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) -WARN_FORMAT = "$file:$line: $text" +WARN_FORMAT = "$file:$line: $text " # The WARN_LOGFILE tag can be used to specify a file to which warning # and error messages should be written. If left blank the output is written @@ -433,17 +486,24 @@ # with spaces. INPUT = libpurple \ - finch \ - finch/libgnt \ - pidgin \ + finch \ + finch/libgnt \ + pidgin \ doc +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp -# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = *.h \ *.dox @@ -461,17 +521,27 @@ EXCLUDE = libpurple/purple-client.h \ libpurple/purple-client-bindings.h -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories -# that are symbolic links (a Unix filesystem feature) are excluded from the input. +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. EXCLUDE_SYMLINKS = NO # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* EXCLUDE_PATTERNS = +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see # the \include command). @@ -503,7 +573,8 @@ # by executing (via popen()) the command <filter> <input-file>, where <filter> # is the value of the INPUT_FILTER tag, and <input-file> is the name of an # input file. Doxygen will then use the output that the filter program writes -# to standard output. +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. INPUT_FILTER = @@ -527,7 +598,11 @@ #--------------------------------------------------------------------------- # If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce +# a warning and turn it on anyway SOURCE_BROWSER = NO @@ -554,6 +629,13 @@ REFERENCES_RELATION = YES +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + # If the USE_HTAGS tag is set to YES then the references to source code # will point to the HTML generated by the htags(1) tool instead of doxygen # built-in source browser. The htags tool is part of GNU's global source @@ -629,7 +711,9 @@ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to # fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! HTML_STYLESHEET = @@ -646,10 +730,18 @@ GENERATE_HTMLHELP = YES +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be -# written to the html output dir. +# written to the html output directory. CHM_FILE = @@ -784,7 +876,7 @@ #--------------------------------------------------------------------------- # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimised for Word 97 and may not look very pretty with +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO @@ -811,7 +903,7 @@ RTF_HYPERLINKS = NO # Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assigments. You only have to provide +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. RTF_STYLESHEET_FILE = @@ -855,9 +947,7 @@ # If the GENERATE_XML tag is set to YES Doxygen will # generate an XML file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. +# the code including all documentation. GENERATE_XML = YES @@ -879,6 +969,13 @@ XML_DTD = +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- @@ -943,7 +1040,7 @@ # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES # then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. +# PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO @@ -969,7 +1066,9 @@ # are defined before the preprocessor is started (similar to the -D option of # gcc). The argument of the tag is a list of macros of the form: name # or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. PREDEFINED = @@ -983,13 +1082,13 @@ # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then # doxygen's preprocessor will remove all function-like macros that are alone # on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse the -# parser if not removed. +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::addtions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- # The TAGFILES option can be used to specify one or more tagfiles. @@ -1036,13 +1135,22 @@ #--------------------------------------------------------------------------- # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. Note that this -# option is superceded by the HAVE_DOT option below. This is only a fallback. It is -# recommended to install and use dot, since it yields more powerful graphs. +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. CLASS_DIAGRAMS = YES +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented # or is not a class. @@ -1076,7 +1184,7 @@ GROUP_GRAPHS = YES # If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similiar to the OMG's Unified Modeling +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = YES @@ -1100,7 +1208,7 @@ INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will # generate a call dependency graph for every global function or class method. # Note that enabling this option will significantly increase the time of a run. # So in most cases it will be better to enable call graphs for selected @@ -1108,6 +1216,14 @@ CALL_GRAPH = YES +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = NO + # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. @@ -1127,7 +1243,7 @@ DOT_IMAGE_FORMAT = png # The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. +# found. If left blank, it is assumed the dot tool can be found in the path. DOT_PATH = @@ -1137,30 +1253,23 @@ DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 +DOT_GRAPH_MAX_NODES = 50 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes that -# lay further from the root node will be omitted. Note that setting this option to -# 1 or 2 may greatly reduce the computation time needed for large code bases. Also -# note that a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). -# If 0 is used for the depth value (the default), the graph is not depth-constrained. +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 2 @@ -1192,7 +1301,7 @@ DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- # The SEARCHENGINE tag specifies whether or not a search engine should be
--- a/doc/pidgin.1.in Mon Nov 12 05:09:17 2007 +0000 +++ b/doc/pidgin.1.in Mon Nov 12 23:10:08 2007 +0000 @@ -17,8 +17,8 @@ .\" .\" You should have received a copy of the GNU General Public .\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. +.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +.\" Boston, MA 02111-1301 USA. .TH pidgin 1 .SH NAME Pidgin v@VERSION@ \- Instant Messaging client
--- a/finch/finch.pc.in Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/finch.pc.in Mon Nov 12 23:10:08 2007 +0000 @@ -2,8 +2,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ -datarootdir=@datarootdir@ sysconfdir=@sysconfdir@ Name: Finch
--- a/finch/gntblist.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/gntblist.c Mon Nov 12 23:10:08 2007 +0000 @@ -1506,6 +1506,8 @@ { if (text[0] == 27 && text[1] == 0) { /* Escape was pressed */ + if (gnt_tree_is_searching(GNT_TREE(ggblist->tree))) + gnt_bindable_perform_action_named(GNT_BINDABLE(ggblist->tree), "end-search", NULL); remove_peripherals(ggblist); } else if (strcmp(text, GNT_KEY_CTRL_O) == 0) { purple_prefs_set_bool(PREF_ROOT "/showoffline",
--- a/finch/libgnt/gntmenu.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gntmenu.c Mon Nov 12 23:10:08 2007 +0000 @@ -235,7 +235,7 @@ if (nth == NULL) return FALSE; - + find = find_item_with_trigger(nth->next, NULL, trigger); if (!find) find = find_item_with_trigger(menu->list, nth->next, trigger);
--- a/finch/libgnt/gnttextview.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gnttextview.c Mon Nov 12 23:10:08 2007 +0000 @@ -61,6 +61,8 @@ static gchar *select_end; static gboolean double_click; +static void reset_text_view(GntTextView *view); + static void gnt_text_view_draw(GntWidget *widget) { @@ -370,7 +372,7 @@ string = view->string; view->string = NULL; - gnt_text_view_clear(view); + reset_text_view(view); view->string = g_string_set_size(view->string, string->len); view->string->len = 0; @@ -654,7 +656,7 @@ return fl; } -void gnt_text_view_clear(GntTextView *view) +static void reset_text_view(GntTextView *view) { GntTextLine *line; @@ -667,6 +669,14 @@ if (view->string) g_string_free(view->string, TRUE); view->string = g_string_new(NULL); +} + +void gnt_text_view_clear(GntTextView *view) +{ + reset_text_view(view); + + g_list_foreach(view->tags, free_tag, NULL); + view->tags = NULL; if (GNT_WIDGET(view)->window) gnt_widget_draw(GNT_WIDGET(view)); @@ -833,7 +843,7 @@ if (status == 0) { char *text = NULL; if (g_file_get_contents(pageditor.file, &text, NULL, NULL)) { - gnt_text_view_clear(pageditor.tv); + reset_text_view(pageditor.tv); gnt_text_view_append_text_with_flags(pageditor.tv, text, GNT_TEXT_FLAG_NORMAL); gnt_text_view_scroll(GNT_TEXT_VIEW(pageditor.tv), 0); g_free(text);
--- a/finch/libgnt/gntwidget.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gntwidget.c Mon Nov 12 23:10:08 2007 +0000 @@ -466,7 +466,6 @@ *width = wid->priv.width + shadow; if (height) *height = wid->priv.height + shadow; - } static void
--- a/finch/libgnt/gntwindow.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gntwindow.c Mon Nov 12 23:10:08 2007 +0000 @@ -28,6 +28,7 @@ struct _GntWindowPriv { GHashTable *accels; /* key => menuitem-id */ + GntWindowFlags flags; }; enum @@ -189,16 +190,33 @@ if (name && window->priv) { if (!gnt_style_read_menu_accels(name, window->priv->accels)) { g_hash_table_destroy(window->priv->accels); - g_free(window->priv); - window->priv = NULL; + window->priv->accels = NULL; } } } const char * gnt_window_get_accel_item(GntWindow *window, const char *key) { - if (window->priv) + if (window->priv->accels) return g_hash_table_lookup(window->priv->accels, key); return NULL; } +void gnt_window_set_maximize(GntWindow *window, GntWindowFlags maximize) +{ + if (maximize & GNT_WINDOW_MAXIMIZE_X) + window->priv->flags |= GNT_WINDOW_MAXIMIZE_X; + else + window->priv->flags &= ~GNT_WINDOW_MAXIMIZE_X; + + if (maximize & GNT_WINDOW_MAXIMIZE_Y) + window->priv->flags |= GNT_WINDOW_MAXIMIZE_Y; + else + window->priv->flags &= ~GNT_WINDOW_MAXIMIZE_Y; +} + +GntWindowFlags gnt_window_get_maximize(GntWindow *window) +{ + return (window->priv->flags & (GNT_WINDOW_MAXIMIZE_X | GNT_WINDOW_MAXIMIZE_Y)); +} +
--- a/finch/libgnt/gntwindow.h Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gntwindow.h Mon Nov 12 23:10:08 2007 +0000 @@ -48,6 +48,12 @@ typedef struct _GntWindowPriv GntWindowPriv; typedef struct _GntWindowClass GntWindowClass; +typedef enum +{ + GNT_WINDOW_MAXIMIZE_X = 1 << 0, + GNT_WINDOW_MAXIMIZE_Y = 1 << 1, +} GntWindowFlags; + struct _GntWindow { GntBox parent; @@ -112,6 +118,27 @@ */ const char * gnt_window_get_accel_item(GntWindow *window, const char *key); +/** + * Maximize a window, either horizontally or vertically, or both. + * + * @param window The window to maximize. + * @param maximize The maximization state of the window. + * + * @since 2.3.0 + */ +void gnt_window_set_maximize(GntWindow *window, GntWindowFlags maximize); + +/** + * Get the maximization state of a window. + * + * @param window The window. + * + * @return The maximization state of the window. + * + * @since 2.3.0 + */ +GntWindowFlags gnt_window_get_maximize(GntWindow *window); + void gnt_window_workspace_hiding(GntWindow *); void gnt_window_workspace_showing(GntWindow *);
--- a/finch/libgnt/gntwm.c Mon Nov 12 05:09:17 2007 +0000 +++ b/finch/libgnt/gntwm.c Mon Nov 12 23:10:08 2007 +0000 @@ -109,12 +109,10 @@ gnt_wm_copy_win(GntWidget *widget, GntNode *node) { WINDOW *src, *dst; - int shadow; if (!node) return; src = widget->window; dst = node->window; - shadow = gnt_widget_has_shadow(widget) ? 1 : 0; copywin(src, dst, node->scroll, 0, 0, 0, getmaxy(dst) - 1, getmaxx(dst) - 1, 0); } @@ -226,17 +224,22 @@ } static gboolean -sanitize_position(GntWidget *widget, int *x, int *y) +sanitize_position(GntWidget *widget, int *x, int *y, gboolean m) { int X_MAX = getmaxx(stdscr); int Y_MAX = getmaxy(stdscr) - 1; int w, h; int nx, ny; gboolean changed = FALSE; + GntWindowFlags flags = GNT_IS_WINDOW(widget) ? + gnt_window_get_maximize(GNT_WINDOW(widget)) : 0; gnt_widget_get_size(widget, &w, &h); if (x) { - if (*x + w > X_MAX) { + if (m && (flags & GNT_WINDOW_MAXIMIZE_X) && *x != 0) { + *x = 0; + changed = TRUE; + } else if (*x + w > X_MAX) { nx = MAX(0, X_MAX - w); if (nx != *x) { *x = nx; @@ -245,7 +248,10 @@ } } if (y) { - if (*y + h > Y_MAX) { + if (m && (flags & GNT_WINDOW_MAXIMIZE_Y) && *y != 0) { + *y = 0; + changed = TRUE; + } else if (*y + h > Y_MAX) { ny = MAX(0, Y_MAX - h); if (ny != *y) { *y = ny; @@ -257,7 +263,7 @@ } static void -refresh_node(GntWidget *widget, GntNode *node, gpointer null) +refresh_node(GntWidget *widget, GntNode *node, gpointer m) { int x, y, w, h; int nw, nh; @@ -265,14 +271,28 @@ int X_MAX = getmaxx(stdscr); int Y_MAX = getmaxy(stdscr) - 1; + GntWindowFlags flags = 0; + + if (m && GNT_IS_WINDOW(widget)) { + flags = gnt_window_get_maximize(GNT_WINDOW(widget)); + } + gnt_widget_get_position(widget, &x, &y); gnt_widget_get_size(widget, &w, &h); - if (sanitize_position(widget, &x, &y)) + if (sanitize_position(widget, &x, &y, !!m)) gnt_screen_move_widget(widget, x, y); - nw = MIN(w, X_MAX); - nh = MIN(h, Y_MAX); + if (flags & GNT_WINDOW_MAXIMIZE_X) + nw = X_MAX; + else + nw = MIN(w, X_MAX); + + if (flags & GNT_WINDOW_MAXIMIZE_Y) + nh = Y_MAX; + else + nh = MIN(h, Y_MAX); + if (nw != w || nh != h) gnt_screen_resize_widget(widget, nw, nh); } @@ -1004,9 +1024,9 @@ GntWM *wm = GNT_WM(bindable); endwin(); + refresh(); - g_hash_table_foreach(wm->nodes, (GHFunc)refresh_node, NULL); - refresh(); + g_hash_table_foreach(wm->nodes, (GHFunc)refresh_node, GINT_TO_POINTER(TRUE)); g_signal_emit(wm, signals[SIG_TERMINAL_REFRESH], 0); update_screen(wm); gnt_ws_draw_taskbar(wm->cws, TRUE); @@ -1609,7 +1629,7 @@ g_hash_table_replace(wm->nodes, widget, node); - refresh_node(widget, node, NULL); + refresh_node(widget, node, GINT_TO_POINTER(TRUE)); transient = !!GNT_WIDGET_IS_FLAG_SET(node->me, GNT_WIDGET_TRANSIENT); @@ -1622,13 +1642,11 @@ shadow = FALSE; x = widget->priv.x; y = widget->priv.y; - w = widget->priv.width; - h = widget->priv.height; + w = widget->priv.width + shadow; + h = widget->priv.height + shadow; - getmaxyx(stdscr, maxy, maxx); - maxy -= 1; /* room for the taskbar */ - maxy -= shadow; - maxx -= shadow; + maxx = getmaxx(stdscr); + maxy = getmaxy(stdscr) - 1; /* room for the taskbar */ x = MAX(0, x); y = MAX(0, y); @@ -1639,7 +1657,7 @@ w = MIN(w, maxx); h = MIN(h, maxy); - node->window = newwin(h + shadow, w + shadow, y, x); + node->window = newwin(h, w, y, x); gnt_wm_copy_win(widget, node); } #endif @@ -1686,7 +1704,7 @@ const char *title = GNT_BOX(widget)->title; GntPosition *p = NULL; if (title && (p = g_hash_table_lookup(wm->positions, title)) != NULL) { - sanitize_position(widget, &p->x, &p->y); + sanitize_position(widget, &p->x, &p->y, TRUE); gnt_widget_set_position(widget, p->x, p->y); mvwin(widget->window, p->y, p->x); } @@ -1884,9 +1902,8 @@ { gboolean ret = TRUE; GntNode *node; - int shadow; int maxx, maxy; - + while (widget->parent) widget = widget->parent; node = g_hash_table_lookup(wm->nodes, widget); @@ -1900,9 +1917,8 @@ gnt_widget_set_size(widget, width, height); gnt_widget_draw(widget); - shadow = gnt_widget_has_shadow(widget) ? 1 : 0; - maxx = getmaxx(stdscr) - shadow; - maxy = getmaxy(stdscr) - 1 - shadow; + maxx = getmaxx(stdscr); + maxy = getmaxy(stdscr) - 1; height = MIN(height, maxy); width = MIN(width, maxx); wresize(node->window, height, width);
--- a/libpurple/protocols/silc/silc.c Mon Nov 12 05:09:17 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Mon Nov 12 23:10:08 2007 +0000 @@ -425,7 +425,7 @@ return; } - silc_hash_alloc("sha1", &sg->sha1hash); + silc_hash_alloc((unsigned char *)"sha1", &sg->sha1hash); /* Wrap socket to TCP stream */ silc_socket_tcp_stream_create(source, TRUE, FALSE,
--- a/libpurple/purple-uninstalled.pc.in Mon Nov 12 05:09:17 2007 +0000 +++ b/libpurple/purple-uninstalled.pc.in Mon Nov 12 23:10:08 2007 +0000 @@ -2,8 +2,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ -datarootdir=@datarootdir@ sysconfdir=@sysconfdir@ Name: libpurple
--- a/libpurple/purple.pc.in Mon Nov 12 05:09:17 2007 +0000 +++ b/libpurple/purple.pc.in Mon Nov 12 23:10:08 2007 +0000 @@ -2,8 +2,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ -datarootdir=@datarootdir@ sysconfdir=@sysconfdir@ Name: libpurple
--- a/pidgin/gtkblist.c Mon Nov 12 05:09:17 2007 +0000 +++ b/pidgin/gtkblist.c Mon Nov 12 23:10:08 2007 +0000 @@ -4469,6 +4469,15 @@ g_hash_table_remove(gtkblist->connection_errors, account); } +#define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl" + +static void +ssl_faq_clicked_cb(GtkButton *button, + PurpleAccount *account) +{ + purple_notify_uri(NULL, SSL_FAQ_URI); +} + static void add_generic_error_dialog(PurpleAccount *account, const PurpleConnectionErrorInfo *err) @@ -4498,6 +4507,26 @@ g_object_set_data(G_OBJECT(mini_dialog), OBJECT_DATA_KEY_ACCOUNT, account); + if(err->type == PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT) { + GtkWidget *faq_button = gtk_button_new(); + GtkWidget *faq_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(faq_label), + "<span underline=\"single\" foreground=\"blue\"" + " size=\"smaller\">" SSL_FAQ_URI "</span>"); +#if GTK_CHECK_VERSION(2,6,0) + g_object_set(G_OBJECT(faq_label), "ellipsize", + PANGO_ELLIPSIZE_MIDDLE, NULL); +#endif + gtk_container_add(GTK_CONTAINER(faq_button), faq_label); + gtk_button_set_relief(GTK_BUTTON(faq_button), GTK_RELIEF_NONE); + + g_signal_connect(faq_button, "clicked", + (GCallback)ssl_faq_clicked_cb, account); + + gtk_box_pack_start(PIDGIN_MINI_DIALOG(mini_dialog)->contents, + faq_button, FALSE, FALSE, 0); + } + g_signal_connect_after(mini_dialog, "destroy", (GCallback)generic_error_destroy_cb, account);
--- a/pidgin/gtkmain.c Mon Nov 12 05:09:17 2007 +0000 +++ b/pidgin/gtkmain.c Mon Nov 12 23:10:08 2007 +0000 @@ -195,6 +195,18 @@ char *segfault_message; +/* + * This signal handler shouldn't be touching this much stuff. + * It should just set a flag and return, and something else in + * Pidgin should monitor the flag to see if something needs to + * be done. Because the signal handler interrupts the program, + * it could be called in the middle of adding a new connection + * to the list of connections, and then if we try to disconnect + * all connections it could lead to a crash because the linked + * list of connections could be in a weird state. But, well, + * this signal handler probably isn't called very often, so it's + * not a big deal. + */ static void sighandler(int sig) {
--- a/pidgin/pidgin-uninstalled.pc.in Mon Nov 12 05:09:17 2007 +0000 +++ b/pidgin/pidgin-uninstalled.pc.in Mon Nov 12 23:10:08 2007 +0000 @@ -2,8 +2,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ -datarootdir=@datarootdir@ sysconfdir=@sysconfdir@ Name: Pidgin
--- a/pidgin/pidgin.pc.in Mon Nov 12 05:09:17 2007 +0000 +++ b/pidgin/pidgin.pc.in Mon Nov 12 23:10:08 2007 +0000 @@ -2,8 +2,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ -datarootdir=@datarootdir@ sysconfdir=@sysconfdir@ Name: Pidgin
--- a/po/ChangeLog Mon Nov 12 05:09:17 2007 +0000 +++ b/po/ChangeLog Mon Nov 12 23:10:08 2007 +0000 @@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.3.0 + * German translation updated (Bjoern Voigt, Jochen Kemnade) + version 2.2.3 * Belarusian Latin translation updated (Ihar Hrachyshka) * Indonesian translation updated (Rai S. Regawa)
--- a/po/de.po Mon Nov 12 05:09:17 2007 +0000 +++ b/po/de.po Mon Nov 12 23:10:08 2007 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-11 14:59+0100\n" -"PO-Revision-Date: 2007-11-11 14:58+0100\n" +"POT-Creation-Date: 2007-11-12 21:38+0100\n" +"PO-Revision-Date: 2007-11-12 09:54+0100\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -2408,10 +2408,10 @@ msgstr "Ermöglicht das Laden von Perl-Plugins." msgid "Psychic Mode" -msgstr "Psycho-Modus" +msgstr "Gesprächsvorhersage-Modus" msgid "Psychic mode for incoming conversation" -msgstr "Psycho-Modus für eingehende Gespräche" +msgstr "Vorhersage-Modus für eingehende Gespräche" msgid "" "Causes conversation windows to appear as other users begin to message you. " @@ -2433,7 +2433,7 @@ msgstr "Benachrichtigung in Gesprächen anzeigen" msgid "Raise psychic conversations" -msgstr "Psycho-Unterhaltungen anheben" +msgstr "Gesprächsvorhersage-Meldungen im Vordergrund" #. *< type #. *< ui_requirement @@ -2593,7 +2593,6 @@ "Informationen besuchen Sie die FAQ unter: http://developer.pidgin.im/wiki/" "Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging." -#. Send a message about the connection error msgid "Unable to listen for incoming IM connections\n" msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n" @@ -2681,12 +2680,13 @@ msgid "Your buddylist is empty, nothing was written to the file." msgstr "Ihre Buddy-Liste ist leer, es wurde nichts in die Datei geschrieben." -msgid "Couldn't open file" -msgstr "Kann Datei nicht öffnen" - msgid "Buddylist saved successfully!" msgstr "Buddy-Liste wurde erfolgreich gespeichert!" +#, c-format +msgid "Couldn't write buddy list for %s to %s" +msgstr "Konnte Buddy-Liste für %s nicht nach %s schreiben" + msgid "Couldn't load buddylist" msgstr "Konnte Buddy-Liste nicht laden" @@ -2964,8 +2964,6 @@ msgid "SSL support unavailable" msgstr "SSL-Unterstützung nicht verfügbar" -#. TODO: try other ports if in auto mode, then save -#. * working port and try that first next time. msgid "Couldn't create socket" msgstr "Kann Socket nicht erstellen" @@ -3402,7 +3400,6 @@ msgid "Server does not use any supported authentication method" msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden" -#. This should never happen! msgid "Invalid response from server." msgstr "Ungültige Serverantwort." @@ -3811,9 +3808,6 @@ msgid "Find Rooms" msgstr "Finde Räume" -msgid "Error initializing session" -msgstr "Fehler bei Initialisieren der Sitzung" - msgid "You require encryption, but it is not available on this server." msgstr "" "Sie fordern Verschlüsselung, aber diese ist auf dem Server nicht verfügbar." @@ -5131,7 +5125,6 @@ msgid "The screen name specified is invalid." msgstr "Der angegebene Benutzername ist ungültig." -#, fuzzy msgid "Has you" msgstr "Hat Sie" @@ -5255,7 +5248,6 @@ msgid "Invalid input condition" msgstr "Ungültige Eingabebedingung" -#. TODO: g_realloc like msn, yahoo, irc, jabber? msgid "Read buffer full" msgstr "Lesepuffer voll" @@ -5681,9 +5673,6 @@ msgid "GroupWise Conference %d" msgstr "GroupWise-Konferenz %d" -msgid "Unable to make SSL connection to server." -msgstr "Kann keine SSL-Verbindung zum Server herstellen." - msgid "Authenticating..." msgstr "Authentifizierung..." @@ -5725,10 +5714,6 @@ "%s scheint offline zu sein und hat die Nachricht, die Sie gerade gesendet " "haben, nicht empfangen." -#. TODO: Would be nice to prompt if not set! -#. * purple_request_fields_with_hint(gc, _("Server Address"),...); -#. -#. ...but for now just error out with a nice message. msgid "" "Unable to connect to server. Please enter the address of the server you wish " "to connect to." @@ -6063,12 +6048,14 @@ "sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und " "Leerzeichen enthalten oder nur aus Ziffern bestehen." +#. Unregistered screen name msgid "Invalid screen name." msgstr "Ungültiger Benutzername." msgid "Incorrect password." msgstr "Falsches Passwort." +#. Suspended account msgid "Your account is currently suspended." msgstr "Ihr Benutzerkonto ist momentan gesperrt." @@ -6076,6 +6063,8 @@ msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar." +#. screen name connecting too frequently +#. IP address connecting too frequently msgid "" "You have been connecting and disconnecting too frequently. Wait ten minutes " "and try again. If you continue to try, you will need to wait even longer." @@ -6084,6 +6073,7 @@ "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar " "noch länger warten." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -7170,7 +7160,6 @@ msgid "Connection lost" msgstr "Verbindung verloren" -#. cancel login progress msgid "Login failed, no reply" msgstr "Anmeldung fehlgeschlagen, keine Antwort" @@ -8666,7 +8655,6 @@ msgid "Could not load SILC key pair: %s" msgstr "Konnte SILC-Schlüsselpaar nicht laden: %s" -#. TODO: do we really want to disconnect on a failure to write? msgid "Could not write" msgstr "Konnte nicht schreiben" @@ -9127,7 +9115,6 @@ msgid "Unable to establish file descriptor." msgstr "Konnte Dateibeschreibung nicht erstellen." -#. TODO: what to do here - do we really have to disconnect? msgid "Write Error" msgstr "Schreibfehler" @@ -9521,7 +9508,7 @@ msgstr "Mobil" msgid "Listening to music" -msgstr "" +msgstr "Musik hören" #, c-format msgid "%s changed status from %s to %s" @@ -10082,8 +10069,28 @@ msgstr "%s abgemeldet" #, c-format -msgid "<span color=\"red\">%s disconnected: %s</span>" -msgstr "<span color=\"red\">%s abgemeldet: %s</span>" +msgid "%s disabled" +msgstr "%s deaktiviert" + +msgid "Reconnect" +msgstr "Wiederverbinden" + +msgid "Re-enable" +msgstr "Reaktivieren" + +msgid "Ignore" +msgstr "Ignorieren" + +#, c-format +msgid "%d account was disabled because you signed on from another location." +msgid_plural "" +"%d accounts were disabled because you signed on from another location." +msgstr[0] "" +"%d Konto wurde deaktiviert, da Sie sich von einem anderen Ort angemeldet " +"haben." +msgstr[1] "" +"%d Konten wurden deaktiviert, da Sie sich von einem anderen Ort angemeldet " +"haben." msgid "<b>Username:</b>" msgstr "<b>Benutzername:</b>" @@ -10204,18 +10211,6 @@ msgid "SSL Servers" msgstr "SSL-Server" -#, c-format -msgid "" -"%s\n" -"\n" -"%s will not attempt to reconnect the account until you correct the error and " -"re-enable the account." -msgstr "" -"%s\n" -"\n" -"%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler " -"behoben und das Konto wieder aktiviert haben." - msgid "Unknown command." msgstr "Unbekanntes Kommando." @@ -10261,9 +10256,6 @@ msgid "Un-Ignore" msgstr "Nicht Ignorieren" -msgid "Ignore" -msgstr "Ignorieren" - msgid "Get Away Message" msgstr "Neue Abwesenheitsnachricht abholen"